From d790237af334b7fb19bb043de4953545bcf89fe6 Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Wed, 21 May 2014 00:00:40 -0700
Subject: [PATCH 1/2] Generalize dependency references (unused) for nuget
 package.

---
 packaging/nuget/package.gsl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packaging/nuget/package.gsl b/packaging/nuget/package.gsl
index a040edfb..822a8704 100644
--- a/packaging/nuget/package.gsl
+++ b/packaging/nuget/package.gsl
@@ -29,6 +29,11 @@
         <releaseNotes>https://raw.github.com/jedisct1/libsodium/master/ChangeLog</releaseNotes>
         <copyright>(c) 2013-2014, Frank Denis (attribution required)</copyright>
         <tags>native, NaCl, salt, sodium, libodium, C++</tags>
+        <dependencies>
+.for dependency
+            <dependency id="$(id)" version="$(version)" />
+.endfor
+        </dependencies>        
         <!-- Salt shaker icon by Dubravko Soric :
         http://upload.wikimedia.org/wikipedia/commons/thumb/7/78/Salt_shaker_on_white_background.jpg/220px-Salt_shaker_on_white_background.jpg -->
     </metadata>
@@ -107,7 +112,7 @@
 #   GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY    #
 #################################################################
 -->
-<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!-- user interface -->
   <ItemGroup>

From e5648e21a23319805c2344d36340f5b3615fd72b Mon Sep 17 00:00:00 2001
From: evoskuil <eric@voskuil.org>
Date: Wed, 21 May 2014 00:01:26 -0700
Subject: [PATCH 2/2] Remove use of $(DefaultLinkage) for values reflected in
 the VS props UI.

---
 builds/msvc/vs2010/test/test.props | 10 ++++++++--
 builds/msvc/vs2012/test/test.props | 10 ++++++++--
 builds/msvc/vs2013/test/test.props | 10 ++++++++--
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/builds/msvc/vs2010/test/test.props b/builds/msvc/vs2010/test/test.props
index ce5e9106..de8bd4e7 100644
--- a/builds/msvc/vs2010/test/test.props
+++ b/builds/msvc/vs2010/test/test.props
@@ -24,8 +24,14 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+    <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libsodium>static</Linkage-libsodium>
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2012/test/test.props b/builds/msvc/vs2012/test/test.props
index ce5e9106..de8bd4e7 100644
--- a/builds/msvc/vs2012/test/test.props
+++ b/builds/msvc/vs2012/test/test.props
@@ -24,8 +24,14 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+    <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libsodium>static</Linkage-libsodium>
   </PropertyGroup>
 
   <!-- Messages -->
diff --git a/builds/msvc/vs2013/test/test.props b/builds/msvc/vs2013/test/test.props
index ce5e9106..de8bd4e7 100644
--- a/builds/msvc/vs2013/test/test.props
+++ b/builds/msvc/vs2013/test/test.props
@@ -24,8 +24,14 @@
     <Import Project="$(SolutionDir)libsodium.import.props" />
   </ImportGroup>
 
-  <PropertyGroup>
-    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
+    <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
+    <Linkage-libsodium>dynamic</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'ltcg'">
+    <Linkage-libsodium>ltcg</Linkage-libsodium>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
+    <Linkage-libsodium>static</Linkage-libsodium>
   </PropertyGroup>
 
   <!-- Messages -->