Merge remote-tracking branch 'evoskuil/master'

* evoskuil/master: Update VS2010/2012 import props to match 2013. Update NuGet packaging. Modify VS props config for easy variation of output locations and messages. Use explicitly Unicode Win32 APIs. Update Visual Studio projects and packaging.
2026-08-25 08:37:13 +09:00 · 2014-05-11 09:18:17 -07:00
parent 244158ab2e 00f7fb537f
commit a0158e97da
57 changed files with 4144 additions and 2199 deletions
@@ -4,23 +4,19 @@
  <PropertyGroup>
    <_PropertySheetDisplayName>Common Settings</_PropertySheetDisplayName>
    <CharacterSet>Unicode</CharacterSet>
-    <TargetName>$(ProjectName)</TargetName>
  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">
+    <Import Condition="'$(Platform)' == 'Win32'" Project="x86.props" />
+    <Import Condition="'$(Platform)' == 'x64'" Project="x64.props" />
+  </ImportGroup>  
+
  <ItemDefinitionGroup>
    <ClCompile>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <!-- Windows and CRT definitions for unicode. Note that Linux only supports unicode so char is 16 bit. -->
      <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
    </ClCompile>
  </ItemDefinitionGroup>

-  <Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
-    <Message Text="Configuration     : $(Configuration)" Importance="high"/>
-    <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
-    <Message Text="Building..." Importance="high"/>
-  </Target>
-
 </Project>
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
+    
  <PropertyGroup>
    <_PropertySheetDisplayName>Dynamic Library</_PropertySheetDisplayName>
+    <DefaultLinkage>dynamic</DefaultLinkage>
+    <TargetExt>.dll</TargetExt>
  </PropertyGroup>
  
  <ItemDefinitionGroup>
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Common.props" />
+  </ImportGroup>
+  
  <PropertyGroup>
-    <_PropertySheetDisplayName>Debug Configuration</_PropertySheetDisplayName>
-    <!-- RootNamespace is used to deconflict output files from differing project versions. -->
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\</OutDir>
+    <_PropertySheetDisplayName>Debug Settings</_PropertySheetDisplayName>
+    <DebugOrRelease>debug</DebugOrRelease>
  </PropertyGroup>
  
  <ItemDefinitionGroup>
@@ -21,8 +23,7 @@
    </ResourceCompile>
    <Link>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Debug\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
-    </Link>
+    </Link>    
  </ItemDefinitionGroup>
  
 </Project>
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
  <PropertyGroup>
    <_PropertySheetDisplayName>Console Debug Dynamic</_PropertySheetDisplayName>
+    <DefaultLinkage>dynamic</DefaultLinkage>
  </PropertyGroup>
+
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Debug.props" />
+    <Import Project="EXE.props" />
+  </ImportGroup>
  
  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <LinkIncremental>true</LinkIncremental>
    </ClCompile>
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ImportGroup Label="PropertySheets">
-    <Import Project="Dynamic.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
  <PropertyGroup>
    <_PropertySheetDisplayName>Dynamic Debug Library</_PropertySheetDisplayName>
  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">
+    <Import Project="Debug.props" />
+    <Import Project="DLL.props" />
+  </ImportGroup>
+
  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
      <LinkIncremental>true</LinkIncremental>
    </ClCompile>
  </ItemDefinitionGroup>
-
+  
 </Project>
@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
-
  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Debug Link Time Code Generation Library</_PropertySheetDisplayName>
+    <_PropertySheetDisplayName>Console Debug Link Time Code Generation</_PropertySheetDisplayName>
  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">
+    <Import Project="Debug.props" />
+    <Import Project="Link.props" />
+    <Import Project="EXE.props" />
+  </ImportGroup>
+
  <ItemDefinitionGroup>
    <ClCompile>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>false</LinkIncremental>
    </ClCompile>
  </ItemDefinitionGroup>

@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-  
  <PropertyGroup>
    <_PropertySheetDisplayName>Static Debug Library</_PropertySheetDisplayName>
  </PropertyGroup>
  
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Debug.props" />
+    <Import Project="LIB.props" />
+  </ImportGroup>
+  
  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <LinkIncremental>true</LinkIncremental>
    </ClCompile>
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Debug.props" />
-    <Import Project="StaticLinkTimeCodeGeneration.props" />
-  </ImportGroup>
-  
  <PropertyGroup>
    <_PropertySheetDisplayName>Static Debug Link Time Code Generation Library</_PropertySheetDisplayName>
  </PropertyGroup>
+  
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Debug.props" />
+    <Import Project="LTCG.props" />
+  </ImportGroup>

  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LinkIncremental>false</LinkIncremental>
    </ClCompile>
  </ItemDefinitionGroup>

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Debug.props" />
-  </ImportGroup>
-
  <PropertyGroup>
    <_PropertySheetDisplayName>Console Debug Static</_PropertySheetDisplayName>
+    <DefaultLinkage>static</DefaultLinkage>
  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">
+    <Import Project="Debug.props" />
+    <Import Project="EXE.props" />
+  </ImportGroup>
+
  <ItemDefinitionGroup>
    <ClCompile>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
+    
  <PropertyGroup>
    <_PropertySheetDisplayName>Console Application</_PropertySheetDisplayName>
+    <IsExe>true</IsExe>    
  </PropertyGroup>

  <ItemDefinitionGroup>
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Common.props" />
-  </ImportGroup>
-  
  <PropertyGroup>
    <_PropertySheetDisplayName>Static Library</_PropertySheetDisplayName>
+    <DefaultLinkage>static</DefaultLinkage>
+    <TargetExt>.lib</TargetExt>
  </PropertyGroup>
  
  <ItemDefinitionGroup>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
+  </PropertyGroup>
+  
+  <ImportGroup Label="PropertySheets">
+    <Import Project="LIB.props" />
+    <Import Project="Link.props" />
+  </ImportGroup>
+
+</Project>
@@ -2,7 +2,8 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   
  <PropertyGroup>
-    <_PropertySheetDisplayName>Link Time Code Generation Library</_PropertySheetDisplayName>
+    <_PropertySheetDisplayName>Link Time Code Generation Settings</_PropertySheetDisplayName>
+    <DefaultLinkage>ltcg</DefaultLinkage>
  </PropertyGroup>

  <ItemDefinitionGroup>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <PropertyGroup>
+    <_PropertySheetDisplayName>Build Messages</_PropertySheetDisplayName>
+  </PropertyGroup>
+
+  <Target Name="ConfigInfo" BeforeTargets="PrepareForBuild">
+    <Message Text="ConfigurationType : $(ConfigurationType)" Importance="high"/>
+    <Message Text="Configuration     : $(Configuration)" Importance="high"/>
+    <Message Text="PlatformToolset   : $(PlatformToolset)" Importance="high"/>
+    <Message Text="Processor         : $(Processor)" Importance="high"/>
+    <Message Text="TargetPath        : $(TargetPath)" Importance="high"/>
+  </Target>
+
+</Project>
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ 
+  <PropertyGroup>
+    <_PropertySheetDisplayName>Output Settings</_PropertySheetDisplayName>
+    <BuildRoot>$(ProjectDir)..\..\</BuildRoot>
+    <RepoRoot>$(ProjectDir)..\..\..\..\</RepoRoot>
+    <SourceRoot>$(ProjectDir)..\..\..\..\..\</SourceRoot>
+    <OutDir>$(RepoRoot)bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\</OutDir>
+    <IntDir>$(RepoRoot)obj\$(TargetName)\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(DefaultLinkage)\</IntDir>
+    <TargetDir>$(OutDir)</TargetDir>
+    <TargetName>$(TargetName)</TargetName>
+    <TargetPath>$(TargetDir)$(TargetName)$(TargetExt)</TargetPath>
+  </PropertyGroup>
+  
+  <ItemDefinitionGroup>
+    <Link>
+      <ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
+    </Link>
+    <BuildLog>
+      <Path>$(OutDir)$(TargetName).log</Path>
+    </BuildLog> 
+  </ItemDefinitionGroup>
+  
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Messages.props" />
+  </ImportGroup>    
+  
+</Project>
@@ -1,11 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Common.props" />
+  </ImportGroup>
  
  <PropertyGroup>
