update to 1.0.0-1 version of the package

15 files changed, 91 insertions, 157 deletions

diff --git a/builds/msvc/properties/Common.props b/builds/msvc/properties/Common.props
index 72588d6..6e10d88 100644
--- a/builds/msvc/properties/Common.props
+++ b/builds/msvc/properties/Common.props
@@ -14,8 +14,10 @@
     <ClCompile>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PreprocessorDefinitions>UNICODE;_UNICODE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NATIVE_LITTLE_ENDIAN=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>
   </ItemDefinitionGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/properties/Release.props b/builds/msvc/properties/Release.props
index 1c5415b..296dbfe 100644
--- a/builds/msvc/properties/Release.props
+++ b/builds/msvc/properties/Release.props
@@ -20,10 +20,8 @@
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <MinimalRebuild>false</MinimalRebuild>
       <Optimization>MaxSpeed</Optimization>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -38,4 +36,4 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/version.h b/builds/msvc/version.h
index ca13a74..da4fd43 100644
--- a/builds/msvc/version.h
+++ b/builds/msvc/version.h
@@ -4,10 +4,10 @@
 
 #include "export.h"
 
-#define SODIUM_VERSION_STRING "0.6.1"
+#define SODIUM_VERSION_STRING "1.0.0"
 
-#define SODIUM_LIBRARY_VERSION_MAJOR 6
-#define SODIUM_LIBRARY_VERSION_MINOR 1
+#define SODIUM_LIBRARY_VERSION_MAJOR 7
+#define SODIUM_LIBRARY_VERSION_MINOR 2
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
index 95b0006..04c8950 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj
@@ -130,7 +130,6 @@
     <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" />

@@ -303,14 +302,6 @@
     <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" />

-    <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" />

-    <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" />

@@ -338,7 +329,6 @@
     <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" />

-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />

@@ -362,4 +352,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-</Project>
\ No newline at end of file
+</Project>

diff --git a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
index 13805be..438508a 100644
--- a/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters
@@ -94,9 +94,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h">

-      <Filter>include\sodium</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

@@ -154,9 +151,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c">

       <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>

     </ClCompile>

@@ -427,9 +421,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c">

       <Filter>src\crypto_stream\aes128ctr</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c">

-      <Filter>src\crypto_stream\aes256estream</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c">

       <Filter>src\crypto_stream\salsa20</Filter>

     </ClCompile>

@@ -493,9 +484,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c">

       <Filter>src\crypto_auth\hmacsha512256\cp</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c">

-      <Filter>src\sodium</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c">

       <Filter>src\sodium</Filter>

     </ClCompile>

@@ -532,18 +520,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c">

       <Filter>src\randombytes\sysrandom</Filter>

     </ClCompile>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c">

       <Filter>src\crypto_auth\hmacsha512</Filter>

     </ClCompile>

@@ -565,9 +541,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\crypto_scrypt-common.c">

       <Filter>src\crypto_pwhash\scryptsalsa208sha256</Filter>

     </ClCompile>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">

       <Filter>src\crypto_sign\ed25519\ref10</Filter>

     </ClInclude>

@@ -676,9 +649,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">

       <Filter>src\crypto_stream\aes128ctr\portable</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">

       <Filter>src\crypto_verify\16\ref</Filter>

     </ClInclude>

@@ -946,9 +916,6 @@
     <Filter Include="src\crypto_stream\aes128ctr">

       <UniqueIdentifier>{ca40b775-e025-4359-87ae-02c771c1a222}</UniqueIdentifier>

     </Filter>

-    <Filter Include="src\crypto_stream\aes256estream">

-      <UniqueIdentifier>{afb86556-101b-407c-93f6-db784a9e3f4f}</UniqueIdentifier>

-    </Filter>

     <Filter Include="src\crypto_stream\salsa20">

       <UniqueIdentifier>{91c31952-2f36-418e-aa07-68ed57057d0f}</UniqueIdentifier>

     </Filter>

@@ -970,9 +937,6 @@
     <Filter Include="src\crypto_stream\salsa2012\ref">

       <UniqueIdentifier>{1c006197-b25b-48e8-833f-2dd59a571b9d}</UniqueIdentifier>

     </Filter>

