Fix entropy samples and update to run with dotnet

.gitattributes

@@ -48,3 +48,5 @@
 *.fsproj text=auto
 *.dbproj text=auto
 *.sln text=auto eol=crlf
+
+*.sh eol=lf

.gitignore

@@ -30,4 +30,6 @@ bower_components/
 node_modules/
 */*.Spa/public/*
 */*.Spa/wwwroot/lib
-*launchSettings.json
+*launchSettings.json
+.testPublish/
+.build/

.travis.yml

@@ -10,11 +10,12 @@ addons:
     - libssl-dev
     - libunwind8
     - zlib1g
-env:
-  - KOREBUILD_DNU_RESTORE_CORECLR=true KOREBUILD_TEST_DNXCORE=true MONO_MANAGED_WATCHER=disabled
+mono:
+  - 4.0.5
 os:
   - linux
   - osx
+osx_image: xcode7.1
 install:
   - curl -sSL https://github.com/libuv/libuv/archive/v1.4.2.tar.gz | tar zxfv - -C /tmp && cd /tmp/libuv-1.4.2/
   - sh autogen.sh
@@ -23,8 +24,5 @@ install:
   - make install
   - export LD_LIBRARY_PATH="$HOME/libuvinstall/lib"
   - cd $OLDPWD
-mono:
-  - 4.0.5
 script:
   - ./build.sh --quiet verify
-osx_image: xcode7.2

build.cmd

@@ -1,42 +1,40 @@
-@echo off
-cd %~dp0
-
+@ECHO off
 SETLOCAL
+
+SET REPO_FOLDER=%~dp0
+CD %REPO_FOLDER%
+
+SET BUILD_FOLDER=.build
+SET KOREBUILD_FOLDER=%BUILD_FOLDER%\KoreBuild-dotnet
+SET KOREBUILD_VERSION=
+
+SET NUGET_PATH=%BUILD_FOLDER%\NuGet.exe
 SET NUGET_VERSION=latest
 SET CACHED_NUGET=%LocalAppData%\NuGet\nuget.%NUGET_VERSION%.exe