-    <_PropertySheetDisplayName>Release Configuration</_PropertySheetDisplayName>
-    <!-- RootNamespace is used to deconflict output files from differing project versions. -->
-    <IntDir>$(ProjectDir)..\..\..\..\obj\$(PlatformName)\$(Configuration)\$(RootNamespace)\</IntDir>
-    <OutDir>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\</OutDir>
+    <_PropertySheetDisplayName>Release Settings</_PropertySheetDisplayName>
+    <DebugOrRelease>release</DebugOrRelease>
    <LinkIncremental>false</LinkIncremental>
  </PropertyGroup>
  
@@ -26,12 +28,11 @@
    <Link>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
      <!--<GenerateDebugInformation>true</GenerateDebugInformation>-->
-      <ImportLibrary>$(ProjectDir)..\..\..\..\bin\$(PlatformName)\Release\$(RootNamespace)\$(TargetName).imp.lib</ImportLibrary>
      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
+    </Link> 
  </ItemDefinitionGroup>

-  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+  <ItemDefinitionGroup Condition="'$(Processor)' == 'x86'">
    <ClCompile>
      <EnableEnhancedInstructionSet>StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
    </ClCompile>
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-
  <PropertyGroup>
    <_PropertySheetDisplayName>Console Release Dynamic</_PropertySheetDisplayName>
+    <DefaultLinkage>dynamic</DefaultLinkage>
  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">
+    <Import Project="Release.props" />
+    <Import Project="EXE.props" />
+  </ImportGroup>
+
  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Dynamic.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
  
  <PropertyGroup>
    <_PropertySheetDisplayName>Dynamic Release Library</_PropertySheetDisplayName>
  </PropertyGroup>
+
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Release.props" />
+    <Import Project="DLL.props" />
+  </ImportGroup>
  
  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Linking CRT dynamically when building a dynamic library is conventional. -->
      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
-
  <PropertyGroup>
-    <_PropertySheetDisplayName>Console Release Link Time Code Generation Library</_PropertySheetDisplayName>
+    <_PropertySheetDisplayName>Console Release Link Time Code Generation</_PropertySheetDisplayName>
  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">
+    <Import Project="Release.props" />
+    <Import Project="Link.props" />
+    <Import Project="EXE.props" />
+  </ImportGroup>
+
  <ItemDefinitionGroup>
    <ClCompile>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>

  <PropertyGroup>
    <_PropertySheetDisplayName>Static Release Library</_PropertySheetDisplayName>
  </PropertyGroup>
+  
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Release.props" />
+    <Import Project="LIB.props" />
+  </ImportGroup>

  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -1,18 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Release.props" />
-    <Import Project="StaticLinkTimeCodeGeneration.props" />
-  </ImportGroup>

  <PropertyGroup>
    <_PropertySheetDisplayName>Static Release Link Time Code Generation Library</_PropertySheetDisplayName>
  </PropertyGroup>
+  
+  <ImportGroup Label="PropertySheets">
+    <Import Project="Release.props" />
+    <Import Project="LTCG.props" />
+  </ImportGroup>

  <ItemDefinitionGroup>
    <ClCompile>
-      <!-- Linking CRT statically when building a static library is conventional. -->
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
    </ClCompile>
  </ItemDefinitionGroup>
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <ImportGroup Label="PropertySheets">
-    <Import Project="Console.props" />
-    <Import Project="Release.props" />
-  </ImportGroup>
-
  <PropertyGroup>
    <_PropertySheetDisplayName>Console Release Static</_PropertySheetDisplayName>
+    <DefaultLinkage>static</DefaultLinkage>
  </PropertyGroup>

+  <ImportGroup Label="PropertySheets">
+    <Import Project="Release.props" />
+    <Import Project="EXE.props" />
+  </ImportGroup>
+
  <ItemDefinitionGroup>
    <ClCompile>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  
-  <ImportGroup Label="PropertySheets">
-    <Import Project="Static.props" />
-    <Import Project="LinkTimeCodeGeneration.props" />
-  </ImportGroup>
- 
-  <PropertyGroup>
-    <_PropertySheetDisplayName>Static Link Time Code Generation Library</_PropertySheetDisplayName>
-    
-    <!-- This overrides Static.props->Common.props->TargetName and therefore this 
-    reference must always be set after Static.props->Common.props is included. -->
-    <TargetName>$(TargetName).ltcg</TargetName>
-  </PropertyGroup>
-
-</Project>
@@ -3,8 +3,9 @@
  
  <PropertyGroup>
    <_PropertySheetDisplayName>x64 Settings</_PropertySheetDisplayName>
+    <Processor>x64</Processor>      
  </PropertyGroup>
-  
+    
  <ItemDefinitionGroup>
    <ClCompile>
      <!-- Note that Win64 defines may cause WIN32 to become defined when using windows headers, 
@@ -2,7 +2,8 @@
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  
  <PropertyGroup>
-    <_PropertySheetDisplayName>Win32 Settings</_PropertySheetDisplayName>
+    <_PropertySheetDisplayName>x86 Settings</_PropertySheetDisplayName>
+    <Processor>x86</Processor>      
  </PropertyGroup>
  
  <ItemDefinitionGroup>
@@ -15,65 +15,32 @@

  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SourceRoot)libsodium\src\libsodium\include;$(SourceRoot)libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">
-    <ClCompile>
-      <PreprocessorDefinitions>SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-    <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'static'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'ltcg'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>

  <!-- Copy -->

  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.dll"
+    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.dll"
          DestinationFiles="$(TargetDir)libsodium.dll"
          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium10\libsodium.pdb"
+    <Copy Condition="'$(DebugOrRelease)' == 'debug'"
+          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.pdb"
          DestinationFiles="$(TargetDir)libsodium.pdb"
          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium10\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
  </Target>

  <!-- Messages -->

  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
+    <Message Text="Copying libsodium_dynamic.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
+    <Message Text="Copying libsodium_dynamic.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
  </Target>

 </Project>
@@ -6,27 +6,38 @@
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <RunCodeAnalysis>false</RunCodeAnalysis>
  </PropertyGroup>
+  
+  <!-- User Interface -->
+  
+  <ItemGroup Label="BuildOptionsExtension">
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
+  </ItemGroup>

  <!-- Configuration -->
  
  <ItemDefinitionGroup>
    <PreBuildEvent>
