Merge branch 'release/2.1' into dev

Author: Nate McMaster

modules/BundledPackages/module.targets

@@ -13,7 +13,11 @@
       <_ShouldRunBundledRestore Condition="Exists('$(_BundledRestoreSentinel)')">false</_ShouldRunBundledRestore>
     </PropertyGroup>
 
-    <Touch Files="$(_BundledRestoreSentinel)" AlwaysCreate="true" Condition=" ! Exists('$(_BundledRestoreSentinel)') " />
+    <Touch
+      Files="$(_BundledRestoreSentinel)"
+      AlwaysCreate="true"
+      Condition=" ! Exists('$(_BundledRestoreSentinel)') "
+      ContinueOnError="true" />
 
     <MSBuild Targets="Restore"
       Projects="$(MSBuildThisFileDirectory)BundledPackageRestorer.csproj"

test/KoreBuild.FunctionalTests/SimpleRepoTests.cs

@@ -145,9 +145,6 @@ public void BuildOfGlobalCliToolIncludesShims()
 
                 var winx64 = Assert.Single(files, f => f.StartsWith("tools/netcoreapp2.1/any/shims/win-x64/"));
                 Assert.Equal("GlobalConsoleTool.exe", Path.GetFileName(winx64));
-
-                var osx64 = Assert.Single(files, f => f.StartsWith("tools/netcoreapp2.1/any/shims/osx-x64/"));
-                Assert.Equal("GlobalConsoleTool", Path.GetFileName(osx64));
             }
 
             var toolsDir = Path.Combine(app.WorkingDirectory, "artifacts", "tools");

testassets/RepoThatShouldFailToBuild/korebuild.json

@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
-  "channel": "release/2.1"
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
+  "channel": "dev"
 }

testassets/RepoWithGlobalTool/korebuild.json

@@ -1,4 +1,4 @@
 {
-  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json",
-  "channel": "release/2.1"
+  "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json",
+  "channel": "dev"
 }