-SET BUILDCMD_KOREBUILD_VERSION=
-SET BUILDCMD_DNX_VERSION=
-
-IF EXIST %CACHED_NUGET% goto copynuget
-echo Downloading latest version of NuGet.exe...
-IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
-@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/%NUGET_VERSION%/nuget.exe' -OutFile '%CACHED_NUGET%'"
-
-:copynuget
-IF EXIST .nuget\nuget.exe goto restore
-md .nuget
-copy %CACHED_NUGET% .nuget\nuget.exe > nul
-
-:restore
-IF EXIST packages\Sake goto getdnx
-IF "%BUILDCMD_KOREBUILD_VERSION%"=="" (
-    .nuget\nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-) ELSE (
-    .nuget\nuget.exe install KoreBuild -version %BUILDCMD_KOREBUILD_VERSION% -ExcludeVersion -o packages -nocache -pre
+
+IF NOT EXIST %BUILD_FOLDER% (
+    md %BUILD_FOLDER%
 )
-.nuget\NuGet.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
 
-:getdnx
-IF "%BUILDCMD_DNX_VERSION%"=="" (
-    SET BUILDCMD_DNX_VERSION=latest
+IF NOT EXIST %NUGET_PATH% (
+    IF NOT EXIST %CACHED_NUGET% (
+        echo Downloading latest version of NuGet.exe...
+        IF NOT EXIST %LocalAppData%\NuGet ( 
+            md %LocalAppData%\NuGet
+        )
+        @powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://dist.nuget.org/win-x86-commandline/%NUGET_VERSION%/nuget.exe' -OutFile '%CACHED_NUGET%'"
+    )
+
+    copy %CACHED_NUGET% %NUGET_PATH% > nul
 )
-IF "%SKIP_DNX_INSTALL%"=="" (
-    CALL packages\KoreBuild\build\dnvm install %BUILDCMD_DNX_VERSION% -runtime CoreCLR -arch x86 -alias default
-    CALL packages\KoreBuild\build\dnvm install default -runtime CoreCLR -arch x64
-    CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x64
-    CALL packages\KoreBuild\build\dnvm install default -runtime CLR -arch x86 -alias default
-) ELSE (
-    CALL packages\KoreBuild\build\dnvm use default -runtime CLR -arch x86
+
+IF NOT EXIST %KOREBUILD_FOLDER% (
+    SET KOREBUILD_DOWNLOAD_ARGS=
+    IF NOT "%KOREBUILD_VERSION%"=="" (
+        SET KOREBUILD_DOWNLOAD_ARGS=-version %KOREBUILD_VERSION%
+    )
+
+    %BUILD_FOLDER%\nuget.exe install KoreBuild-dotnet -ExcludeVersion -o %BUILD_FOLDER% -nocache -pre %KOREBUILD_DOWNLOAD_ARGS%
 )
 
-packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
+"%KOREBUILD_FOLDER%\build\KoreBuild.cmd" %*

build.sh

@@ -1,5 +1,10 @@
 #!/usr/bin/env bash
 
+buildFolder=.build
+koreBuildFolder=$buildFolder/KoreBuild-dotnet
+
+nugetPath=$buildFolder/nuget.exe
+
 if test `uname` = Darwin; then
     cachedir=~/Library/Caches/KBuild
 else
@@ -11,33 +16,30 @@ else
 fi
 mkdir -p $cachedir
 nugetVersion=latest
-cachePath=$cachedir/nuget.$nugetVersion.exe
+cacheNuget=$cachedir/nuget.$nugetVersion.exe
 
-url=https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe
+nugetUrl=https://dist.nuget.org/win-x86-commandline/$nugetVersion/nuget.exe
 
-if test ! -f $cachePath; then
-    wget -O $cachePath $url 2>/dev/null || curl -o $cachePath --location $url /dev/null
+if test ! -d $buildFolder; then
+    mkdir $buildFolder
 fi
 
-if test ! -e .nuget; then
-    mkdir .nuget
-    cp $cachePath .nuget/nuget.exe
-fi
+if test ! -f $nugetPath; then
+    if test ! -f $cacheNuget; then
+        wget -O $cacheNuget $nugetUrl 2>/dev/null || curl -o $cacheNuget --location $nugetUrl /dev/null
+    fi
 
-if test ! -d packages/Sake; then
-    mono .nuget/nuget.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
-    mono .nuget/nuget.exe install Sake -ExcludeVersion -Source https://www.nuget.org/api/v2/ -Out packages
+    cp $cacheNuget $nugetPath
 fi
 
-if ! type dnvm > /dev/null 2>&1; then
-    source packages/KoreBuild/build/dnvm.sh
+if test ! -d $koreBuildFolder; then
+    mono $nugetPath install KoreBuild-dotnet -ExcludeVersion -o $buildFolder -nocache -pre
+    chmod +x $koreBuildFolder/build/KoreBuild.sh
 fi
 
-if ! type dnx > /dev/null 2>&1 || [ -z "$SKIP_DNX_INSTALL" ]; then
-    dnvm install latest -runtime coreclr -alias default
-    dnvm install default -runtime mono -alias default
-else
-    dnvm use default -runtime mono
+makeFile=makefile.shade
+if [ ! -e $makeFile ]; then
+    makeFile=$koreBuildFolder/build/makefile.shade
 fi
 
-mono packages/Sake/tools/Sake.exe -I packages/KoreBuild/build -f makefile.shade "$@"
+./$koreBuildFolder/build/KoreBuild.sh -n $nugetPath -m $makeFile "$@"

samples/Builder.Filtering.Web/project.json

@@ -8,7 +8,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true

samples/Builder.HelloWorld.Web/project.json

@@ -8,7 +8,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true

samples/Builder.Middleware.Web/project.json

@@ -8,7 +8,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true

samples/Config.ChangeNotification.Web/project.json

@@ -6,6 +6,10 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50" : { }
+    "dnxcore50" : {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   }
 }

samples/Config.CustomProviders.Web/MyConfigProvider.cs

@@ -30,15 +30,15 @@ public IEnumerable<string> GetChildKeys(IEnumerable<string> earlierKeys, string
         {
             // TODO: This method signature is pretty bad
 
-            if (prefix == "" && delimiter == ":")
+            if (string.IsNullOrEmpty(prefix) && delimiter == ":")
             {
                 return earlierKeys.Concat(new[] { "Hardcoded" });
             }
-            if (prefix == "Hardcoded:" && delimiter == ":")
+            if (prefix == "Hardcoded" && delimiter == ":")
             {
                 return earlierKeys.Concat(new[] { "1", "2" });
             }
-            if (prefix == "Hardcoded:1:" || prefix == "Hardcoded:2:")
+            if (prefix == "Hardcoded:1" || prefix == "Hardcoded:2")
             {
                 return earlierKeys.Concat(new[] { "Caption" });
             }

samples/Config.CustomProviders.Web/project.json

@@ -10,7 +10,11 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "commands": {
     "web": "Config.CustomProviders.Web"

samples/Config.Providers.Web/project.json

@@ -12,9 +12,16 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "commands": {
     "web": "Config.Providers.Web"
-  }
+  }, 
+  "content": [
+    "Config.Providers.ini"
+  ]
 }

samples/Config.SettingObject.Web/project.json

@@ -9,7 +9,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true

samples/Config.WalkingValues.Web/project.json

@@ -10,12 +10,19 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true
   },
   "commands": {
     "web": "Config.WalkingValues.Web"
-  }
+  },
+  "content": [
+    "Config.Sources.ini"
+  ]
 }

samples/Container.Fallback.Web/project.json

@@ -8,7 +8,11 @@
   },
   "frameworks": {
     "dnx451": {},
-    "dnxcore50": {}
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true

samples/Content.Upload.Files/project.json

@@ -14,7 +14,11 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true

samples/Content.Upload.Form/project.json

@@ -14,7 +14,11 @@
   },
   "frameworks": {
     "dnx451": { },
-    "dnxcore50": { }
+    "dnxcore50": {
+      "dependencies": {
+        "NETStandard.Library": "1.0.0-*"
+      }
+    }
   },
   "compilationOptions": {
     "emitEntryPoint": true

samples/Content.Upload.Multipart/project.json

@@ -21,6 +21,7 @@
     },
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Net.Http": "4.0.1-*"
       }
     }

samples/Data.InMemory/project.json

@@ -1,4 +1,7 @@
 {
+  "compilationOptions": {
+    "emitEntryPoint": true 
+  },
   "dependencies": {
     "Microsoft.EntityFrameworkCore.InMemory": "1.0.0-*",
     "Microsoft.NETCore.Platforms": "1.0.1-*"
@@ -7,8 +10,10 @@
     "dnx451": {},
     "dnxcore50": {
       "dependencies": {
+        "NETStandard.Library": "1.0.0-*",
         "System.Console": "4.0.0-*"
-      }
+      },
+      "imports": "portable-net451+win8"
     }
   }
 }