-      <Command>copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\</Command>
+      <Command>copy $(BuildRoot)version.h $(RepoRoot)src\libsodium\include\sodium\</Command>
    </PreBuildEvent>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)src\libsodium\include;$(RepoRoot)src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4146;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <EnablePREfast>false</EnablePREfast>
      <PreprocessorDefinitions>inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-amd64asm)' == 'true'">HAVE_AMD64_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>

  <!-- Messages -->

  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(ProjectDir)..\..\version.h -&gt; $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\version.h" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
+  </Target>
+  
+  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
+    <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
  </Target>

 </Project>
@@ -3,7 +3,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{A185B162-6CB6-4502-B03F-B56F7699A8D9}</ProjectGuid>
    <ProjectName>libsodium</ProjectName>
-    <RootNamespace>libsodium10</RootNamespace>
+    <PlatformToolset>v100</PlatformToolset>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="DebugDLL|Win32">
@@ -55,9 +55,6 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
@@ -93,142 +90,214 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
+  </PropertyGroup>  
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pwhash_scryptxsalsa208sha256.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sse\pwhash_scryptxsalsa208sha256_sse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\base_curve25519_donna_c64.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\smult_curve25519_donna_c64.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\base_curve25519_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\smult_curve25519_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c" />
    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_pwhash_scryptxsalsa208sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\runtime.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\crypto_auth.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\auth_hmacsha256_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\hmac_hmacsha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\verify_hmacsha256.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\verify_hmacsha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\hmac_hmacsha512256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\box_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\keypair_curve25519xsalsa20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\core_salsa20.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\generichash_blake2_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-ref.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\generichash_blake2b.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\crypto_hash.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\hash_sha256_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\hash_sha512.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\hash_sha512_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\hash_sha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\crypto_onetimeauth.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\verify_poly1305_donna.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305_try.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\verify_poly1305_donna.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt-common.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pwhash_scryptxsalsa208sha256.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\scrypt_platform.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sse\pwhash_scryptxsalsa208sha256_sse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\crypto_scalarmult.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\base_curve25519_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\smult_curve25519_ref.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox_easy.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\secretbox_xsalsa20poly1305_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\crypto_shorthash.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\shorthash_siphash24_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\crypto_sign.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_1.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_add.c" />
@@ -245,64 +314,94 @@
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_sq2.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_sub.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_tobytes.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_double_scalarmult.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_frombytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p2.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p3.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_dbl.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_cached.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_p2.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_precomp_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_scalarmult_base.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\keypair.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\open.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc_muladd.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc_reduce.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sign.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519_edwards25519sha512batch.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519_edwards25519sha512batch.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519_edwards25519sha512batch.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sign_edwards25519sha512batch.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\crypto_stream.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\afternm_aes128ctr.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128_aes128ctr.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\crypto_stream.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\stream_salsa2012.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\xor_salsa2012.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\stream_salsa208.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\xor_salsa208.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\stream_xsalsa20.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\xor_xsalsa20.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\verify_16_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\verify_32_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\verify_64_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c" />
@@ -311,12 +410,13 @@
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\version.c" />
-  </ItemGroup>
-  <ItemGroup>
    <ClInclude Include="..\..\resource.h" />
  </ItemGroup>
  <ItemGroup>
-    <ResourceCompile Include="..\..\libsodium.rc" />
+    <None Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\stream_salsa20_amd64_xmm6.S" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc" />
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\..\..\packaging\nuget\package.bat" />
@@ -329,4 +429,4 @@
    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
+  <Rule Name="libsodium-uiextension" PageTemplate="tool" DisplayName="Sodium Options" SwitchPrefix="/" Order="1">
+    <Rule.Categories>
+      <Category Name="amd64asm" DisplayName="amd64asm" />
+    </Rule.Categories>
+    <Rule.DataSource>
+      <DataSource Persistence="ProjectFile" ItemType="" />
+    </Rule.DataSource>
+    <EnumProperty Name="Option-amd64asm" DisplayName="Enable AMD64 Assembly" Description="Enable the AMD64 Assembly build option" Category="amd64asm">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
+  </Rule>
+</ProjectSchemaDefinitions>
@@ -8,10 +8,10 @@
  </PropertyGroup>

  <!-- Configuration -->
-  
+
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <EnablePREfast>false</EnablePREfast>
      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <!--<PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
@@ -24,14 +24,8 @@
    <Import Project="$(SolutionDir)libsodium.import.props" />
  </ImportGroup>

-  <PropertyGroup Condition="$(Configuration.IndexOf('DEXE')) != -1">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.IndexOf('LEXE')) != -1">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.IndexOf('SEXE')) != -1">
-    <Linkage-libsodium>static</Linkage-libsodium>
+  <PropertyGroup>
+    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
  </PropertyGroup>

  <!-- Messages -->
@@ -1,88 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4EDBA07C-2F08-4C9E-805F-A4921814C117}</ProjectGuid>
    <ProjectName>test</ProjectName>
-    <RootNamespace>test10</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
    <PlatformToolset>v100</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="DebugDEXE|Win32">
      <Configuration>DebugDEXE</Configuration>
@@ -133,6 +56,68 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\test\default\auth.c">
      <ExcludedFromBuild>false</ExcludedFromBuild>
@@ -159,11 +144,9 @@
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\box_easy.c">
-      <!-- NOTE: crypto_box_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
-      <!-- NOTE: crypto_box_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\core1.c">
@@ -208,6 +191,9 @@
    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\pwhash.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\randombytes.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
@@ -242,16 +228,17 @@
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c">
-      <!-- NOTE: crypto_secretbox_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c">
-      <!-- NOTE: crypto_secretbox_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\shorthash.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sign.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\sodium_core.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
@@ -142,6 +142,12 @@
    <ClCompile Include="..\..\..\..\test\default\stream6.c">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sign.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\pwhash.c">
+      <Filter>src</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
@@ -15,65 +15,32 @@

  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SourceRoot)libsodium\src\libsodium\include;$(SourceRoot)libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
-  </ItemDefinitionGroup>
-  
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">
-    <ClCompile>
-      <PreprocessorDefinitions>SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-  </ItemDefinitionGroup>
-
-    <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'static'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'ltcg'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>

  <!-- Copy -->

  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.dll"
+    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.dll"
          DestinationFiles="$(TargetDir)libsodium.dll"
          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium11\libsodium.pdb"
+    <Copy Condition="'$(DebugOrRelease)' == 'debug'"
+          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.pdb"
          DestinationFiles="$(TargetDir)libsodium.pdb"
          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium11\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
  </Target>

  <!-- Messages -->

  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
+    <Message Text="Copying libsodium_dynamic.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
+    <Message Text="Copying libsodium_dynamic.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
  </Target>

 </Project>
@@ -6,27 +6,38 @@
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <RunCodeAnalysis>false</RunCodeAnalysis>
  </PropertyGroup>
+  
+  <!-- User Interface -->
+  
+  <ItemGroup Label="BuildOptionsExtension">
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
+  </ItemGroup>

  <!-- Configuration -->
  
  <ItemDefinitionGroup>
    <PreBuildEvent>
-      <Command>copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\</Command>
+      <Command>copy $(BuildRoot)version.h $(RepoRoot)src\libsodium\include\sodium\</Command>
    </PreBuildEvent>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)src\libsodium\include;$(RepoRoot)src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4146;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <EnablePREfast>false</EnablePREfast>
      <PreprocessorDefinitions>inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-amd64asm)' == 'true'">HAVE_AMD64_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>

  <!-- Messages -->

  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(ProjectDir)..\..\version.h -&gt; $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\version.h" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
