Merge branch 'release/3.1.1xx' into merges/release/3.0.1xx-to-release/3.1.1xx

2019-09-26 15:33:25 -07:00 · 2019-09-26 15:33:25 -07:00 · a4b4a7c9c5
commit a4b4a7c9c5
parent 1ad1be909a 67e623e6d2
14 changed files with 136 additions and 75 deletions
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@ -130,13 +130,6 @@ stages:
              _RuntimeIdentifier: ''
              _BuildArchitecture: 'x64'
              _DropSuffix: ''
-            Build_OpenSUSE_42_3_Debug_x64:
-              _BuildConfig: Debug
-              _DockerParameter: '--docker opensuse.42.3'
-              _LinuxPortable: '--linux-portable'
-              _RuntimeIdentifier: ''
-              _BuildArchitecture: 'x64'
-              _DropSuffix: ''
            Build_CentOS_7_1_Debug_x64:
              _BuildConfig: Debug
              _DockerParameter: '--docker centos'
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -2,21 +2,19 @@
 <Dependencies>
  <ProductDependencies>
    <!-- Winforms / WPF -->
-    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.1.0-preview1.19470.9">
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.1.0-preview1.19475.6">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
+      <Sha>5fa4772596a1c18d62a179f39704160c7f6dc223</Sha>
    </Dependency>
    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.0-preview1.19470.9">
      <Uri>https://github.com/dotnet/core-setup</Uri>
      <Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19470.9">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.1.0-preview1.19475.6">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
+      <Sha>5fa4772596a1c18d62a179f39704160c7f6dc223</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="3.1.0-preview1.19470.9">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
    </Dependency>
    <Dependency Name="Microsoft.NETCore.DotNetAppHost" Version="3.1.0-preview1.19470.9">
      <Uri>https://github.com/dotnet/core-setup</Uri>
@ -40,54 +38,54 @@
      <Uri>https://github.com/dotnet/corefx</Uri>
      <Sha>d0f0bfa5b123b4c1183c889cf4017bb529675502</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0-preview1.19473.5">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0-preview1.19475.24">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
+      <Sha>1937c804fa83ee3adddc7e648c610f880c24188e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0-preview1.19473.5">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0-preview1.19475.24">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
+      <Sha>1937c804fa83ee3adddc7e648c610f880c24188e</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.0-preview1.19473.5">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.0-preview1.19475.24">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
+      <Sha>1937c804fa83ee3adddc7e648c610f880c24188e</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="3.1.0-preview1.19473.5">
+    <Dependency Name="dotnet-dev-certs" Version="3.1.0-preview1.19475.24">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
+      <Sha>1937c804fa83ee3adddc7e648c610f880c24188e</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="3.1.0-preview1.19473.5">
+    <Dependency Name="dotnet-user-secrets" Version="3.1.0-preview1.19475.24">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
+      <Sha>1937c804fa83ee3adddc7e648c610f880c24188e</Sha>
    </Dependency>
-    <Dependency Name="dotnet-watch" Version="3.1.0-preview1.19473.5">
+    <Dependency Name="dotnet-watch" Version="3.1.0-preview1.19475.24">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
+      <Sha>1937c804fa83ee3adddc7e648c610f880c24188e</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.1-servicing.19476.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
      <Uri>https://github.com/dotnet/templating</Uri>
      <Sha>a776e417c83c52908298b3767e462feae8b18b98</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.100-preview1.19462.27">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.100-preview1.19474.6">
      <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>a8d3527fb2816d377ffabda05fb43b34bb1635db</Sha>
+      <Sha>256b3e07a94d90a0585b1f8da8d3b99526272637</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc2.19467.3" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.1.100-preview1.19469.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>b3a343bf8ed65f5208c5bb86c632856c5d107b1d</Sha>
+      <Sha>902380600200731914d936fca50b60e3e06dcb16</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.100-preview1.19462.8" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.1.100-preview1.19474.2" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
      <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>25e58e48c0f49360bb5a9c804ca3b2ebeae01246</Sha>
