From 684963583af11ce180e571e74c003eed575d55b2 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Thu, 3 Jul 2014 14:19:34 -0600 Subject: [PATCH 1/4] Cosmetic change to xml whitespace (from generation). --- builds/msvc/vs2010/libsodium/libsodium.vcxproj | 2 +- builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters | 2 +- builds/msvc/vs2013/libsodium/libsodium.vcxproj | 2 +- builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj index 0b3bbe57..95b0006f 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj @@ -362,4 +362,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters index 9517b20c..13805be1 100644 --- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters @@ -1111,4 +1111,4 @@ src\crypto_aead\chacha20poly1305\sodium - + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj index ec42fd72..022bbe7e 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj @@ -362,4 +362,4 @@ - + \ No newline at end of file diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters index 9517b20c..13805be1 100644 --- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters @@ -1111,4 +1111,4 @@ src\crypto_aead\chacha20poly1305\sodium - + \ No newline at end of file From a7f810fad167e60601880216a6fab2c481735a30 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Thu, 3 Jul 2014 14:30:57 -0600 Subject: [PATCH 2/4] Remove test files from new VS test projects. --- builds/msvc/vs2010/test/test.vcxproj | 6 ------ builds/msvc/vs2010/test/test.vcxproj.filters | 6 ------ builds/msvc/vs2012/test/test.vcxproj | 6 ------ builds/msvc/vs2012/test/test.vcxproj.filters | 6 ------ builds/msvc/vs2013/test/test.vcxproj | 6 ------ builds/msvc/vs2013/test/test.vcxproj.filters | 6 ------ 6 files changed, 36 deletions(-) diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj index be3954eb..2cd94c3c 100644 --- a/builds/msvc/vs2010/test/test.vcxproj +++ b/builds/msvc/vs2010/test/test.vcxproj @@ -154,12 +154,6 @@ true - - true - - - true - true diff --git a/builds/msvc/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters index a0f3fd7d..c0819e8e 100644 --- a/builds/msvc/vs2010/test/test.vcxproj.filters +++ b/builds/msvc/vs2010/test/test.vcxproj.filters @@ -88,12 +88,6 @@ src - - src - - - src - src diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj index 01174ab0..65fd4d8f 100644 --- a/builds/msvc/vs2012/test/test.vcxproj +++ b/builds/msvc/vs2012/test/test.vcxproj @@ -154,12 +154,6 @@ true - - true - - - true - true diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters index a0f3fd7d..c0819e8e 100644 --- a/builds/msvc/vs2012/test/test.vcxproj.filters +++ b/builds/msvc/vs2012/test/test.vcxproj.filters @@ -88,12 +88,6 @@ src - - src - - - src - src diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj index 9751ce13..780396e9 100644 --- a/builds/msvc/vs2013/test/test.vcxproj +++ b/builds/msvc/vs2013/test/test.vcxproj @@ -154,12 +154,6 @@ true - - true - - - true - true diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters index a0f3fd7d..c0819e8e 100644 --- a/builds/msvc/vs2013/test/test.vcxproj.filters +++ b/builds/msvc/vs2013/test/test.vcxproj.filters @@ -88,12 +88,6 @@ src - - src - - - src - src From a494ab6213de185388b857ddd30df82adeb6e5d6 Mon Sep 17 00:00:00 2001 From: evoskuil Date: Thu, 3 Jul 2014 14:50:49 -0600 Subject: [PATCH 3/4] Drop crypt32.lib Windows dependency. --- builds/msvc/vs2010/libsodium.import.props | 2 +- builds/msvc/vs2012/libsodium.import.props | 2 +- builds/msvc/vs2013/libsodium.import.props | 2 +- packaging/nuget/package.targets | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/builds/msvc/vs2010/libsodium.import.props b/builds/msvc/vs2010/libsodium.import.props index 2f4a7e73..c7b68c90 100644 --- a/builds/msvc/vs2010/libsodium.import.props +++ b/builds/msvc/vs2010/libsodium.import.props @@ -19,7 +19,7 @@ SODIUM_STATIC;%(PreprocessorDefinitions) - advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) + advapi32.lib;libsodium.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) diff --git a/builds/msvc/vs2012/libsodium.import.props b/builds/msvc/vs2012/libsodium.import.props index 2f4a7e73..c7b68c90 100644 --- a/builds/msvc/vs2012/libsodium.import.props +++ b/builds/msvc/vs2012/libsodium.import.props @@ -19,7 +19,7 @@ SODIUM_STATIC;%(PreprocessorDefinitions) - advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) + advapi32.lib;libsodium.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) diff --git a/builds/msvc/vs2013/libsodium.import.props b/builds/msvc/vs2013/libsodium.import.props index 2f4a7e73..c7b68c90 100644 --- a/builds/msvc/vs2013/libsodium.import.props +++ b/builds/msvc/vs2013/libsodium.import.props @@ -19,7 +19,7 @@ SODIUM_STATIC;%(PreprocessorDefinitions) - advapi32.lib;crypt32.lib;libsodium.lib;%(AdditionalDependencies) + advapi32.lib;libsodium.lib;%(AdditionalDependencies) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) $(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libsodium)\;%(AdditionalLibraryDirectories) diff --git a/packaging/nuget/package.targets b/packaging/nuget/package.targets index 4a2cefc9..afb1200c 100644 --- a/packaging/nuget/package.targets +++ b/packaging/nuget/package.targets @@ -17,7 +17,7 @@ $(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories) - advapi32.lib;crypt32.lib;%(AdditionalDependencies) + advapi32.lib;%(AdditionalDependencies) $(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories) From df1f1f6acea18e89a92b9fde9dd741dd0da3b6ce Mon Sep 17 00:00:00 2001 From: evoskuil Date: Thu, 3 Jul 2014 14:54:30 -0600 Subject: [PATCH 4/4] Update NuGet package versioning. --- packaging/nuget/package.config | 2 +- packaging/nuget/package.nuspec | 48 ++++++++++++++++----------------- packaging/nuget/package.targets | 42 ++++++++++++++--------------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/packaging/nuget/package.config b/packaging/nuget/package.config index 30c08313..ccd4036a 100644 --- a/packaging/nuget/package.config +++ b/packaging/nuget/package.config @@ -1,4 +1,4 @@ - + diff --git a/packaging/nuget/package.nuspec b/packaging/nuget/package.nuspec index 114ac4c6..9e729d0f 100644 --- a/packaging/nuget/package.nuspec +++ b/packaging/nuget/package.nuspec @@ -40,52 +40,52 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - libsodium-x86-v120-mt-s-0_5_1_0.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_6_0_0.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_5_1_0.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_6_0_0.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_5_1_0.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_6_0_0.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_5_1_0.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_6_0_0.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-s-0_5_1_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-s-0_6_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-sgd-0_5_1_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-sgd-0_6_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-s-0_5_1_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-s-0_6_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-sgd-0_5_1_0.ltcg.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-sgd-0_6_0_0.ltcg.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-0_5_1_0.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-0_6_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x86-v120-mt-gd-0_5_1_0.imp.lib;%(AdditionalDependencies) + libsodium-x86-v120-mt-gd-0_6_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-0_5_1_0.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-0_6_0_0.imp.lib;%(AdditionalDependencies) - libsodium-x64-v120-mt-gd-0_5_1_0.imp.lib;%(AdditionalDependencies) + libsodium-x64-v120-mt-gd-0_6_0_0.imp.lib;%(AdditionalDependencies) @@ -98,26 +98,26 @@ - - + + - - + + - - + + - - + +