+  </Target>
+  
+  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
+    <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
  </Target>

 </Project>
@@ -3,7 +3,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{A185B162-6CB6-4502-B03F-B56F7699A8D9}</ProjectGuid>
    <ProjectName>libsodium</ProjectName>
-    <RootNamespace>libsodium11</RootNamespace>
+    <PlatformToolset>v110</PlatformToolset>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="DebugDLL|Win32">
@@ -55,9 +55,6 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v110</PlatformToolset>
-  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
@@ -93,142 +90,214 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
+  </PropertyGroup>  
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pwhash_scryptxsalsa208sha256.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sse\pwhash_scryptxsalsa208sha256_sse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\base_curve25519_donna_c64.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\smult_curve25519_donna_c64.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\base_curve25519_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\smult_curve25519_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c" />
    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_pwhash_scryptxsalsa208sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\runtime.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\crypto_auth.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\auth_hmacsha256_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\hmac_hmacsha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\verify_hmacsha256.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\verify_hmacsha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\hmac_hmacsha512256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\box_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\keypair_curve25519xsalsa20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\core_salsa20.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\generichash_blake2_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-ref.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\generichash_blake2b.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\crypto_hash.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\hash_sha256_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\hash_sha512.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\hash_sha512_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\hash_sha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\crypto_onetimeauth.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\verify_poly1305_donna.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305_try.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\verify_poly1305_donna.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt-common.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pwhash_scryptxsalsa208sha256.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\scrypt_platform.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sse\pwhash_scryptxsalsa208sha256_sse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\crypto_scalarmult.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\base_curve25519_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\smult_curve25519_ref.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox_easy.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\secretbox_xsalsa20poly1305_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\crypto_shorthash.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\shorthash_siphash24_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\crypto_sign.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_1.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_add.c" />
@@ -245,64 +314,94 @@
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_sq2.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_sub.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_tobytes.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_double_scalarmult.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_frombytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p2.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p3.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_dbl.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_cached.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_p2.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_precomp_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_scalarmult_base.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\keypair.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\open.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc_muladd.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc_reduce.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sign.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519_edwards25519sha512batch.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519_edwards25519sha512batch.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519_edwards25519sha512batch.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sign_edwards25519sha512batch.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\crypto_stream.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\afternm_aes128ctr.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128_aes128ctr.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\crypto_stream.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\stream_salsa2012.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\xor_salsa2012.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\stream_salsa208.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\xor_salsa208.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\stream_xsalsa20.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\xor_xsalsa20.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\verify_16_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\verify_32_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\verify_64_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c" />
@@ -311,12 +410,13 @@
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\version.c" />
-  </ItemGroup>
-  <ItemGroup>
    <ClInclude Include="..\..\resource.h" />
  </ItemGroup>
  <ItemGroup>
-    <ResourceCompile Include="..\..\libsodium.rc" />
+    <None Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\stream_salsa20_amd64_xmm6.S" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc" />
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\..\..\packaging\nuget\package.bat" />
@@ -329,4 +429,4 @@
    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
+  <Rule Name="libsodium-uiextension" PageTemplate="tool" DisplayName="Sodium Options" SwitchPrefix="/" Order="1">
+    <Rule.Categories>
+      <Category Name="amd64asm" DisplayName="amd64asm" />
+    </Rule.Categories>
+    <Rule.DataSource>
+      <DataSource Persistence="ProjectFile" ItemType="" />
+    </Rule.DataSource>
+    <EnumProperty Name="Option-amd64asm" DisplayName="Enable AMD64 Assembly" Description="Enable the AMD64 Assembly build option" Category="amd64asm">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
+  </Rule>
+</ProjectSchemaDefinitions>
@@ -8,10 +8,10 @@
  </PropertyGroup>

  <!-- Configuration -->
-  
+
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <EnablePREfast>false</EnablePREfast>
      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <!--<PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
@@ -24,14 +24,8 @@
    <Import Project="$(SolutionDir)libsodium.import.props" />
  </ImportGroup>

-  <PropertyGroup Condition="$(Configuration.IndexOf('DEXE')) != -1">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.IndexOf('LEXE')) != -1">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.IndexOf('SEXE')) != -1">
-    <Linkage-libsodium>static</Linkage-libsodium>
+  <PropertyGroup>
+    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
  </PropertyGroup>

  <!-- Messages -->
@@ -1,88 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4EDBA07C-2F08-4C9E-805F-A4921814C117}</ProjectGuid>
    <ProjectName>test</ProjectName>
-    <RootNamespace>test11</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
    <PlatformToolset>v110</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="DebugDEXE|Win32">
      <Configuration>DebugDEXE</Configuration>
@@ -133,6 +56,68 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\test\default\auth.c">
      <ExcludedFromBuild>false</ExcludedFromBuild>
@@ -159,11 +144,9 @@
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\box_easy.c">
-      <!-- NOTE: crypto_box_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
-      <!-- NOTE: crypto_box_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\core1.c">
@@ -208,6 +191,9 @@
    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\pwhash.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\randombytes.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
@@ -242,16 +228,17 @@
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c">
-      <!-- NOTE: crypto_secretbox_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c">
-      <!-- NOTE: crypto_secretbox_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\shorthash.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sign.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\sodium_core.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
@@ -142,6 +142,12 @@
    <ClCompile Include="..\..\..\..\test\default\stream6.c">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sign.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\pwhash.c">
+      <Filter>src</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
@@ -15,60 +15,32 @@

  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include;$(ProjectDir)..\..\..\..\..\libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SourceRoot)libsodium\src\libsodium\include;$(SourceRoot)libsodium\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions Condition="'$(Linkage-libsodium)' == 'static' Or '$(Linkage-libsodium)' == 'ltcg'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'static'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-
-  <ItemDefinitionGroup Condition="'$(Linkage-libsodium)' == 'ltcg'">
-    <Link Condition="$(Configuration.IndexOf('Debug')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-    <Link Condition="$(Configuration.IndexOf('Release')) != -1">
-      <AdditionalDependencies>$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    <Link>
+      <AdditionalDependencies>advapi32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>

  <!-- Copy -->

  <Target Name="Linkage-libsodium-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.dll"
+    <Copy SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.dll"
          DestinationFiles="$(TargetDir)libsodium.dll"
          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Debug')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Debug\libsodium12\libsodium.pdb"
+    <Copy Condition="'$(DebugOrRelease)' == 'debug'"
+          SourceFiles="$(SourceRoot)libsodium\bin\$(Processor)\$(DebugOrRelease)\$(PlatformToolset)\$(Linkage-libsodium)\libsodium.pdb"
          DestinationFiles="$(TargetDir)libsodium.pdb"
          SkipUnchangedFiles="true" />
-    <Copy Condition="$(Configuration.IndexOf('Release')) != -1"
-          SourceFiles="$(ProjectDir)..\..\..\..\..\libsodium\bin\$(PlatformName)\Release\libsodium12\libsodium.dll"
-          DestinationFiles="$(TargetDir)libsodium.dll"
-          SkipUnchangedFiles="true" />
  </Target>

  <!-- Messages -->

  <Target Name="libsodium-info" BeforeTargets="AfterBuild" Condition="'$(Linkage-libsodium)' == 'dynamic'">