+      <Sha>4a9e195d7123e1c3d774cf8e6881d3ff93f47c44</Sha>
    </Dependency>
    <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-preview1.19462.8" CoherentParentDependency="Microsoft.WindowsDesktop.App">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.1-preview1.19474.4" CoherentParentDependency="Microsoft.WindowsDesktop.App">
      <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>93ae5ab5d366dc65495de6abb938f6d647eaf291</Sha>
+      <Sha>066b5db8f092c09d8e2d46c27d355e29d1d28d69</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-preview1.19462.15" CoherentParentDependency="Microsoft.WindowsDesktop.App">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.1.0-preview1.19475.5" CoherentParentDependency="Microsoft.WindowsDesktop.App">
      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>acd0da083a426b222a54201c9f37860da50a906a</Sha>
+      <Sha>4d424cad44e237f1607c2a61485aa6ee2df5ce43</Sha>
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -12,40 +12,40 @@
    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
  </PropertyGroup>
  <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.100-preview1.19462.27</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.1.100-preview1.19474.6</MicrosoftDotnetToolsetInternalPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-preview1.19462.8</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.1-preview1.19474.4</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-preview1.19462.15</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.1.0-preview1.19475.5</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.0-preview1.19473.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>3.1.0-preview1.19473.5</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.0-preview1.19473.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <dotnetdevcertsPackageVersion>3.1.0-preview1.19473.5</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>3.1.0-preview1.19473.5</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>3.1.0-preview1.19473.5</dotnetwatchPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.0-preview1.19475.24</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>3.1.0-preview1.19475.24</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.0-preview1.19475.24</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <dotnetdevcertsPackageVersion>3.1.0-preview1.19475.24</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>3.1.0-preview1.19475.24</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>3.1.0-preview1.19475.24</dotnetwatchPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.100-preview1.19462.8</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.1.100-preview1.19474.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
-    <MicrosoftNETSdkPackageVersion>3.0.100-rc2.19467.3</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>3.1.100-preview1.19469.1</MicrosoftNETSdkPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.0-preview1.19470.9</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppPackageVersion>3.1.0-preview1.19470.9</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>3.1.0-preview1.19475.6</MicrosoftNETCoreAppPackageVersion>
    <MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
    <MicrosoftNETCoreDotNetAppHostPackageVersion>3.1.0-preview1.19470.9</MicrosoftNETCoreDotNetAppHostPackageVersion>
    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.0-preview1.19470.9</MicrosoftNETCoreDotNetHostResolverPackageVersion>
@ -59,7 +59,7 @@
    <AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
    <AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.0-preview1.19470.9</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
-    <MicrosoftWindowsDesktopAppPackageVersion>3.1.0-preview1.19470.9</MicrosoftWindowsDesktopAppPackageVersion>
+    <MicrosoftWindowsDesktopAppPackageVersion>3.1.0-preview1.19475.6</MicrosoftWindowsDesktopAppPackageVersion>
    <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
@ -67,9 +67,9 @@
    <MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>
    <MicrosoftDotNetWpfProjectTemplates31PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates31PackageVersion>
    <NUnit3Templates31PackageVersion>1.6.3</NUnit3Templates31PackageVersion>
-    <MicrosoftDotNetCommonItemTemplates31PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates31PackageVersion>
+    <MicrosoftDotNetCommonItemTemplates31PackageVersion>3.1.0-preview1.19475.1</MicrosoftDotNetCommonItemTemplates31PackageVersion>
    <MicrosoftDotNetCommonProjectTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplates31PackageVersion)</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
-    <MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates31PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.19465.1</MicrosoftDotNetTestProjectTemplates31PackageVersion>
    <AspNetCorePackageVersionFor31Templates>$(AspNetCoreVersion)</AspNetCorePackageVersionFor31Templates>
    <!-- 3.0 Template versions -->
    <MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
--- a/eng/dockerrun.sh
+++ b/eng/dockerrun.sh
@ -79,12 +79,6 @@ if [ -z "$DOCKERFILE" ]; then
                echo "using 'fedora.23' image"
                export DOCKERFILE=eng/docker/fedora.23
            fi
