From 0a55104288a39c1dcef2486a73d0484d73d79ca3 Mon Sep 17 00:00:00 2001
From: Ankit Jain <ankit.jain@microsoft.com>
Date: Fri, 20 Sep 2019 14:57:30 -0400
Subject: [PATCH 1/2] [mono] Update bits to work with version bumps from
 Maestro

- Moves the versions to `eng/Versions.props`
- Adds SDK dependencies to `eng/Version.Details.xml`
- This does *not* enable the subscriptions though, but it sets things up
to allow enabling it in future
---
 eng/Version.Details.xml                       | 32 ++++++++++++++++
 eng/Versions.props                            |  8 ++++
 mono/build/DotNetBitsVersions.props           | 38 +++++++------------
 mono/build/README.md                          |  2 +-
 .../update_sdks_and_nugets.proj               |  8 ++--
 5 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 278954a14c6..a9c67696029 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -11,5 +11,37 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19425.1">
+      <Uri>https://github.com/dotnet/sdk</Uri>
+      <Sha>d5f22a0303747707a506fbc460884b49f26698d2</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-rc1.19426.5">
+      <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
+      <Sha>f290e8285d888950250a86f8ad55d8cf4cc13994</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc1.19427.3">
+      <Uri>https://github.com/aspnet/websdk</Uri>
+      <Sha>0162efb78f266ec4d87405d4667325bcfa11b290</Sha>
+    </Dependency>
+    <Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.19380.1">
+      <Uri>https://github.com/mono/linker</Uri>
+      <Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19426-11">
+      <Uri>https://github.com/dotnet/core-setup</Uri>
+      <Sha>b33b6c20d855e7f9fdda6383ad12d849079f9b21</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-rc1.19427.4">
+      <Uri>https://github.com/dotnet/cli</Uri>
+      <Sha>d23afb6757bb73014e8c23b3f7c772578827049c</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.Net.Compilers" Version="3.3.1-beta3-19426-02">
+      <Uri>https://github.com/dotnet/roslyn</Uri>
+      <Sha>c82648d8964d1e683f92b7daa91beef2fdc5fb72</Sha>
+    </Dependency>
+    <Dependency Name="NuGet.Build.Tasks" Version="5.3.0-preview.2.6167">
+      <Uri>https://github.com/NuGet/NuGet.Client</Uri>
+      <Sha>4590967639182b183b247355596aedc7d0855a86</Sha>
+    </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 8478668ee77..274eb1b5ba9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -38,6 +38,14 @@
   <!-- Product Dependencies -->
   <PropertyGroup>
     <SystemResourcesExtensionsVersion>4.6.0-rc2.19458.3</SystemResourcesExtensionsVersion>
+    <MicrosoftNetCompilersVersion>3.3.1-beta4-19462-11</MicrosoftNetCompilersVersion>
+    <MicrosoftNETSdkVersion>3.0.100-rc2.19463.5</MicrosoftNETSdkVersion>
+    <MicrosoftNETSdkRazorVersion>3.0.0</MicrosoftNETSdkRazorVersion>
+    <MicrosoftNETSdkWebVersion>3.0.100-rc2.19465.1</MicrosoftNETSdkWebVersion>
+    <NuGetBuildTasksVersion>5.3.0-rtm.6192</NuGetBuildTasksVersion>
+    <ILLinkTasksVersion>0.1.6-prerelease.19380.1</ILLinkTasksVersion>
+    <MicrosoftNETCoreAppVersion>3.0.0</MicrosoftNETCoreAppVersion>
+    <MicrosoftDotNetCliRuntimeVersion>3.0.100-rc2.19465.3</MicrosoftDotNetCliRuntimeVersion>
   </PropertyGroup>
   <Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">
     <!-- See https://github.com/dotnet/arcade/issues/3386
diff --git a/mono/build/DotNetBitsVersions.props b/mono/build/DotNetBitsVersions.props
index 2194f012999..f2966d935e3 100644
--- a/mono/build/DotNetBitsVersions.props
+++ b/mono/build/DotNetBitsVersions.props
@@ -1,36 +1,26 @@
 <Project>
+    <Import Project="..\..\eng\Versions.props" />
     <PropertyGroup>
-        <MicrosoftNETSdkPackageVersion>3.0.100-rc2.19463.5</MicrosoftNETSdkPackageVersion>
+        <MicrosoftNETBuildExtensionsVersion>$(MicrosoftNETSdkVersion)</MicrosoftNETBuildExtensionsVersion>
 