-    <Message Text="Copying libsodium.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
-    <Message Text="Copying libsodium.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
+    <Message Text="Copying libsodium_dynamic.dll -&gt; $(TargetDir)libsodium.dll" Importance="high"/>
+    <Message Text="Copying libsodium_dynamic.pdb -&gt; $(TargetDir)libsodium.pdb" Importance="high" Condition="'$(DebugOrRelease)' == 'debug'" />
  </Target>

 </Project>
@@ -6,27 +6,38 @@
    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
    <RunCodeAnalysis>false</RunCodeAnalysis>
  </PropertyGroup>
+  
+  <!-- User Interface -->
+  
+  <ItemGroup Label="BuildOptionsExtension">
+    <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
+  </ItemGroup>

  <!-- Configuration -->
  
  <ItemDefinitionGroup>
    <PreBuildEvent>
-      <Command>copy $(ProjectDir)..\..\version.h $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\</Command>
+      <Command>copy $(BuildRoot)version.h $(RepoRoot)src\libsodium\include\sodium\</Command>
    </PreBuildEvent>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\src\libsodium\include;$(ProjectDir)..\..\..\..\src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)src\libsodium\include;$(RepoRoot)src\libsodium\include\sodium\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <DisableSpecificWarnings>4146;4244;%(DisableSpecificWarnings)</DisableSpecificWarnings>
      <EnablePREfast>false</EnablePREfast>
      <PreprocessorDefinitions>inline=__inline;NATIVE_LITTLE_ENDIAN;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'StaticLibrary'">SODIUM_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">DLL_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Option-amd64asm)' == 'true'">HAVE_AMD64_ASM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    </ClCompile>
  </ItemDefinitionGroup>

  <!-- Messages -->

  <Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
-    <Message Text="Will copy $(ProjectDir)..\..\version.h -&gt; $(ProjectDir)..\..\..\..\src\libsodium\include\sodium\version.h" Importance="high"/>
+    <Message Text="Will copy $(BuildRoot)version.h -&gt; $(RepoRoot)src\libsodium\include\sodium\version.h" Importance="high"/>
+  </Target>
+  
+  <Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
+    <Message Text="Option-amd64asm   : $(Option-amd64asm)" Importance="high"/>
  </Target>

 </Project>
@@ -3,7 +3,7 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{A185B162-6CB6-4502-B03F-B56F7699A8D9}</ProjectGuid>
    <ProjectName>libsodium</ProjectName>
-    <RootNamespace>libsodium12</RootNamespace>
+    <PlatformToolset>v120</PlatformToolset>
  </PropertyGroup>
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="DebugDLL|Win32">
@@ -55,9 +55,6 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
-  <PropertyGroup Label="Configuration">
-    <PlatformToolset>v120</PlatformToolset>
-  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
  </PropertyGroup>
@@ -93,142 +90,214 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
-  </PropertyGroup>
+  </PropertyGroup>  
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDLL.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\DynamicRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLTCG.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\DebugLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticDebug.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLIB.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\StaticRelease.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
  </ImportGroup>
  <ItemGroup>
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pwhash_scryptxsalsa208sha256.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sse\pwhash_scryptxsalsa208sha256_sse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\base_curve25519_donna_c64.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\smult_curve25519_donna_c64.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\base_curve25519_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\smult_curve25519_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c" />
    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium.h" />
-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\version.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\core.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_pwhash_scryptxsalsa208sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\runtime.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_int64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint16.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_uint8.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_16.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_32.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_verify_64.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\export.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h" />
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\crypto_auth.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\auth_hmacsha256_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\hmac_hmacsha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\verify_hmacsha256.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\verify_hmacsha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\auth_hmacsha512256_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\hmac_hmacsha512256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\hmac_hmacsha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\crypto_box_easy.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\box_curve25519xsalsa20poly1305_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\before_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\box_curve25519xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\keypair_curve25519xsalsa20poly1305.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\core_hsalsa20.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\core_hsalsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\hsalsa20\ref2\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\core_salsa20.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa20\core_salsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa20\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\core_salsa2012.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\core_salsa2012_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa2012\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\core_salsa208.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_core\salsa208\core_salsa208_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_core\salsa208\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\generichash_blake2_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2-impl.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\blake2b-ref.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\blake2\ref\generichash_blake2b.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_generichash\crypto_generichash.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\crypto_hash.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\hash_sha256_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\hash_sha512.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha256\cp\hash_sha256.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\hash_sha512_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_hash\sha512\cp\hash_sha512.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\crypto_onetimeauth.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\verify_poly1305_donna.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305_api.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\onetimeauth_poly1305_try.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\auth_poly1305_donna.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_onetimeauth\poly1305\donna\verify_poly1305_donna.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt-common.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\nosse\pwhash_scryptxsalsa208sha256_nosse.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pwhash_scryptxsalsa208sha256.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\crypto_scrypt.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\scrypt_platform.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sse\pwhash_scryptxsalsa208sha256_sse.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\pbkdf2-sha256.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptxsalsa208sha256\sysendian.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\crypto_scalarmult.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\base_curve25519_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\smult_curve25519_ref.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\scalarmult_curve25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\donna_c64\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_scalarmult\curve25519\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\crypto_secretbox_easy.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\secretbox_xsalsa20poly1305_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_secretbox\xsalsa20poly1305\ref\box_xsalsa20poly1305.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\crypto_shorthash.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\shorthash_siphash24_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_shorthash\siphash24\ref\shorthash_siphash24.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\crypto_sign.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha256\cp\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\cp\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\base2.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\d2.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_1.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_add.c" />
@@ -245,64 +314,94 @@
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_sq2.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_sub.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe_tobytes.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_add.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_double_scalarmult.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_frombytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_madd.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_msub.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p2.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p1p1_to_p3.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p2_dbl.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_dbl.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_cached.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_to_p2.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_p3_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_precomp_0.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_scalarmult_base.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_sub.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\ge_tobytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\keypair.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\open.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow22523.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\pow225521.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc_muladd.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sc_reduce.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sign.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\sign_ed25519_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\sqrtm1.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\fe25519_edwards25519sha512batch.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\ge25519_edwards25519sha512batch.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sc25519_edwards25519sha512batch.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\ref\sign_edwards25519sha512batch.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_sign\edwards25519sha512batch\sign_edwards25519sha512batch_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\crypto_stream.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\afternm_aes128ctr.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\beforenm_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\common_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\consts_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\int128_aes128ctr.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\stream_aes128ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\types.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\xor_afternm_aes128ctr.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\crypto_stream.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\api.h" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\stream_salsa2012.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\ref\xor_salsa2012.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa2012\stream_salsa2012_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\stream_salsa208.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\ref\xor_salsa208.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa208\stream_salsa208_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\stream_salsa20_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\ref\xor_salsa20_ref.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\api.h" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\stream_xsalsa20.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\ref\xor_xsalsa20.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\xsalsa20\stream_xsalsa20_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\verify_16_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\verify_16.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\verify_32_api.c" />
-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\32\ref\verify_32.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\verify_64_api.c" />
+    <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\api.h" />
+    <ClCompile Include="..\..\..\..\src\libsodium\crypto_verify\64\ref\verify_64.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\randombytes.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\salsa20\randombytes_salsa20_random.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c" />
@@ -311,12 +410,13 @@
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />
    <ClCompile Include="..\..\..\..\src\libsodium\sodium\version.c" />