-        elif [ "$(cat /etc/*-release | grep -cim1 opensuse)" -eq 1 ]; then
-            echo "Detected current OS as openSUSE, determining openSUSE version to use..."
-            if [ "$(cat /etc/*-release | grep -cim1 13.2)" -eq 1 ]; then
-                echo "using 'openSUSE.13.2' image"
-                export DOCKERFILE=eng/docker/opensuse.13.2
-            fi
        else
            echo "Unknown Linux Distro. Using 'ubuntu' image"
            export DOCKERFILE=eng/docker/ubuntu
--- a/netci.groovy
+++ b/netci.groovy
@ -21,7 +21,6 @@ def platformList = [
  'Linux:x64:Release',
  'Linux_NoSuffix:arm:Release',
  'Linux_NoSuffix:x64:Release',
-  'opensuse.42.3:x64:Debug',
  'OSX10.12:x64:Release',
  'RHEL6:x64:Debug',
  'RHEL7.2:x64:Release',
@ -95,7 +94,7 @@ ${buildCommand}
        osUsedForMachineAffinity = 'Ubuntu16.04';
        buildCommand = "${baseShellBuildCommand} --runtime-id rhel.6-x64 --docker rhel.6"
    }
-    else if (os == 'ubuntu.18.04' || os == 'fedora.27' || os == 'opensuse.42.3') {
+    else if (os == 'ubuntu.18.04' || os == 'fedora.27') {
        osUsedForMachineAffinity = 'Ubuntu16.04'
        osVersionUsedForMachineAffinity = 'latest-docker'
        buildCommand = "${baseShellBuildCommand} --docker ${os} --linux-portable"
--- a/src/redist/targets/Branding.targets
+++ b/src/redist/targets/Branding.targets
@ -13,6 +13,7 @@
      <HostFxrBrandName>Microsoft .NET Core Host FX Resolver $(MicrosoftNETCoreDotNetAppHostPackageVersion)</HostFxrBrandName>
      <SharedFrameworkName>Microsoft.NETCore.App</SharedFrameworkName>
      <SharedFrameworkNugetName>$(SharedFrameworkName)</SharedFrameworkNugetName>
+      <BundledTemplates31BrandName>Microsoft .NET Core 3.1 Templates $(CliBrandingVersion)</BundledTemplates31BrandName>
      <BundledTemplates30BrandName>Microsoft .NET Core 3.0 Templates $(CliBrandingVersion)</BundledTemplates30BrandName>
      <BundledTemplates22BrandName>Microsoft .NET Core 2.2 Templates $(CliBrandingVersion)</BundledTemplates22BrandName>
      <BundledTemplates21BrandName>Microsoft .NET Core 2.1 Templates $(CliBrandingVersion)</BundledTemplates21BrandName>
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@ -46,8 +46,8 @@

  <ItemGroup>
    <Bundled31Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates31PackageVersion)" />
-    <Bundled31Templates Include="Microsoft.DotNet.Common.ProjectTemplates.3.0" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates31PackageVersion)" />
-    <Bundled31Templates Include="Microsoft.DotNet.Test.ProjectTemplates.3.0" PackageVersion="$(MicrosoftDotNetTestProjectTemplates31PackageVersion)" />
+    <Bundled31Templates Include="Microsoft.DotNet.Common.ProjectTemplates.3.1" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates31PackageVersion)" />
+    <Bundled31Templates Include="Microsoft.DotNet.Test.ProjectTemplates.3.1" PackageVersion="$(MicrosoftDotNetTestProjectTemplates31PackageVersion)" />
    <Bundled31Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates31PackageVersion)" />
    <Bundled31Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates31PackageVersion)" />
    <Bundled31Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@ -39,6 +39,8 @@
      <RuntimeDepsInstallerFileRid>$(CoreSetupRid)</RuntimeDepsInstallerFileRid>
      <RuntimeDepsInstallerFileRid Condition=" '$(IsDebianBaseDistro)' == 'true' ">x64</RuntimeDepsInstallerFileRid>

+      <AlternateArchitecture Condition="'$(Architecture)' == 'x86'">x64</AlternateArchitecture>
+      <AlternateArchitecture Condition="'$(Architecture)' == 'x64'">x86</AlternateArchitecture>
      <DownloadedSharedHostInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedHostInstallerFileName>
      <DownloadedHostFxrInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedHostFxrInstallerFileName>
      <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