-    <Filter Include="src\crypto_stream\aes256estream\hongjun">

-      <UniqueIdentifier>{3acc42ca-4646-462d-bbac-2a07e9eb30be}</UniqueIdentifier>

-    </Filter>

     <Filter Include="src\crypto_stream\aes128ctr\portable">

       <UniqueIdentifier>{46eb8265-dc41-4289-aa7d-c1918e05cf75}</UniqueIdentifier>

     </Filter>

@@ -1111,4 +1075,4 @@
       <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>

     </ClCompile>

   </ItemGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/builds/msvc/vs2010/test/test.vcxproj b/builds/msvc/vs2010/test/test.vcxproj
index 2cd94c3..4c8f931 100644
--- a/builds/msvc/vs2010/test/test.vcxproj
+++ b/builds/msvc/vs2010/test/test.vcxproj
@@ -112,6 +112,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -154,6 +157,9 @@
     <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\secretbox.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -184,6 +190,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -211,4 +223,4 @@
     <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2010/test/test.vcxproj.filters b/builds/msvc/vs2010/test/test.vcxproj.filters
index c0819e8..42b8528 100644
--- a/builds/msvc/vs2010/test/test.vcxproj.filters
+++ b/builds/msvc/vs2010/test/test.vcxproj.filters
@@ -49,6 +49,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -88,6 +91,9 @@
     <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\secretbox.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -115,6 +121,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -159,4 +171,4 @@
       <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
index f47a042..d6edfc4 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj
@@ -130,7 +130,6 @@
     <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" />

@@ -303,14 +302,6 @@
     <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" />

-    <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" />

-    <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" />

@@ -338,7 +329,6 @@
     <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" />

-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />

@@ -362,4 +352,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-</Project>
\ No newline at end of file
+</Project>

diff --git a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
index 13805be..438508a 100644
--- a/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters
@@ -94,9 +94,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h">

-      <Filter>include\sodium</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

@@ -154,9 +151,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c">

       <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>

     </ClCompile>

@@ -427,9 +421,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c">

       <Filter>src\crypto_stream\aes128ctr</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c">

-      <Filter>src\crypto_stream\aes256estream</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c">

       <Filter>src\crypto_stream\salsa20</Filter>

     </ClCompile>

@@ -493,9 +484,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c">

       <Filter>src\crypto_auth\hmacsha512256\cp</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c">

-      <Filter>src\sodium</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c">

       <Filter>src\sodium</Filter>

     </ClCompile>

@@ -532,18 +520,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c">

       <Filter>src\randombytes\sysrandom</Filter>

     </ClCompile>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c">

       <Filter>src\crypto_auth\hmacsha512</Filter>

     </ClCompile>

@@ -565,9 +541,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\crypto_scrypt-common.c">

       <Filter>src\crypto_pwhash\scryptsalsa208sha256</Filter>

     </ClCompile>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">

       <Filter>src\crypto_sign\ed25519\ref10</Filter>

     </ClInclude>

@@ -676,9 +649,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">

       <Filter>src\crypto_stream\aes128ctr\portable</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">

       <Filter>src\crypto_verify\16\ref</Filter>

     </ClInclude>

@@ -946,9 +916,6 @@
     <Filter Include="src\crypto_stream\aes128ctr">

       <UniqueIdentifier>{ca40b775-e025-4359-87ae-02c771c1a222}</UniqueIdentifier>

     </Filter>

-    <Filter Include="src\crypto_stream\aes256estream">

-      <UniqueIdentifier>{afb86556-101b-407c-93f6-db784a9e3f4f}</UniqueIdentifier>

-    </Filter>

     <Filter Include="src\crypto_stream\salsa20">

       <UniqueIdentifier>{91c31952-2f36-418e-aa07-68ed57057d0f}</UniqueIdentifier>

     </Filter>

@@ -970,9 +937,6 @@
     <Filter Include="src\crypto_stream\salsa2012\ref">

       <UniqueIdentifier>{1c006197-b25b-48e8-833f-2dd59a571b9d}</UniqueIdentifier>

     </Filter>