-  </ItemGroup>
-  <ItemGroup>
    <ClInclude Include="..\..\resource.h" />
  </ItemGroup>
  <ItemGroup>
-    <ResourceCompile Include="..\..\libsodium.rc" />
+    <None Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\amd64_xmm6\stream_salsa20_amd64_xmm6.S" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\resource.rc" />
  </ItemGroup>
  <ItemGroup>
    <None Include="..\..\..\..\packaging\nuget\package.bat" />
@@ -329,4 +429,4 @@
    <Xml Include="..\..\..\..\packaging\nuget\package.xml" />
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
+</Project>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ProjectSchemaDefinitions xmlns="clr-namespace:Microsoft.Build.Framework.XamlTypes;assembly=Microsoft.Build.Framework">
+  <Rule Name="libsodium-uiextension" PageTemplate="tool" DisplayName="Sodium Options" SwitchPrefix="/" Order="1">
+    <Rule.Categories>
+      <Category Name="amd64asm" DisplayName="amd64asm" />
+    </Rule.Categories>
+    <Rule.DataSource>
+      <DataSource Persistence="ProjectFile" ItemType="" />
+    </Rule.DataSource>
+    <EnumProperty Name="Option-amd64asm" DisplayName="Enable AMD64 Assembly" Description="Enable the AMD64 Assembly build option" Category="amd64asm">
+      <EnumValue Name="" DisplayName="No" />
+      <EnumValue Name="true" DisplayName="Yes" />
+    </EnumProperty>
+  </Rule>
+</ProjectSchemaDefinitions>
@@ -8,10 +8,10 @@
  </PropertyGroup>

  <!-- Configuration -->
-  
+
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\test\default\;$(ProjectDir)..\..\..\..\test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(RepoRoot)test\default\;$(RepoRoot)test\quirks\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <EnablePREfast>false</EnablePREfast>
      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <!--<PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN;%(PreprocessorDefinitions)</PreprocessorDefinitions>-->
@@ -24,14 +24,8 @@
    <Import Project="$(SolutionDir)libsodium.import.props" />
  </ImportGroup>

-  <PropertyGroup Condition="$(Configuration.IndexOf('DEXE')) != -1">
-    <Linkage-libsodium>dynamic</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.IndexOf('LEXE')) != -1">
-    <Linkage-libsodium>ltcg</Linkage-libsodium>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(Configuration.IndexOf('SEXE')) != -1">
-    <Linkage-libsodium>static</Linkage-libsodium>
+  <PropertyGroup>
+    <Linkage-libsodium>$(DefaultLinkage)</Linkage-libsodium>
  </PropertyGroup>

  <!-- Messages -->
@@ -3,86 +3,9 @@
  <PropertyGroup Label="Globals">
    <ProjectGuid>{4EDBA07C-2F08-4C9E-805F-A4921814C117}</ProjectGuid>
    <ProjectName>test</ProjectName>
-    <RootNamespace>test12</RootNamespace>
-  </PropertyGroup>
-  <PropertyGroup Label="Configuration">
    <PlatformToolset>v120</PlatformToolset>
    <ConfigurationType>Application</ConfigurationType>
  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseDynamic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseLinkTimeCodeGeneration.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\Win32.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleDebugStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="$(ProjectDir)$(ProjectName).props" />
-    <Import Project="$(ProjectDir)..\..\properties\ConsoleReleaseStatic.props" />
-    <Import Project="$(ProjectDir)..\..\properties\x64.props" />
-  </ImportGroup>
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="DebugDEXE|Win32">
      <Configuration>DebugDEXE</Configuration>
@@ -133,6 +56,68 @@
      <Platform>x64</Platform>
    </ProjectConfiguration>
  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugDEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseDEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugLEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseLEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|Win32'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\DebugSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseSEXE|x64'" Label="PropertySheets">
+    <Import Project="$(ProjectDir)..\..\properties\ReleaseSEXE.props" />
+    <Import Project="$(ProjectDir)..\..\properties\Output.props" />
+    <Import Project="$(ProjectDir)$(ProjectName).props" />
+  </ImportGroup>
  <ItemGroup>
    <ClCompile Include="..\..\..\..\test\default\auth.c">
      <ExcludedFromBuild>false</ExcludedFromBuild>
@@ -159,11 +144,9 @@
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\box_easy.c">
-      <!-- NOTE: crypto_box_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\box_easy2.c">
-      <!-- NOTE: crypto_box_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\core1.c">
@@ -208,6 +191,9 @@
    <ClCompile Include="..\..\..\..\test\default\onetimeauth7.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\pwhash.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\randombytes.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
@@ -242,16 +228,17 @@
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\secretbox_easy.c">
-      <!-- NOTE: crypto_secretbox_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\secretbox_easy2.c">
-      <!-- NOTE: crypto_secretbox_easy.c does not compile. -->
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\shorthash.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sign.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\..\..\test\default\sodium_core.c">
      <ExcludedFromBuild>true</ExcludedFromBuild>
    </ClCompile>
@@ -142,6 +142,12 @@
    <ClCompile Include="..\..\..\..\test\default\stream6.c">
      <Filter>src</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sign.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\pwhash.c">
+      <Filter>src</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\..\..\test\default\cmptest.h">
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- These values are populated into the package.gsl templates by package.bat. -->
 <!-- The target attribute controls path and file name only, id controls package naming. -->
-<package id="libsodium_vc120" target="libsodium" namespace="libsodium12" version = "0.4.5.2" pathversion="0_4_5_2" platformtoolset="v120" />
+<package id="libsodium_vc120" target="libsodium" version = "0.5.0.0" pathversion="0_5_0_0" platformtoolset="v120" />
@@ -35,118 +35,63 @@
    <files>
        <!-- include -->
                
-        <file src="..\\..\\src\\libsodium\\include\\sodium.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\core.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth_hmacsha256.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth_hmacsha512.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_auth_hmacsha512256.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_box.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_box_curve25519xsalsa20poly1305.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_hsalsa20.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa20.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa2012.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_core_salsa208.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_generichash.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_generichash_blake2b.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash_sha256.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_hash_sha512.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth_poly1305.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth_poly1305_53.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_onetimeauth_poly1305_donna.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_scalarmult.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_scalarmult_curve25519.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_secretbox.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_secretbox_xsalsa20poly1305.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_shorthash.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_shorthash_siphash24.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign_ed25519.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_sign_edwards25519sha512batch.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_aes128ctr.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_aes256estream.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa20.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa2012.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_salsa208.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_stream_xsalsa20.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_int32.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_int64.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint16.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint32.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint64.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_uint8.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_verify_16.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_verify_32.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\crypto_verify_64.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\export.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes_salsa20_random.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\randombytes_sysrandom.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\utils.h" target="build\\native\\include"  />
-        <file src="..\\..\\src\\libsodium\\include\\sodium\\version.h" target="build\\native\\include"  />     
+        <file src="..\\..\\src\\libsodium\\include\\sodium.h" target="build\\native\\include" />
+        <file src="..\\..\\src\\libsodium\\include\\sodium\\*.*" target="build\\native\\include\\sodium" />    

        <!-- targets -->
      
        <file src="package.targets" target="build\\native\\$(package.id).targets" />
        <file src="package.xml" target="build\\native\\package.xml" />