@ -46,6 +48,9 @@
      <DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWinFormsAndWpfSharedFrameworkInstallerFileName>
      <DownloadedNetCoreAppTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-targeting-pack-$(NetCoreAppTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppTargetingPackInstallerFileName>
      <DownloadedNetCoreAppHostPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetCoreAppHostPackInstallerFileName>
+      <DownloadedAlternateNetCoreAppHostPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_$(AlternateArchitecture)$(InstallerExtension)</DownloadedAlternateNetCoreAppHostPackInstallerFileName>
+      <DownloadedArmNetCoreAppHostPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm$(InstallerExtension)</DownloadedArmNetCoreAppHostPackInstallerFileName>
+      <DownloadedArm64NetCoreAppHostPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-apphost-pack-$(NetCoreAppHostPackVersion)-$(SharedFrameworkInstallerFileRid)_arm64$(InstallerExtension)</DownloadedArm64NetCoreAppHostPackInstallerFileName>
      <DownloadedWindowsDesktopTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">windowsdesktop-targeting-pack-$(WindowsDesktopTargetingPackVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedWindowsDesktopTargetingPackInstallerFileName>
      <DownloadedNetStandardTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">netstandard-targeting-pack-$(NETStandardLibraryRefPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)</DownloadedNetStandardTargetingPackInstallerFileName>
      <NetStandardTargetingPackTargetFramework>netstandard$(NETStandardLibraryRefPackageVersion.Split('.')[0])$(NETStandardLibraryRefPackageVersion.Split('.')[1])</NetStandardTargetingPackTargetFramework>
@ -83,9 +88,10 @@
      <CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)</CombinedSharedHostAndFrameworkArchive>
    </PropertyGroup>

-    <PropertyGroup Condition="'$(HostOSName)' == 'win'">
-      <AlternateAppHostRid Condition="'$(Architecture)' == 'x86'">win-x64</AlternateAppHostRid>
-      <AlternateAppHostRid Condition="'$(Architecture)' == 'x64'">win-x86</AlternateAppHostRid>
+    <PropertyGroup Condition="'$(HostOSName)' == 'win' And !$(Architecture.StartsWith('arm'))">
+      <AlternateAppHostRid>win-$(AlternateArchitecture)</AlternateAppHostRid>
+      <ArmAppHostRid>win-arm</ArmAppHostRid>
+      <Arm64AppHostRid>win-arm64</Arm64AppHostRid>
    </PropertyGroup>

    <ItemGroup>
@ -131,6 +137,20 @@
        <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
      </BundledLayoutPackage>

+      <BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg_Arm" Condition="'$(ArmAppHostRid)' != ''">
+        <PackageName>Microsoft.NETCore.App.Host.$(ArmAppHostRid)</PackageName>
+        <PackageVersion>$(NetCoreAppHostPackVersion)</PackageVersion>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
+        <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
+      </BundledLayoutPackage>
+
+      <BundledLayoutPackage Include="MicrosoftNetCoreAppHostPackNupkg_Arm64" Condition="'$(Arm64AppHostRid)' != ''">
+        <PackageName>Microsoft.NETCore.App.Host.$(Arm64AppHostRid)</PackageName>
+        <PackageVersion>$(NetCoreAppHostPackVersion)</PackageVersion>
+        <TargetFramework>$(TargetFramework)</TargetFramework>
+        <RelativeLayoutPath>packs/%(PackageName)/%(PackageVersion)</RelativeLayoutPath>
+      </BundledLayoutPackage>
+
      <BundledInstallerComponent Include="DownloadedRuntimeDepsInstallerFile"
                                 Condition="('$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true') And '$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' != '' And !$(Architecture.StartsWith('arm'))">
        <BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppRuntimewinx64PackageVersion)</BaseUrl>
@ -181,6 +201,27 @@
        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
      </BundledInstallerComponent>