-        <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
+        <MicrosoftNETSdkPublishVersion>$(MicrosoftNETSdkWebVersion)</MicrosoftNETSdkPublishVersion>
+        <MicrosoftNETSdkWebProjectSystemVersion>$(MicrosoftNETSdkWebVersion)</MicrosoftNETSdkWebProjectSystemVersion>
+        <NuGetBuildTasksPackVersion>$(NuGetBuildTasksVersion)</NuGetBuildTasksPackVersion>
 
-        <MicrosoftNETSdkRazorPackageVersion>3.0.0</MicrosoftNETSdkRazorPackageVersion>
-
-        <MicrosoftNETSdkWebPackageVersion>3.0.100-rc2.19465.1</MicrosoftNETSdkWebPackageVersion>
-        <MicrosoftNETSdkPublishPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkPublishPackageVersion>
-        <MicrosoftNETSdkWebProjectSystemPackageVersion>$(MicrosoftNETSdkWebPackageVersion)</MicrosoftNETSdkWebProjectSystemPackageVersion>
-
-        <NuGetBuildTasksPackageVersion>5.3.0-rtm.6192</NuGetBuildTasksPackageVersion>
-        <NuGetBuildTasksPackPackageVersion>$(NuGetBuildTasksPackageVersion)</NuGetBuildTasksPackPackageVersion>
-
-        <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc2.19465.3</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
-
-        <MicrosoftNETCoreAppPackageVersion>3.0.0</MicrosoftNETCoreAppPackageVersion>
-        <DotNetSdkVersionForLibHostFxr>$(MicrosoftNETCoreAppPackageVersion)</DotNetSdkVersionForLibHostFxr>
-
-        <ILLinkTasksPackageVersion>0.1.6-prerelease.19380.1</ILLinkTasksPackageVersion>
+        <MicrosoftDotNetMSBuildSdkResolverVersion>$(MicrosoftDotNetCliRuntimeVersion)</MicrosoftDotNetMSBuildSdkResolverVersion>
+        <DotNetSdkVersionForLibHostFxr>$(MicrosoftNETCoreAppVersion)</DotNetSdkVersionForLibHostFxr>
     </PropertyGroup>
 
     <ItemGroup>
-        <BundledSdk Include="Microsoft.NET.Sdk" Version="$(MicrosoftNETSdkPackageVersion)" />
-        <BundledSdk Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorPackageVersion)" />
-        <BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(MicrosoftNETSdkWebPackageVersion)" />
-        <BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(MicrosoftNETSdkPublishPackageVersion)" />
-        <BundledSdk Include="Microsoft.NET.Sdk.Web.ProjectSystem" Version="$(MicrosoftNETSdkWebProjectSystemPackageVersion)" />
+        <BundledSdk Include="Microsoft.NET.Sdk" Version="$(MicrosoftNETSdkVersion)" />
+        <BundledSdk Include="Microsoft.NET.Sdk.Razor" Version="$(MicrosoftNETSdkRazorVersion)" />
+        <BundledSdk Include="Microsoft.NET.Sdk.Web" Version="$(MicrosoftNETSdkWebVersion)" />
+        <BundledSdk Include="Microsoft.NET.Sdk.Publish" Version="$(MicrosoftNETSdkPublishVersion)" />
+        <BundledSdk Include="Microsoft.NET.Sdk.Web.ProjectSystem" Version="$(MicrosoftNETSdkWebProjectSystemVersion)" />
 
-        <BundledSdk Include="ILLink.Tasks" Version="$(ILLinkTasksPackageVersion)" />
+        <BundledSdk Include="ILLink.Tasks" Version="$(ILLinkTasksVersion)" />
 
-        <BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackPackageVersion)" />
+        <BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackVersion)" />
 
         <BundledSdk Include="FSharp.NET.Sdk" Version="1.0.4-bundled-0100" />
         <BundledSdk Include="Microsoft.Docker.Sdk" Version="1.1.0" />
diff --git a/mono/build/README.md b/mono/build/README.md
index 36ff63688c1..28b085e63e5 100644
--- a/mono/build/README.md
+++ b/mono/build/README.md
@@ -1,6 +1,6 @@
 Update various SDKs that we bundle with mono.
 