-        
-        <!-- docs -->
-        
-        <!-- Documents (.*) -->
-        <!--<file src="..\\..\\docs\\*" target="build\\native\\docs" />-->
-        
+                
        <!-- libraries -->

        <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />
+        <file src="..\\..\\bin\\x86\\release\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
+        <file src="..\\..\\bin\\x86\\debug\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />

        <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />
-
-        <!-- x86 Static libraries (.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
-
-        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).ltcg.lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).ltcg.lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
+        <!--<file src="..\\..\\bin\\x86\\release\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
+        <file src="..\\..\\bin\\x86\\debug\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />

        <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).imp.lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).imp.lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />
+        <file src="..\\..\\bin\\x86\\release\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
+        <file src="..\\..\\bin\\x86\\debug\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />

        <!-- x86 Export libraries (.exp) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).imp.exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).imp.exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
+        <file src="..\\..\\bin\\x86\\release\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
+        <file src="..\\..\\bin\\x86\\debug\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
+
+        <!-- x86 Static libraries (.lib) -->
+        <file src="..\\..\\bin\\x86\\release\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
+        <file src="..\\..\\bin\\x86\\debug\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
+
+        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
+        <file src="..\\..\\bin\\x86\\release\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
+        <file src="..\\..\\bin\\x86\\debug\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x86-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />

        <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />
+        <file src="..\\..\\bin\\x64\\release\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).dll" />
+        <file src="..\\..\\bin\\x64\\debug\\$(package.platformtoolset)\\dynamic\\$(package.target).dll" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).dll" />

        <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />
-
-        <!-- x64 Static libraries (.lib) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
-
-        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\\..\\bin\\Win32\\Release\\$(package.namespace)\\$(package.target).ltcg.lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
-        <file src="..\\..\\bin\\Win32\\Debug\\$(package.namespace)\\$(package.target).ltcg.lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
+        <!--<file src="..\\..\\bin\\x64\\release\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).pdb" />-->
+        <file src="..\\..\\bin\\x64\\debug\\$(package.platformtoolset)\\dynamic\\$(package.target).pdb" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).pdb" />

        <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).imp.lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).imp.lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />
+        <file src="..\\..\\bin\\x64\\release\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).imp.lib" />
+        <file src="..\\..\\bin\\x64\\debug\\$(package.platformtoolset)\\dynamic\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).imp.lib" />

        <!-- x64 Export libraries (.exp) -->
-        <file src="..\\..\\bin\\x64\\Release\\$(package.namespace)\\$(package.target).imp.exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
-        <file src="..\\..\\bin\\x64\\Debug\\$(package.namespace)\\$(package.target).imp.exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
+        <file src="..\\..\\bin\\x64\\release\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-$(package.pathversion).exp" />
+        <file src="..\\..\\bin\\x64\\debug\\$(package.platformtoolset)\\dynamic\\$(package.target).exp" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-gd-$(package.pathversion).exp" />
+
+        <!-- x64 Static libraries (.lib) -->
+        <file src="..\\..\\bin\\x64\\release\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).lib" />
+        <file src="..\\..\\bin\\x64\\debug\\$(package.platformtoolset)\\static\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).lib" />
+
+        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
+        <file src="..\\..\\bin\\x64\\release\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-s-$(package.pathversion).ltcg.lib" />
+        <file src="..\\..\\bin\\x64\\debug\\$(package.platformtoolset)\\ltcg\\$(package.target).lib" target="build\\native\\bin\\$(package.target)-x64-$(package.platformtoolset)-mt-sgd-$(package.pathversion).ltcg.lib" />
    </files>
 <!--
 #################################################################
@@ -175,6 +120,7 @@
      <AdditionalIncludeDirectories>$\(MSBuildThisFileDirectory)include\\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>advapi32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$\(MSBuildThisFileDirectory)bin\\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
@@ -7,7 +7,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/01/nuspec.xsd">
    <metadata minClientVersion="2.5">
        <id>libsodium_vc120</id>
-        <version>0.4.5.2</version>
+        <version>0.5.0.0</version>
        <title>libsodium_vc120</title>
        <authors>libsodium contributors</authors>
        <owners>Eric Voskuil</owners>
@@ -27,118 +27,63 @@
    <files>
        <!-- include -->
                
-        <file src="..\..\src\libsodium\include\sodium.h" target="build\native\include"         />
-        <file src="..\..\src\libsodium\include\sodium\core.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_auth.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_auth_hmacsha256.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_auth_hmacsha512256.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_box.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_box_curve25519xsalsa20poly1305.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_core_hsalsa20.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa20.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa2012.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_core_salsa208.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_generichash.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_generichash_blake2b.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_hash.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_hash_sha256.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_hash_sha512.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_53.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_onetimeauth_poly1305_donna.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_scalarmult.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_scalarmult_curve25519.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_secretbox.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_secretbox_xsalsa20poly1305.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_shorthash.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_shorthash_siphash24.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_sign.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_sign_ed25519.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_sign_edwards25519sha512batch.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa2012.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_salsa208.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_stream_xsalsa20.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_int32.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_int64.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_uint16.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_uint32.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_uint64.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_uint8.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_verify_16.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_verify_32.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\crypto_verify_64.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\export.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\randombytes.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\randombytes_salsa20_random.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\randombytes_sysrandom.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\utils.h" target="build\native\include"          />
-        <file src="..\..\src\libsodium\include\sodium\version.h" target="build\native\include"          />     
+        <file src="..\..\src\libsodium\include\sodium.h" target="build\native\include" />
+        <file src="..\..\src\libsodium\include\sodium\*.*" target="build\native\include\sodium" />             

        <!-- targets -->
      
        <file src="package.targets" target="build\native\libsodium_vc120.targets" />
        <file src="package.xml" target="build\native\package.xml" />
-        
-        <!-- docs -->
-        
-        <!-- Documents (.*) -->
-        <!--<file src="..\..\docs\*" target="build\native\docs" />-->
-        
+                
        <!-- libraries -->

        <!-- x86 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_2.dll" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_2.dll" />
+        <file src="..\..\bin\x86\release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-0_5_0_0.dll" />
+        <file src="..\..\bin\x86\debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x86-v120-mt-gd-0_5_0_0.dll" />

        <!-- x86 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\Win32\Release\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_2.pdb" />-->
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_2.pdb" />
-
-        <!-- x86 Static libraries (.lib) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_4_5_2.lib" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_4_5_2.lib" />
-
-        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_4_5_2.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_4_5_2.ltcg.lib" />
+        <!--<file src="..\..\bin\x86\release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-0_5_0_0.pdb" />-->
+        <file src="..\..\bin\x86\debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x86-v120-mt-gd-0_5_0_0.pdb" />

        <!-- x86 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_2.imp.lib" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_2.imp.lib" />
+        <file src="..\..\bin\x86\release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-0_5_0_0.imp.lib" />
+        <file src="..\..\bin\x86\debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-gd-0_5_0_0.imp.lib" />

        <!-- x86 Export libraries (.exp) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x86-v120-mt-0_4_5_2.exp" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x86-v120-mt-gd-0_4_5_2.exp" />