+      <BundledInstallerComponent Include="DownloadedAlternateNetCoreAppHostPackInstallerFile"
+                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))">
+        <BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)</BaseUrl>
+        <DownloadFileName>$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)</DownloadFileName>
+        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
+      </BundledInstallerComponent>
+
+      <BundledInstallerComponent Include="DownloadedArmNetCoreAppHostPackInstallerFile"
+                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))">
+        <BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)</BaseUrl>
+        <DownloadFileName>$(DownloadedArmNetCoreAppHostPackInstallerFileName)</DownloadFileName>
+        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
+      </BundledInstallerComponent>
+
+      <BundledInstallerComponent Include="DownloadedArm64NetCoreAppHostPackInstallerFile"
+                                 Condition="'$(SkipBuildingInstallers)' != 'true' And '$(InstallerExtension)' == '.msi' And !$(Architecture.StartsWith('arm'))">
+        <BaseUrl>$(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)</BaseUrl>
+        <DownloadFileName>$(DownloadedArm64NetCoreAppHostPackInstallerFileName)</DownloadFileName>
+        <AccessToken>$(CoreSetupBlobAccessTokenParam)</AccessToken>
+      </BundledInstallerComponent>
+
      <BundledInstallerComponent Include="DownloadedWindowsDesktopTargetingPackInstallerFile"
                                 Condition="'$(InstallerExtension)' == '.msi' And '$(SkipBuildingInstallers)' != 'true' And !$(Architecture.StartsWith('arm'))">
        <BaseUrl>$(CoreSetupRootUrl)$(WindowsDesktopTargetingPackVersion)</BaseUrl>
--- a/src/redist/targets/GenerateMSIs.targets
+++ b/src/redist/targets/GenerateMSIs.targets
@ -39,6 +39,7 @@
    <PropertyGroup>
      <SdkMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile>
      <SdkDependencyKeyName>Dotnet_CLI</SdkDependencyKeyName>
+      <Templates31MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates31MSIInstallerFile>
      <Templates30MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates30MSIInstallerFile>
      <Templates22MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-22templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates22MSIInstallerFile>
      <Templates21MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates21MSIInstallerFile>
@ -59,7 +60,7 @@
          DependsOnTargets="GenerateLayout;SetupWixProperties;GetCoreSdkGitCommitInfo">
    <!-- Consumed By Publish -->
    <ItemGroup>
-      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates22MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile);$(SdkPlaceholderMSIInstallerFile)" />
+      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates31MSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates22MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile);$(SdkPlaceholderMSIInstallerFile)" />
    </ItemGroup>

    <GenerateMsiVersion CommitCount="$(GitCommitCount)"
@ -74,6 +75,11 @@
          PropertyName="SdkInstallerUpgradeCode" />
    </GenerateGuidFromName>

+    <GenerateGuidFromName Name="$(Templates31MSIInstallerFile)">
+      <Output TaskParameter="OutputGuid"
+          PropertyName="Templates31InstallerUpgradeCode" />
+    </GenerateGuidFromName>
+
    <GenerateGuidFromName Name="$(Templates30MSIInstallerFile)">
      <Output TaskParameter="OutputGuid"
          PropertyName="Templates30InstallerUpgradeCode" />
@ -192,6 +198,14 @@
    </PropertyGroup>

    <ItemGroup>