-- Update the various versions in `mono/build/DotNetBitsVersions.props`.
+- Update the various versions in `eng/Versions.props`
 - If any nuget sources need to be updated, then do that in `mono/build/RestoreSourcesOverrides.props`.
 
 - For NuGet update, ensure that the version is updated in `eng/Packages.props`:
diff --git a/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj b/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
index 2ca8aecd669..c3670ea1d23 100644
--- a/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
+++ b/mono/build/sdks_and_nugets/update_sdks_and_nugets.proj
@@ -1,4 +1,4 @@
-<Project>
+<Project DefaultTargets="DeploySdksAndNuGets">
     <Import Project="$(MSBuildThisFileDirectory)\..\common.props" />
     <Import Project="$(MSBuildThisFileDirectory)\..\DotnetBitsVersions.props" />
 
@@ -15,7 +15,7 @@
 
         <HostFxrUrl>$(CoreSetupRootUrl)$(HostFxrVersion)/$(DownloadedHostFxrInstallerFileName)$(CoreSetupBlobAccessTokenParam)</HostFxrUrl>
         <MSBuildSdkResolverOutDir>$(DotNetOverlayDirectory)\msbuild-bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver</MSBuildSdkResolverOutDir>
-        <RuntimeDepsInstallerUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)/$(DownloadedRuntimeDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam)</RuntimeDepsInstallerUrl>
+        <RuntimeDepsInstallerUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppVersion)/$(DownloadedRuntimeDepsInstallerFileName)$(CoreSetupBlobAccessTokenParam)</RuntimeDepsInstallerUrl>
     </PropertyGroup>
 
     <Target Name="DeploySdksAndNuGets">
@@ -38,7 +38,7 @@
                 <Properties>
                     ProjectWithProperties=ms_extensions.proj;
                     DependencyPackageName=Microsoft.NET.Build.Extensions;
-                    DependencyPackageVersion=$(MicrosoftNETBuildExtensionsPackageVersion);
+                    DependencyPackageVersion=$(MicrosoftNETBuildExtensionsVersion);
                     NuGetPackagesDir=$(NuGetPackagesDir);
                     MSBuildExtensionsPathToolsVersionOutputDirectory=$(MSBuildExtensionsPathToolsVersionOutputDirectory);
                     MSBuildExtensionsPathOutputDirectory=$(MSBuildExtensionsPathOutputDirectory)
@@ -49,7 +49,7 @@
                 <Properties>
                     ProjectWithProperties=dotnet_resolver.proj;
                     DependencyPackageName=Microsoft.DotNet.MSBuildSdkResolver;
-                    DependencyPackageVersion=$(MicrosoftDotNetMSBuildSdkResolverPackageVersion);
+                    DependencyPackageVersion=$(MicrosoftDotNetMSBuildSdkResolverVersion);
                     NuGetPackagesDir=$(NuGetPackagesDir);
                     DotnetSdkResolverDir=$(MSBuildSdkResolverOutDir)
                 </Properties>

From a8658b1e94c26f2576cb6eb8b0bd474da4e75776 Mon Sep 17 00:00:00 2001
From: Ankit Jain <ankit.jain@microsoft.com>
Date: Fri, 20 Sep 2019 16:27:06 -0400
Subject: [PATCH 2/2] [mono] Update SDK/nuget versions to track
 `release/3.1.1xx`

```
    MicrosoftNETSdkVersion:                 3.1.100-preview1.19463.2
    MicrosoftNETSdkRazorVersion:            3.1.0-preview1.19470.1
    MicrosoftNETSdkWebVersion:              3.0.100-rc2.19461.2
    MicrosoftNETCoreAppVersion:             3.1.0-preview1.19467.7
    MicrosoftDotNetCliRuntimeVersion:       3.1.100-preview1.19467.5
```

Source: https://github.com/dotnet/toolset/blob/8f096e7fd87855d17feb3c35a7374505d6b4c2c9/eng/Version.Details.xml
---
 eng/Version.Details.xml | 24 ++++++++++++------------
 eng/Versions.props      | 10 +++++-----
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index a9c67696029..861d6af5230 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -11,37 +11,37 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>173d70b99a5dbb3ff9298a6e2e9c7f7e7b56dd7c</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19425.1">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-preview1.19463.2">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>d5f22a0303747707a506fbc460884b49f26698d2</Sha>
+      <Sha>a19b734139ab62de631c31897b0ffc35f8462f3f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.0.0-rc1.19426.5">
+    <Dependency Name="Microsoft.NET.Sdk.Razor" Version="3.1.0-preview1.19470.1">
       <Uri>https://github.com/aspnet/AspNetCore-Tooling</Uri>
