Update Arcade and other tool packages

.gitignore

@@ -275,6 +275,7 @@ config.ps1
 ### source-build ###
 prebuilt/
 msbuild.binlog
+testing-smoke/
 
 # Exists temporarily during build. Interferes with VersionTools'
 # UpdateDependenciesAndSubmitPullRequest: if no upgrades are performed, the

build-source-tarball.sh

@@ -233,6 +233,9 @@ done
 echo 'Copying source-built packages to tarball to replace packages needed before they are built...'
 mkdir -p $TARBALL_ROOT/packages/source-built
 cp -r $SCRIPT_ROOT/Tools/source-built/coreclr-tools $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*Arcade*.nupkg $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*SourceLink*.nupkg $TARBALL_ROOT/packages/source-built/
+cp $SCRIPT_ROOT/bin/obj/x64/Release/blob-feed/packages/*Build*Tasks*.nupkg $TARBALL_ROOT/packages/source-built/
 
 # Setup package version props to include both source-built and running PackageVersions.props
 mkdir --parents $TARBALL_ROOT/bin/obj/x64/Release/

eng/Version.Details.xml

@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19381.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19463.3">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>8f3c22397990aeb20a88690b51dad4b33f21e7ff</Sha>
+      <Sha>ce459ae07c3d7a1e68251268855e0bc7b3d97f75</Sha>
     </Dependency>
     <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.19504.1">
       <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>
       <Sha>2ffab5d89396ae7150331e6898661b5aeaa63d7e</Sha>
     </Dependency>
   </ToolsetDependencies>
   <ProductDependencies>
-    <Dependency Name="sourcelink" Version="1.0.0-beta2-19351-01">
+    <Dependency Name="Microsoft.Build.Tasks.Git" Version="1.0.0-beta2-19367-01">
       <Uri>https://github.com/dotnet/sourcelink</Uri>
-      <Sha>51310e65e75010467993f793e1739d1a1dad50c5</Sha>
+      <Sha>855afb5af9ea79e63dd9c051a7cfe0941bbb5ced</Sha>
     </Dependency>
     <!-- this is pinned to work around https://github.com/dotnet/arcade/issues/3518 -->
     <!-- if XDT is updated before that issue is fixed, this should be updated.  After the issue is fixed, it should be unpinned.  -->

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.0.100-preview7-012821"
+    "dotnet": "3.0.100"
   },
   "msbuild-sdks": {
     "Microsoft.Build.CentralPackageVersions": "2.0.1",

patches/arcade/0001-Enable-sourcelink-in-sourcebuild.patch

@@ -1,7 +1,7 @@
-From c255c95b8b488d81349ccecd47f1966e4aa9b713 Mon Sep 17 00:00:00 2001
+From 203f9d3b13a9c30442159361d9333ae6144346c7 Mon Sep 17 00:00:00 2001
 From: Chris Rummel <[email protected]>
 Date: Wed, 7 Aug 2019 19:23:07 -0500
-Subject: [PATCH] Enable sourcelink in sourcebuild.
+Subject: [PATCH 1/3] Enable sourcelink in sourcebuild.
 
 ---
  .../tools/RepositoryInfo.targets                   | 14 +-------------
@@ -37,5 +37,5 @@ index 550ad298..8d31d833 100644
      <SourceRoot Include="$(RepoRoot)" />
    </ItemGroup>
 -- 
-2.21.0
+2.18.0
 

patches/arcade/0002-Do-not-build-.NET-Fx-binaries-in-source-build.patch

@@ -1,21 +1,33 @@
-From 2f4170e475fc334aeb0fb5e5b612245a05d36dfd Mon Sep 17 00:00:00 2001
+From fd66f02bea54d60c13cd3a3652a01b1987d091c0 Mon Sep 17 00:00:00 2001
 From: Nikola Milosavljevic <[email protected]>
 Date: Fri, 6 Sep 2019 18:18:33 +0000
-Subject: [PATCH 2/2] Do not build .NET Fx binaries in source build.
+Subject: [PATCH 2/3] Do not build .NET Fx binaries in source build.
 
 ---
- eng/Versions.props                                                     | 2 +-
- src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj     | 1 +
- .../src/Microsoft.DotNet.Build.Tasks.Configuration.csproj              | 3 ++-
- .../src/Microsoft.DotNet.Build.Tasks.Packaging.csproj                  | 1 +
- .../Microsoft.DotNet.CoreFxTesting.csproj                              | 1 +
- .../Microsoft.DotNet.Deployment.Tasks.Links.csproj                     | 1 +
- src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj     | 3 ++-
- src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj         | 1 +
- 8 files changed, 10 insertions(+), 3 deletions(-)
+ Directory.Build.props                                          | 1 +
+ eng/Versions.props                                             | 2 +-
+ .../Microsoft.DotNet.Arcade.Sdk.csproj                         | 1 +
+ .../src/Microsoft.DotNet.Build.Tasks.Configuration.csproj      | 3 ++-
+ .../src/Microsoft.DotNet.Build.Tasks.Packaging.csproj          | 1 +
+ .../Microsoft.DotNet.CoreFxTesting.csproj                      | 1 +
+ .../Microsoft.DotNet.Deployment.Tasks.Links.csproj             | 1 +
+ .../Microsoft.DotNet.GenFacades.csproj                         | 3 ++-
+ src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj | 1 +
+ 9 files changed, 11 insertions(+), 3 deletions(-)
 
+diff --git a/Directory.Build.props b/Directory.Build.props
+index eba8e1c9..06382559 100644
+--- a/Directory.Build.props
++++ b/Directory.Build.props
+@@ -14,5 +14,6 @@
+       Tools and packages produced by this repository support infrastructure and are not shipping on NuGet or via any other official channel.
+     -->
+     <IsShipping>false</IsShipping>
++    <NoWarn>$(NoWarn);NU5128</NoWarn>
+   </PropertyGroup>
+ </Project>
 diff --git a/eng/Versions.props b/eng/Versions.props
-index 249e6d2..bf7a2ed 100644
+index bf38e650..2c945967 100644
 --- a/eng/Versions.props
 +++ b/eng/Versions.props
 @@ -6,7 +6,7 @@
@@ -28,7 +40,7 @@ index 249e6d2..bf7a2ed 100644
      <CommandLineParserVersion>2.2.1</CommandLineParserVersion>
      <CredentialManagementVersion>1.0.2</CredentialManagementVersion>
 diff --git a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
-index aaaf4da..f16405e 100644
+index aaaf4dac..f16405e7 100644
 --- a/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
 +++ b/src/Microsoft.DotNet.Arcade.Sdk/Microsoft.DotNet.Arcade.Sdk.csproj
 @@ -2,6 +2,7 @@
@@ -40,7 +52,7 @@ index aaaf4da..f16405e 100644
      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
      <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
 diff --git a/src/Microsoft.DotNet.Build.Tasks.Configuration/src/Microsoft.DotNet.Build.Tasks.Configuration.csproj b/src/Microsoft.DotNet.Build.Tasks.Configuration/src/Microsoft.DotNet.Build.Tasks.Configuration.csproj
-index 1ee3064..ce6a5e5 100644
+index 1ee3064c..ce6a5e5e 100644
 --- a/src/Microsoft.DotNet.Build.Tasks.Configuration/src/Microsoft.DotNet.Build.Tasks.Configuration.csproj
 +++ b/src/Microsoft.DotNet.Build.Tasks.Configuration/src/Microsoft.DotNet.Build.Tasks.Configuration.csproj
 @@ -2,6 +2,7 @@
@@ -59,7 +71,7 @@ index 1ee3064..ce6a5e5 100644
 \ No newline at end of file
 +</Project>
 diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
-index 5dfd052..2f771f9 100644
+index 678ba714..955d343b 100644
 --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
 +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/Microsoft.DotNet.Build.Tasks.Packaging.csproj
 @@ -2,6 +2,7 @@
@@ -71,7 +83,7 @@ index 5dfd052..2f771f9 100644
      <PackageType>MSBuildSdk</PackageType>
      <IncludeBuildOutput>false</IncludeBuildOutput>
 diff --git a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
-index 8bd6963..694e338 100644
+index 78d8c94c..33e90e49 100644
 --- a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
 +++ b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
 @@ -2,6 +2,7 @@
@@ -81,9 +93,9 @@ index 8bd6963..694e338 100644
 +    <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp2.1</TargetFrameworks>
      <Description>This package provides support for running tests inside CoreFx.</Description>
      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-   </PropertyGroup>
+     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
 diff --git a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
-index ed385c1..7314a27 100644
+index 5adb4419..43f0b4e5 100644
 --- a/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
 +++ b/src/Microsoft.DotNet.Deployment.Tasks.Links/Microsoft.DotNet.Deployment.Tasks.Links.csproj
 @@ -3,6 +3,7 @@
@@ -95,7 +107,7 @@ index ed385c1..7314a27 100644
      <IsPackable>true</IsPackable>
      <Description>Aka.ms link manager</Description>
 diff --git a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
-index 196bc8d..04f3e5b 100644
+index 8936c1f1..6678ac40 100644
 --- a/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
 +++ b/src/Microsoft.DotNet.GenFacades/Microsoft.DotNet.GenFacades.csproj
 @@ -2,6 +2,7 @@
@@ -106,15 +118,15 @@ index 196bc8d..04f3e5b 100644
      <ExcludeFromSourceBuild>false</ExcludeFromSourceBuild>
      <PackageType>MSBuildSdk</PackageType>
      <IncludeBuildOutput>false</IncludeBuildOutput>
-@@ -49,4 +50,4 @@
+@@ -58,4 +59,4 @@
 
    <Import Project="$(RepoRoot)eng\BuildTask.targets" />
 
 -</Project>
 \ No newline at end of file
 +</Project>
 diff --git a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
-index a201af8..e84959e 100644
+index a201af86..e84959e2 100644
 --- a/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
 +++ b/src/Microsoft.DotNet.SignTool/Microsoft.DotNet.SignTool.csproj
 @@ -2,6 +2,7 @@
@@ -126,5 +138,5 @@ index a201af8..e84959e 100644
      <LangVersion>Latest</LangVersion>
      <IsPackable>true</IsPackable>
 -- 
-1.8.3.1
+2.18.0
 

patches/arcade/0003-Build-CoreFxTesting-in-source-build.patch

@@ -0,0 +1,24 @@
+From fb40a09831a06ee786c884917813890959e1956f Mon Sep 17 00:00:00 2001
+From: Chris Rummel <[email protected]>
+Date: Tue, 24 Sep 2019 11:39:15 -0500
+Subject: [PATCH 3/3] Build CoreFxTesting in source-build
+
+---
+ .../Microsoft.DotNet.CoreFxTesting.csproj                        | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
+index 33e90e49..694e3381 100644
+--- a/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
++++ b/src/Microsoft.DotNet.CoreFxTesting/Microsoft.DotNet.CoreFxTesting.csproj
+@@ -5,7 +5,6 @@
+     <TargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">netcoreapp2.1</TargetFrameworks>
+     <Description>This package provides support for running tests inside CoreFx.</Description>
+     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+-    <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+   </PropertyGroup>
+
+   <ItemGroup>
+-- 
+2.18.0
+