Merge branch 'rc2'

Author: henkmollema

NuGet.Config

@@ -1,6 +1,9 @@
 <?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

@@ -3,8 +3,6 @@ cd %~dp0
 
 SETLOCAL
 SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
-REM echo Set DNX feed to NuGet v3 (stable)
-REM SET DNX_FEED=https://api.nuget.org/v3/index.json
 
 IF EXIST %CACHED_NUGET% goto copynuget
 echo Downloading latest version of NuGet.exe...
@@ -18,8 +16,10 @@ copy %CACHED_NUGET% .nuget\nuget.exe > nul
 
 :restore
 IF EXIST packages\Sake goto getdnx
-.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
+REM.nuget\NuGet.exe install KoreBuild -Source https://www.myget.org/F/aspnetmaster/api/v2 -o packages -nocache -pre -ExcludeVersion
+REM.nuget\NuGet.exe install Sake -version 0.2.0 -Source https://www.nuget.org/api/v2/ -o packages -ExcludeVersion
+.nuget\NuGet.exe install KoreBuild -o packages -nocache -pre -ExcludeVersion
+.nuget\NuGet.exe install Sake -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

@@ -23,15 +23,17 @@ if test ! -e .nuget; then
 fi
 
 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
+    mono .nuget/nuget.exe install KoreBuild -Source https://www.myget.org/F/aspnetvnext/ -o packages -nocache -pre -ExcludeVersion
+    mono .nuget/nuget.exe install Sake -Source https://www.nuget.org/api/v2/ -o packages -ExcludeVersion
+    #mono .nuget/nuget.exe install KoreBuild -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/
+#DNX_FEED=https://www.nuget.org/api/v2/
 if ! type dnx > /dev/null 2>&1; then
     dnvm upgrade -r mono
 fi

global.json

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

src/CryptoHelper/project.json

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

test/CryptoHelper.Tests/project.json

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