-    <Filter Include="src\crypto_stream\aes256estream\hongjun">

-      <UniqueIdentifier>{3acc42ca-4646-462d-bbac-2a07e9eb30be}</UniqueIdentifier>

-    </Filter>

     <Filter Include="src\crypto_stream\aes128ctr\portable">

       <UniqueIdentifier>{46eb8265-dc41-4289-aa7d-c1918e05cf75}</UniqueIdentifier>

     </Filter>

@@ -1111,4 +1075,4 @@
       <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>

     </ClCompile>

   </ItemGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/builds/msvc/vs2012/test/test.vcxproj b/builds/msvc/vs2012/test/test.vcxproj
index 65fd4d8..dcde649 100644
--- a/builds/msvc/vs2012/test/test.vcxproj
+++ b/builds/msvc/vs2012/test/test.vcxproj
@@ -112,6 +112,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -154,6 +157,9 @@
     <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\secretbox.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -184,6 +190,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -211,4 +223,4 @@
     <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2012/test/test.vcxproj.filters b/builds/msvc/vs2012/test/test.vcxproj.filters
index c0819e8..42b8528 100644
--- a/builds/msvc/vs2012/test/test.vcxproj.filters
+++ b/builds/msvc/vs2012/test/test.vcxproj.filters
@@ -49,6 +49,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -88,6 +91,9 @@
     <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\secretbox.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -115,6 +121,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -159,4 +171,4 @@
       <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
index 022bbe7..bd30e82 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj
@@ -130,7 +130,6 @@
     <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" />

@@ -303,14 +302,6 @@
     <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" />

-    <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" />

-    <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" />

@@ -338,7 +329,6 @@
     <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" />

-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\runtime.c" />

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\utils.c" />

@@ -362,4 +352,4 @@
     <Xml Include="..\..\..\..\packaging\nuget\package.xml" />

   </ItemGroup>

   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

-</Project>
\ No newline at end of file
+</Project>

diff --git a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
index 13805be..438508a 100644
--- a/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
+++ b/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters
@@ -94,9 +94,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes128ctr.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_aes256estream.h">

-      <Filter>include\sodium</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\crypto_stream_salsa20.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

@@ -154,9 +151,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\include\sodium\utils.h">

       <Filter>include\sodium</Filter>

     </ClInclude>

-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256-ctr.c">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_box\curve25519xsalsa20poly1305\ref\after_curve25519xsalsa20poly1305.c">

       <Filter>src\crypto_box\curve25519xsalsa20poly1305\ref</Filter>

     </ClCompile>

@@ -427,9 +421,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\stream_aes128ctr_api.c">

       <Filter>src\crypto_stream\aes128ctr</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\stream_aes256estream_api.c">

-      <Filter>src\crypto_stream\aes256estream</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_stream\salsa20\stream_salsa20_api.c">

       <Filter>src\crypto_stream\salsa20</Filter>

     </ClCompile>

@@ -493,9 +484,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512256\cp\verify_hmacsha512256.c">

       <Filter>src\crypto_auth\hmacsha512256\cp</Filter>

     </ClCompile>

-    <ClCompile Include="..\..\..\..\src\libsodium\sodium\compat.c">

-      <Filter>src\sodium</Filter>

-    </ClCompile>

     <ClCompile Include="..\..\..\..\src\libsodium\sodium\core.c">

       <Filter>src\sodium</Filter>

     </ClCompile>

@@ -532,18 +520,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\randombytes\sysrandom\randombytes_sysrandom.c">

       <Filter>src\randombytes\sysrandom</Filter>

     </ClCompile>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes256.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-be.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\aes-table-le.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClCompile Include="..\..\..\..\src\libsodium\crypto_auth\hmacsha512\auth_hmacsha512_api.c">

       <Filter>src\crypto_auth\hmacsha512</Filter>

     </ClCompile>

