Merge branch 'rc1'

Author: henkmollema

NuGet.Config

@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <clear />
-    <add key="xunit" value="https://www.myget.org/F/xunit/api/v3/index.json" />
-    <add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
     <add key="NuGet" value="https://api.nuget.org/v3/index.json" />
   </packageSources>
 </configuration>

build.cmd

@@ -18,8 +18,8 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
 
 :restore
 IF EXIST packages\Sake goto getdnx
-.nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -o packages
+.nuget\NuGet.exe install KoreBuild -version 0.2.1-beta7 -Source https://www.myget.org/F/aspnetmaster/api/v2 -o packages -nocache -pre -ExcludeVersion
+.nuget\NuGet.exe install Sake -version 0.2.0 -Source https://www.nuget.org/api/v2/ -o packages -ExcludeVersion
 
 :getdnx
 CALL packages\KoreBuild\build\dnvm upgrade -runtime CoreCLR -arch x86 -alias default

build.sh

@@ -22,18 +22,18 @@ if test ! -e .nuget; then
     cp $cachePath .nuget/nuget.exe
 fi
 
-if test ! -d packages/Sake; then
-    mono .nuget/nuget.exe install KoreBuild -Source https://www.myget.org/F/aspnetvnext/ -ExcludeVersion -o packages -nocache -pre
-    mono .nuget/nuget.exe install Sake -Source https://www.nuget.org/api/v2/ -o packages -ExcludeVersion
+if test ! -d packages/KoreBuild; then
+    mono .nuget/nuget.exe install KoreBuild -version 0.2.1-beta7 -Source https://www.myget.org/F/aspnetmaster/api/v2 -o packages -nocache -pre -ExcludeVersion
+    mono .nuget/nuget.exe install Sake -version 0.2.0 -Source https://www.nuget.org/api/v2/ -o packages -ExcludeVersion
 fi
 
 if ! type dnvm > /dev/null 2>&1; then
     source packages/KoreBuild/build/dnvm.sh
 fi
 
+DNX_FEED=https://www.nuget.org/api/v2/
 if ! type dnx > /dev/null 2>&1; then
-    dnvm install latest -runtime coreclr -alias default
-    dnvm install default -runtime mono -alias default
+    dnvm upgrade -r mono
 fi
 
 mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"

global.json

@@ -1,3 +1,6 @@
 {
-    "projects": [ "src" ]
-}
+  "projects": [ "src", "text" ],
+  "sdk": {
+    "version": "1.0.0-rc1-final"
+  }
+}

src/CryptoHelper/Crypto.cs

@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 
-#if NET451 || DOTNET5_4
+#if NET451 || DNX451 || DOTNET5_4
 using Microsoft.AspNet.Cryptography.KeyDerivation;
 #endif
 
@@ -147,7 +147,7 @@ private static bool VerifyHashedPasswordInternal(string hashedPassword, string p
         }
 #endif
 
-#if NET451 || DOTNET5_4
+#if NET451 || DNX451 || DOTNET5_4
         private static readonly RandomNumberGenerator _rng = RandomNumberGenerator.Create();
 
         private static string HashPasswordInternal(string password)

src/CryptoHelper/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-rc1-*",
+  "version": "1.0.0-rc1-final",
   "authors": [ "Henk Mollema" ],
   "owners": [ "Henk Mollema" ],
   "description": "Cryptography helper methods for hashing passwords using a PBKDF2 implementation.",
@@ -19,16 +19,22 @@
 
     "net451": {
       "dependencies": {
-        "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-*"
+        "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-rc1-final"
+      }
+    },
+
+    "dnx451": {
+      "dependencies": {
+        "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-rc1-final"
       }
     },
 
     "dotnet5.4": {
       "dependencies": {
-        "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-*",
-        "Microsoft.CSharp": "4.0.1-beta-*",
-        "System.Runtime": "4.0.21-beta-*",
-        "System.Security.Cryptography.Algorithms": "4.0.0-beta-*"
+        "Microsoft.AspNet.Cryptography.KeyDerivation": "1.0.0-rc1-final",
+        "Microsoft.CSharp": "4.0.1-beta-23516",
+        "System.Runtime": "4.0.21-beta-23516",
+        "System.Security.Cryptography.Algorithms": "4.0.0-beta-23516"
       }
     }
   }

test/CryptoHelper.Tests/project.json

@@ -3,9 +3,9 @@
   "description": "CryptoHelper Tests library.",
 
   "dependencies": {
-    "CryptoHelper": "1.0.0-rc1-*",
-    "xunit": "2.2.0-*",
-    "xunit.runner.dnx": "2.1.0-rc1-*"
+    "CryptoHelper": "1.0.0-rc1-final",
+    "xunit": "2.1.0",
+    "xunit.runner.dnx": "2.1.0-rc1-build204"
   },
 
   "commands": {