+        <file src="..\..\bin\x86\release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-0_5_0_0.exp" />
+        <file src="..\..\bin\x86\debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x86-v120-mt-gd-0_5_0_0.exp" />
+
+        <!-- x86 Static libraries (.lib) -->
+        <file src="..\..\bin\x86\release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_5_0_0.lib" />
+        <file src="..\..\bin\x86\debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_5_0_0.lib" />
+
+        <!-- x86 Static link time code generation libraries (.ltcg.lib) -->
+        <file src="..\..\bin\x86\release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-s-0_5_0_0.ltcg.lib" />
+        <file src="..\..\bin\x86\debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x86-v120-mt-sgd-0_5_0_0.ltcg.lib" />

        <!-- x64 Dynamic libraries (.dll) -->
-        <file src="..\..\bin\x64\Release\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_2.dll" />
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_2.dll" />
+        <file src="..\..\bin\x64\release\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-0_5_0_0.dll" />
+        <file src="..\..\bin\x64\debug\v120\dynamic\libsodium.dll" target="build\native\bin\libsodium-x64-v120-mt-gd-0_5_0_0.dll" />

        <!-- x64 Debugging symbols (.pdb) -->
-        <!--<file src="..\..\bin\x64\Release\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_2.pdb" />-->
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_2.pdb" />
-
-        <!-- x64 Static libraries (.lib) -->
-        <file src="..\..\bin\x64\Release\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_4_5_2.lib" />
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_4_5_2.lib" />
-
-        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
-        <file src="..\..\bin\Win32\Release\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_4_5_2.ltcg.lib" />
-        <file src="..\..\bin\Win32\Debug\libsodium12\libsodium.ltcg.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_4_5_2.ltcg.lib" />
+        <!--<file src="..\..\bin\x64\release\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-0_5_0_0.pdb" />-->
+        <file src="..\..\bin\x64\debug\v120\dynamic\libsodium.pdb" target="build\native\bin\libsodium-x64-v120-mt-gd-0_5_0_0.pdb" />

        <!-- x64 Import libraries (.imp.lib) -->
-        <file src="..\..\bin\x64\Release\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_2.imp.lib" />
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.imp.lib" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_2.imp.lib" />
+        <file src="..\..\bin\x64\release\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-0_5_0_0.imp.lib" />
+        <file src="..\..\bin\x64\debug\v120\dynamic\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-gd-0_5_0_0.imp.lib" />

        <!-- x64 Export libraries (.exp) -->
-        <file src="..\..\bin\x64\Release\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x64-v120-mt-0_4_5_2.exp" />
-        <file src="..\..\bin\x64\Debug\libsodium12\libsodium.imp.exp" target="build\native\bin\libsodium-x64-v120-mt-gd-0_4_5_2.exp" />
+        <file src="..\..\bin\x64\release\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-0_5_0_0.exp" />
+        <file src="..\..\bin\x64\debug\v120\dynamic\libsodium.exp" target="build\native\bin\libsodium-x64-v120-mt-gd-0_5_0_0.exp" />
+
+        <!-- x64 Static libraries (.lib) -->
+        <file src="..\..\bin\x64\release\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_5_0_0.lib" />
+        <file src="..\..\bin\x64\debug\v120\static\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_5_0_0.lib" />
+
+        <!-- x64 Static link time code generation libraries (.ltcg.lib) -->
+        <file src="..\..\bin\x64\release\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-s-0_5_0_0.ltcg.lib" />
+        <file src="..\..\bin\x64\debug\v120\ltcg\libsodium.lib" target="build\native\bin\libsodium-x64-v120-mt-sgd-0_5_0_0.ltcg.lib" />
    </files>
 <!--
 #################################################################
@@ -17,6 +17,7 @@
      <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
    </ClCompile>
    <Link>
+      <AdditionalDependencies>advapi32.lib;crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)bin\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
    </Link>
  </ItemDefinitionGroup>
@@ -29,66 +30,66 @@
  <!-- static libraries -->
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-s-0_4_5_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-s-0_5_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_4_5_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_5_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-s-0_4_5_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-s-0_5_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'static' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_4_5_2.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_5_0_0.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>

  <!-- static ltcg libraries -->
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-s-0_4_5_2.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-s-0_5_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_4_5_2.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-sgd-0_5_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-s-0_4_5_2.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-s-0_5_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'ltcg' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_4_5_2.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-sgd-0_5_0_0.ltcg.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  
  <!-- dynamic import libraries -->
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-0_4_5_2.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-0_5_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x86-v120-mt-gd-0_4_5_2.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x86-v120-mt-gd-0_5_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-0_4_5_2.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-0_5_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1">
    <Link>
-      <AdditionalDependencies>libsodium-x64-v120-mt-gd-0_4_5_2.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>libsodium-x64-v120-mt-gd-0_5_0_0.imp.lib;%(AdditionalDependencies)</AdditionalDependencies>
    </Link>
  </ItemDefinitionGroup>

@@ -97,26 +98,26 @@
  <Target Name="libsodium_AfterBuild_Win32_v120_Dynamic_Release"
          Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
          AfterTargets="libsodium_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_4_5_2.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_4_5_2.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_5_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
+    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-0_5_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
  </Target>
  <Target Name="libsodium_AfterBuild_Win32_v120_Dynamic_Debug"
          Condition="'$(Platform)' == 'Win32' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
          AfterTargets="libsodium_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_4_5_2.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_4_5_2.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_5_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x86-v120-mt-gd-0_5_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
  </Target>
  <Target Name="libsodium_AfterBuild_x64_v120_Dynamic_Release"
          Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Release')) != -1"
          AfterTargets="libsodium_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_4_5_2.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
-    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_4_5_2.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_5_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
+    <!--<Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-0_5_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />-->
  </Target>
  <Target Name="libsodium_AfterBuild_x64_v120_Dynamic_Debug"
          Condition="'$(Platform)' == 'x64' And ('$(PlatformToolset)' == 'v120' Or '$(PlatformToolset)' == 'CTP_Nov2013') And '$(Linkage-libsodium)' == 'dynamic' And $(Configuration.IndexOf('Debug')) != -1"
          AfterTargets="libsodium_AfterBuild">
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_4_5_2.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
-    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_4_5_2.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_5_0_0.dll" DestinationFiles="$(TargetDir)libsodium.dll" SkipUnchangedFiles="true" />
+    <Copy SourceFiles="$(MSBuildThisFileDirectory)bin\libsodium-x64-v120-mt-gd-0_5_0_0.pdb" DestinationFiles="$(TargetDir)libsodium.pdb" SkipUnchangedFiles="true" />
  </Target>

 <!--
@@ -155,8 +155,8 @@ randombytes_salsa20_random_init(void)
    stream.nonce = sodium_hrtime();
    assert(stream.nonce != (uint64_t) 0U);

-    if (! CryptAcquireContext(&stream.hcrypt_prov, NULL, NULL,
-                              PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
+    if (! CryptAcquireContextW(&stream.hcrypt_prov, NULL, NULL,
+                               PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
        abort();
    }
 }
@@ -141,8 +141,8 @@ randombytes_sysrandom_init(void)
 static void
 randombytes_sysrandom_init(void)
 {
-    if (! CryptAcquireContext(&stream.hcrypt_prov, NULL, NULL,
-                              PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
+    if (! CryptAcquireContextW(&stream.hcrypt_prov, NULL, NULL,
+                               PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) {
        abort();
    }
 }