-      <Sha>f290e8285d888950250a86f8ad55d8cf4cc13994</Sha>
+      <Sha>f283e4a7c0d47054c9a178ff0b29f00e68f307d3</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc1.19427.3">
+    <Dependency Name="Microsoft.NET.Sdk.Web" Version="3.0.100-rc2.19461.2">
       <Uri>https://github.com/aspnet/websdk</Uri>
-      <Sha>0162efb78f266ec4d87405d4667325bcfa11b290</Sha>
+      <Sha>9471e9daf66b1e4f03d8b461c3ca0594f742923b</Sha>
     </Dependency>
     <Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.19380.1">
       <Uri>https://github.com/mono/linker</Uri>
       <Sha>1127689f262d52ea8ff68ef03d706fa62b3b40a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19426-11">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19467.7">
       <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>b33b6c20d855e7f9fdda6383ad12d849079f9b21</Sha>
+      <Sha>1e19b8c0d63fe23da7bdd9625ca51c6bd2d1bab2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.0.100-rc1.19427.4">
+    <Dependency Name="Microsoft.DotNet.Cli.Runtime" Version="3.1.100-preview1.19467.5">
       <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>d23afb6757bb73014e8c23b3f7c772578827049c</Sha>
+      <Sha>11fe23d96c69dad32ab5267d63e572778c5d6de5</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Net.Compilers" Version="3.3.1-beta3-19426-02">
       <Uri>https://github.com/dotnet/roslyn</Uri>
       <Sha>c82648d8964d1e683f92b7daa91beef2fdc5fb72</Sha>
     </Dependency>
-    <Dependency Name="NuGet.Build.Tasks" Version="5.3.0-preview.2.6167">
+    <Dependency Name="NuGet.Build.Tasks" Version="5.3.0-rtm.6192">
       <Uri>https://github.com/NuGet/NuGet.Client</Uri>
-      <Sha>4590967639182b183b247355596aedc7d0855a86</Sha>
+      <Sha>bb60d6720d24890b8f3e071e70d27ea0f2bef57e</Sha>
     </Dependency>
   </ProductDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index 274eb1b5ba9..783d3a97277 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -39,13 +39,13 @@
   <PropertyGroup>
     <SystemResourcesExtensionsVersion>4.6.0-rc2.19458.3</SystemResourcesExtensionsVersion>
     <MicrosoftNetCompilersVersion>3.3.1-beta4-19462-11</MicrosoftNetCompilersVersion>
-    <MicrosoftNETSdkVersion>3.0.100-rc2.19463.5</MicrosoftNETSdkVersion>
-    <MicrosoftNETSdkRazorVersion>3.0.0</MicrosoftNETSdkRazorVersion>
-    <MicrosoftNETSdkWebVersion>3.0.100-rc2.19465.1</MicrosoftNETSdkWebVersion>
+    <MicrosoftNETSdkVersion>3.1.100-preview1.19463.2</MicrosoftNETSdkVersion>
+    <MicrosoftNETSdkRazorVersion>3.1.0-preview1.19470.1</MicrosoftNETSdkRazorVersion>
+    <MicrosoftNETSdkWebVersion>3.0.100-rc2.19461.2</MicrosoftNETSdkWebVersion>
     <NuGetBuildTasksVersion>5.3.0-rtm.6192</NuGetBuildTasksVersion>
     <ILLinkTasksVersion>0.1.6-prerelease.19380.1</ILLinkTasksVersion>
-    <MicrosoftNETCoreAppVersion>3.0.0</MicrosoftNETCoreAppVersion>
-    <MicrosoftDotNetCliRuntimeVersion>3.0.100-rc2.19465.3</MicrosoftDotNetCliRuntimeVersion>
+    <MicrosoftNETCoreAppVersion>3.1.0-preview1.19467.7</MicrosoftNETCoreAppVersion>
+    <MicrosoftDotNetCliRuntimeVersion>3.1.100-preview1.19467.5</MicrosoftDotNetCliRuntimeVersion>
   </PropertyGroup>
   <Target Name="OverrideArcadeFileVersion" AfterTargets="_InitializeAssemblyVersion">
     <!-- See https://github.com/dotnet/arcade/issues/3386