@@ -565,9 +541,6 @@
     <ClCompile Include="..\..\..\..\src\libsodium\crypto_pwhash\scryptsalsa208sha256\crypto_scrypt-common.c">

       <Filter>src\crypto_pwhash\scryptsalsa208sha256</Filter>

     </ClCompile>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\ecrypt-sync.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\crypto_sign\ed25519\ref10\fe.h">

       <Filter>src\crypto_sign\ed25519\ref10</Filter>

     </ClInclude>

@@ -676,9 +649,6 @@
     <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes128ctr\portable\api.h">

       <Filter>src\crypto_stream\aes128ctr\portable</Filter>

     </ClInclude>

-    <ClInclude Include="..\..\..\..\src\libsodium\crypto_stream\aes256estream\hongjun\api.h">

-      <Filter>src\crypto_stream\aes256estream\hongjun</Filter>

-    </ClInclude>

     <ClInclude Include="..\..\..\..\src\libsodium\crypto_verify\16\ref\api.h">

       <Filter>src\crypto_verify\16\ref</Filter>

     </ClInclude>

@@ -946,9 +916,6 @@
     <Filter Include="src\crypto_stream\aes128ctr">

       <UniqueIdentifier>{ca40b775-e025-4359-87ae-02c771c1a222}</UniqueIdentifier>

     </Filter>

-    <Filter Include="src\crypto_stream\aes256estream">

-      <UniqueIdentifier>{afb86556-101b-407c-93f6-db784a9e3f4f}</UniqueIdentifier>

-    </Filter>

     <Filter Include="src\crypto_stream\salsa20">

       <UniqueIdentifier>{91c31952-2f36-418e-aa07-68ed57057d0f}</UniqueIdentifier>

     </Filter>

@@ -970,9 +937,6 @@
     <Filter Include="src\crypto_stream\salsa2012\ref">

       <UniqueIdentifier>{1c006197-b25b-48e8-833f-2dd59a571b9d}</UniqueIdentifier>

     </Filter>

-    <Filter Include="src\crypto_stream\aes256estream\hongjun">

-      <UniqueIdentifier>{3acc42ca-4646-462d-bbac-2a07e9eb30be}</UniqueIdentifier>

-    </Filter>

     <Filter Include="src\crypto_stream\aes128ctr\portable">

       <UniqueIdentifier>{46eb8265-dc41-4289-aa7d-c1918e05cf75}</UniqueIdentifier>

     </Filter>

@@ -1111,4 +1075,4 @@
       <Filter>src\crypto_aead\chacha20poly1305\sodium</Filter>

     </ClCompile>

   </ItemGroup>

-</Project>
\ No newline at end of file
+</Project>

diff --git a/builds/msvc/vs2013/test/test.vcxproj b/builds/msvc/vs2013/test/test.vcxproj
index 780396e..04f12bc 100644
--- a/builds/msvc/vs2013/test/test.vcxproj
+++ b/builds/msvc/vs2013/test/test.vcxproj
@@ -112,6 +112,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -154,6 +157,9 @@
     <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\secretbox.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -184,6 +190,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
@@ -211,4 +223,4 @@
     <ClInclude Include="..\..\..\..\test\quirks\windows\windows-quirks.h" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-</Project>
\ No newline at end of file
+</Project>
diff --git a/builds/msvc/vs2013/test/test.vcxproj.filters b/builds/msvc/vs2013/test/test.vcxproj.filters
index c0819e8..42b8528 100644
--- a/builds/msvc/vs2013/test/test.vcxproj.filters
+++ b/builds/msvc/vs2013/test/test.vcxproj.filters
@@ -49,6 +49,9 @@
     <ClCompile Include="..\..\..\..\test\default\core6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\ed25519_convert.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\generichash.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -88,6 +91,9 @@
     <ClCompile Include="..\..\..\..\test\default\scalarmult6.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\scalarmult7.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\secretbox.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -115,6 +121,12 @@
     <ClCompile Include="..\..\..\..\test\default\sodium_utils.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils2.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\..\test\default\sodium_utils3.c">
+      <Filter>src</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\..\..\test\default\sodium_version.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -159,4 +171,4 @@
       <UniqueIdentifier>{5b5af4b5-c6aa-4b30-bdef-074b1bdc43ea}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>