From 0eed55ce6afe2f993e4414e8777ae47181451bbd Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 27 May 2017 12:01:34 +0200
Subject: [PATCH] Remove redundant definitions from the project files

---
 builds/msvc/vs2010/libsodium/libsodium.vcxproj | 2 --
 builds/msvc/vs2012/libsodium/libsodium.vcxproj | 2 --
 builds/msvc/vs2013/libsodium/libsodium.vcxproj | 2 --
 builds/msvc/vs2015/libsodium/libsodium.vcxproj | 2 --
 builds/msvc/vs2017/libsodium/libsodium.vcxproj | 2 --
 libsodium.vcxproj                              | 2 --
 packaging/dotnet-core/libsodium.props          | 5 +++++
 7 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index b39b8b2e..18dc6d88 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -306,8 +306,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index 84b04e2c..6612db4f 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -306,8 +306,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index c4895506..f180b0fc 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -306,8 +306,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/builds/msvc/vs2015/libsodium/libsodium.vcxproj b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
index a9517555..9fcc6548 100644
--- a/builds/msvc/vs2015/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2015/libsodium/libsodium.vcxproj
@@ -306,8 +306,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/builds/msvc/vs2017/libsodium/libsodium.vcxproj b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
index 4c4b4387..7be374bc 100644
--- a/builds/msvc/vs2017/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2017/libsodium/libsodium.vcxproj
@@ -306,8 +306,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\..\resource.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
 </Project>
diff --git a/libsodium.vcxproj b/libsodium.vcxproj
index 4af86e5f..0c3f9ecd 100644
--- a/libsodium.vcxproj
+++ b/libsodium.vcxproj
@@ -544,8 +544,6 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="builds\msvc\resource.rc">
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='DebugDLL'">_DEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Configuration)'=='ReleaseDLL'">NDEBUG;$(Platform);%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/packaging/dotnet-core/libsodium.props b/packaging/dotnet-core/libsodium.props
index 96a0fc1b..250960a2 100644
--- a/packaging/dotnet-core/libsodium.props
+++ b/packaging/dotnet-core/libsodium.props
@@ -25,4 +25,9 @@
     <Content Include="runtimes\**\*.*" PackagePath="runtimes\" />
     <Content Include="build\**\*.*" PackagePath="build\" />
   </ItemGroup>
+  <ItemDefinitionGroup>
+    <Link>
+      <AdditionalDependencies>advapi32.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
 </Project>