+      <TemplatesMsiComponent Include="NetCore31TemplatesMsi">
+        <LayoutPath>$(Templates31LayoutPath.TrimEnd('\'))</LayoutPath>
+        <MSIInstallerFile>$(Templates31MSIInstallerFile)</MSIInstallerFile>
+        <BrandName>$(BundledTemplates31BrandName)</BrandName>
+        <MsiVersion>$(BundledTemplates31MsiVersion)</MsiVersion>
+        <UpgradeCode>$(Templates31InstallerUpgradeCode)</UpgradeCode>
+        <DependencyKeyName>NetCore_Templates_3.1</DependencyKeyName>
+      </TemplatesMsiComponent>
      <TemplatesMsiComponent Include="NetCore30TemplatesMsi">
        <LayoutPath>$(Templates30LayoutPath.TrimEnd('\'))</LayoutPath>
        <MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
@ -239,9 +253,12 @@
                      '$(DownloadsFolder)$(DownloadedNetCoreAppTargetingPackInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedNetStandardTargetingPackInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedNetCoreAppHostPackInstallerFileName)' ^
+                      '$(DownloadsFolder)$(DownloadedAlternateNetCoreAppHostPackInstallerFileName)' ^
+                      '$(DownloadsFolder)$(DownloadedArmNetCoreAppHostPackInstallerFileName)' ^
+                      '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
                      '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
-                      '$(Templates30MSIInstallerFile)' ^
+                      '$(Templates31MSIInstallerFile)' ^
                      '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
                      '$(WixRoot)' ^
                      '$(SdkBrandName)' ^
@ -318,6 +335,11 @@
    </PropertyGroup>

    <ItemGroup>
+      <TemplatesNupkgComponent Include="NetCore31TemplatesNupkg">
+        <MSIInstallerFile>$(Templates31MSIInstallerFile)</MSIInstallerFile>
+        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates31MajorMinorVersion).$(FullNugetVersion).nupkg</NupkgFile>
+        <MajorMinorVersion>$(BundledTemplates31MajorMinorVersion)</MajorMinorVersion>
+      </TemplatesNupkgComponent>
      <TemplatesNupkgComponent Include="NetCore30TemplatesNupkg">
        <MSIInstallerFile>$(Templates30MSIInstallerFile)</MSIInstallerFile>
        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates30MajorMinorVersion).$(FullNugetVersion).nupkg</NupkgFile>
--- a/src/redist/targets/GetRuntimeInformation.targets
+++ b/src/redist/targets/GetRuntimeInformation.targets
@ -28,15 +28,13 @@
      <ProductMonikerRid Condition=" '$(Rid)' == 'ubuntu.16.04-x64' OR
                                   '$(Rid)' == 'fedora.24-x64' OR
                                   '$(Rid)' == 'rhel.6-x64' OR
-                                   '$(Rid)' == 'linux-musl-x64' OR
-                                   '$(Rid)' == 'opensuse.42.1-x64' ">$(Rid)</ProductMonikerRid>
+                                   '$(Rid)' == 'linux-musl-x64' ">$(Rid)</ProductMonikerRid>
      <ProductMonikerRid Condition=" '$(ProductMonikerRid)' == '' ">$(OSName)-$(Architecture)</ProductMonikerRid>

      <HostMonikerRid Condition=" '$(HostRid)' == 'ubuntu.16.04-x64' OR
                                '$(HostRid)' == 'fedora.24-x64' OR
                                '$(HostRid)' == 'rhel.6-x64' OR
-                                '$(HostRid)' == 'linux-musl-x64' OR
-                                '$(HostRid)' == 'opensuse.42.1-x64' ">$(HostRid)</HostMonikerRid>
+                                '$(HostRid)' == 'linux-musl-x64' ">$(HostRid)</HostMonikerRid>
      <HostMonikerRid Condition=" '$(HostMonikerRid)' == '' ">$(HostOSName)-$(Architecture)</HostMonikerRid>
      <HostMonikerRidForFileName>$(HostMonikerRid)</HostMonikerRidForFileName>
      <HostMonikerRidForFileName Condition=" '$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true' ">$(Architecture)</HostMonikerRidForFileName>
--- a/src/redist/targets/SetBuildDefaults.targets
+++ b/src/redist/targets/SetBuildDefaults.targets
@ -10,7 +10,6 @@
        OR $(Rid.StartsWith('freebsd'))
        OR $(Rid.StartsWith('linux-musl'))
        OR $(Rid.StartsWith('fedora.27'))
-        OR $(Rid.StartsWith('opensuse.42.3'))
        OR $(Rid.StartsWith('ubuntu.18.04')))">true</SkipBuildingInstallers>
      <SkipBuildingInstallers Condition=" '$(SkipBuildingInstallers)' == '' ">false</SkipBuildingInstallers>

@ -20,7 +19,6 @@
        AND '$(Rid)' != 'rhel.6-x64'
        AND '$(Rid)' != 'linux-musl-x64'
        AND '$(Rid)' != 'fedora.27-x64'
-        AND '$(Rid)' != 'opensuse.42.3-x64'
        AND '$(Rid)' != 'ubuntu.18.04-x64'">true</IncludeSharedFrameworksForBackwardsCompatibilityTests>-->
      <HighEntropyVA>true</HighEntropyVA>

--- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs
@ -133,6 +133,15 @@
      <MsiPackage SourceFile="$(var.NetCoreAppHostPackMsiSourcePath)">
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
      </MsiPackage>
+      <MsiPackage SourceFile="$(var.AlternateNetCoreAppHostPackMsiSourcePath)">
+        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
+      </MsiPackage>
+      <MsiPackage SourceFile="$(var.ArmNetCoreAppHostPackMsiSourcePath)">
+        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
+      </MsiPackage>
+      <MsiPackage SourceFile="$(var.Arm64NetCoreAppHostPackMsiSourcePath)">
+        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
+      </MsiPackage>
      <MsiPackage SourceFile="$(var.NetStandardTargetingPackMsiSourcePath)">
        <MsiProperty Name="DOTNETHOME" Value="[DOTNETHOME]" />
      </MsiPackage>
--- a/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
+++ b/src/redist/targets/packaging/windows/clisdk/generatebundle.ps1
@ -9,8 +9,11 @@ param(
    [Parameter(Mandatory=$true)][string]$SharedHostMSIFile,
    [Parameter(Mandatory=$true)][string]$WinFormsAndWpfMSIFile,
    [Parameter(Mandatory=$true)][string]$NetCoreAppTargetingPackMSIFile,
-    [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile,
    [Parameter(Mandatory=$true)][string]$NetStandardTargetingPackMSIFile,
+    [Parameter(Mandatory=$true)][string]$NetCoreAppHostPackMSIFile,
+    [Parameter(Mandatory=$true)][string]$AlternateNetCoreAppHostPackMSIFile,
+    [Parameter(Mandatory=$true)][string]$ArmNetCoreAppHostPackMSIFile,
+    [Parameter(Mandatory=$true)][string]$Arm64NetCoreAppHostPackMSIFile,
    [Parameter(Mandatory=$true)][string]$AspNetTargetingPackMSIFile,
    [Parameter(Mandatory=$true)][string]$WindowsDesktopTargetingPackMSIFile,
    [Parameter(Mandatory=$true)][string]$TemplatesMSIFile,
@ -53,6 +56,9 @@ function RunCandleForBundle
        -dWinFormsAndWpfMsiSourcePath="$WinFormsAndWpfMSIFile" `
        -dNetCoreAppTargetingPackMsiSourcePath="$NetCoreAppTargetingPackMSIFile" `
        -dNetCoreAppHostPackMsiSourcePath="$NetCoreAppHostPackMSIFile" `
+        -dAlternateNetCoreAppHostPackMsiSourcePath="$AlternateNetCoreAppHostPackMSIFile" `
+        -dArmNetCoreAppHostPackMsiSourcePath="$ArmNetCoreAppHostPackMSIFile" `
+        -dArm64NetCoreAppHostPackMsiSourcePath="$Arm64NetCoreAppHostPackMSIFile" `
        -dNetStandardTargetingPackMsiSourcePath="$NetStandardTargetingPackMSIFile" `
        -dAspNetTargetingPackMsiSourcePath="$AspNetTargetingPackMSIFile" `
        -dWindowsDesktopTargetingPackMsiSourcePath="$WindowsDesktopTargetingPackMSIFile" `
--- a/test/EndToEnd/ProjectBuildTests.cs
+++ b/test/EndToEnd/ProjectBuildTests.cs
@ -143,10 +143,12 @@ namespace EndToEnd.Tests
                .Execute(restoreArgs)
                .Should().Pass();

+            var dotnetRoot = Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest);
            new BuildCommand()
-                .WithWorkingDirectory(projectDirectory)
-                .Execute()
-                .Should().Pass();
+                 .WithEnvironmentVariable("PATH", dotnetRoot) // override PATH since razor rely on PATH to find dotnet
+                 .WithWorkingDirectory(projectDirectory)
+                 .Execute()
+                 .Should().Pass();
        }
    }
 }