Merge remote-tracking branch 'upstream/release/5.0.1xx-preview1' into merge-from-5.0

eng/Versions.props

@@ -15,10 +15,6 @@
     <MajorMinorVersion>$(VersionMajor).$(VersionMinor)</MajorMinorVersion>
     <CliProductBandVersion>$(MajorMinorVersion).$(VersionSDKMinor)</CliProductBandVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- Dependencies from https://github.com/dotnet/toolset -->
-    <MicrosoftDotnetToolsetInternalPackageVersion>5.0.100-preview.1.20109.3</MicrosoftDotnetToolsetInternalPackageVersion>
-  </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/winforms -->
     <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>5.0.0-preview.2.20155.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
@@ -48,17 +44,15 @@
     <dotnetusersecretsPackageVersion>5.0.0-preview.2.20155.1</dotnetusersecretsPackageVersion>
     <dotnetwatchPackageVersion>5.0.0-preview.2.20155.1</dotnetwatchPackageVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.2.20152.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
-  </PropertyGroup>
   <PropertyGroup>
     <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
+    <!-- Dependencies from https://github.com/dotnet/sdk -->
     <MicrosoftNETSdkPackageVersion>5.0.100-preview.2.20152.2</MicrosoftNETSdkPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>5.0.100-preview.2.20152.2</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetToolsetInternalPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/corefx -->

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "5.0.100-preview.1.20119.7",
+    "dotnet": "5.0.100-preview.1.20154.9",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCoreAppRuntimePackageVersion)"

src/redist/targets/GenerateBundledVersions.targets

@@ -17,20 +17,20 @@
       <_NETCoreApp30RuntimePackVersion>3.0.1</_NETCoreApp30RuntimePackVersion>
       <_NETCoreApp30TargetingPackVersion>3.0.0</_NETCoreApp30TargetingPackVersion>
       
-      <_NETCoreApp31RuntimePackVersion>3.1.0</_NETCoreApp31RuntimePackVersion>
+      <_NETCoreApp31RuntimePackVersion>3.1.2</_NETCoreApp31RuntimePackVersion>
       <_NETCoreApp31TargetingPackVersion>3.1.0</_NETCoreApp31TargetingPackVersion>
       
       <_WindowsDesktop30RuntimePackVersion>3.0.1</_WindowsDesktop30RuntimePackVersion>
       <_WindowsDesktop30TargetingPackVersion>3.0.0</_WindowsDesktop30TargetingPackVersion>
       
-      <_WindowsDesktop31RuntimePackVersion>3.1.0</_WindowsDesktop31RuntimePackVersion>
+      <_WindowsDesktop31RuntimePackVersion>3.1.2</_WindowsDesktop31RuntimePackVersion>
       <_WindowsDesktop31TargetingPackVersion>3.1.0</_WindowsDesktop31TargetingPackVersion>
       
       <_AspNet30RuntimePackVersion>3.0.1</_AspNet30RuntimePackVersion>
       <_AspNet30TargetingPackVersion>3.0.1</_AspNet30TargetingPackVersion>
       
-      <_AspNet31RuntimePackVersion>3.1.0</_AspNet31RuntimePackVersion>
+      <_AspNet31RuntimePackVersion>3.1.2</_AspNet31RuntimePackVersion>
-      <_AspNet31TargetingPackVersion>3.1.0</_AspNet31TargetingPackVersion>
+      <_AspNet31TargetingPackVersion>3.1.2</_AspNet31TargetingPackVersion>
 
       <!-- Use only major and minor in target framework version -->
       <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>

src/redist/targets/GenerateLayout.targets

@@ -2,6 +2,7 @@
   <PropertyGroup>
     <RedistLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet\</RedistLayoutPath>
     <SdkInternalLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet-internal\</SdkInternalLayoutPath>
+    <Templates50LayoutPath>$(BaseOutputPath)$(Configuration)\templates-5.0\</Templates50LayoutPath>
     <Templates31LayoutPath>$(BaseOutputPath)$(Configuration)\templates-3.1\</Templates31LayoutPath>
     <Templates30LayoutPath>$(BaseOutputPath)$(Configuration)\templates-3.0\</Templates30LayoutPath>
     <Templates21LayoutPath>$(BaseOutputPath)$(Configuration)\templates-2.1\</Templates21LayoutPath>
@@ -30,7 +31,7 @@
 
       <CoreSetupBlobRootUrl Condition="'$(CoreSetupBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</CoreSetupBlobRootUrl>
       <DotnetExtensionsBlobRootUrl Condition="'$(DotnetExtensionsBlobRootUrl)' == ''">https://dotnetcli.blob.core.windows.net/dotnet/</DotnetExtensionsBlobRootUrl>
-      <DotnetToolsetBlobRootUrl Condition="'$(DotnetToolsetBlobRootUrl)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-toolset/</DotnetToolsetBlobRootUrl>
+      <DotnetToolsetBlobRootUrl Condition="'$(DotnetToolsetBlobRootUrl)' == ''">https://dotnetfeed.blob.core.windows.net/dotnet-core/</DotnetToolsetBlobRootUrl>
 
       <CoreSetupRid Condition="'$(CoreSetupRid)' == ''">$(HostRid)</CoreSetupRid>
       <CoreSetupRid Condition=" ('$(HostOSName)' == 'win' or '$(HostOSName)' == 'osx' or '$(HostOSName)' == 'freebsd') and '$(DotNetBuildFromSource)' != 'true' ">$(HostMonikerRid)</CoreSetupRid>
@@ -227,7 +228,7 @@
       </BundledInstallerComponent>
 
       <BundledLayoutComponent Include="ToolsetArchive">
-        <BaseUrl>$(DotnetToolsetBlobRootUrl)Toolset/$(MicrosoftDotnetToolsetInternalPackageVersion)</BaseUrl>
+        <BaseUrl>$(DotnetToolsetBlobRootUrl)Sdk/$(MicrosoftDotnetToolsetInternalPackageVersion)</BaseUrl>
         <DownloadFileName>dotnet-toolset-internal-$(MicrosoftDotnetToolsetInternalPackageVersion).zip</DownloadFileName>
         <RelativeLayoutPath>sdk/$(Version)</RelativeLayoutPath>
       </BundledLayoutComponent>

src/redist/targets/GenerateMSIs.targets

@@ -39,6 +39,7 @@
     <PropertyGroup>
       <SdkMSIInstallerFile>$(ArtifactsShippingPackagesDir)$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkMSIInstallerFile>
       <SdkDependencyKeyName>Dotnet_CLI</SdkDependencyKeyName>
+      <Templates50MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-50templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates50MSIInstallerFile>
       <Templates31MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-31templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates31MSIInstallerFile>
       <Templates30MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-30templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates30MSIInstallerFile>
       <Templates21MSIInstallerFile>$(ArtifactsShippingPackagesDir)dotnet-21templates-$(FullNugetVersion)-$(ProductMonikerRid)$(InstallerExtension)</Templates21MSIInstallerFile>
@@ -82,7 +83,7 @@
           DependsOnTargets="GenerateLayout;SetupWixProperties">
     <!-- Consumed By Publish -->
     <ItemGroup>
-      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates31MSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile);$(SdkPlaceholderMSIInstallerFile)" />
+      <GeneratedInstallers Include="$(SdkMSIInstallerFile);$(Templates50MSIInstallerFile);$(Templates31MSIInstallerFile);$(Templates30MSIInstallerFile);$(Templates21MSIInstallerFile);$(CombinedFrameworkSdkHostMSIInstallerFile);$(SdkPlaceholderMSIInstallerFile)" />
     </ItemGroup>
 
     <GenerateMsiVersion VersionRevision="$(CombinedBuildNumberAndRevision)"
@@ -97,6 +98,11 @@
           PropertyName="SdkInstallerUpgradeCode" />
     </GenerateGuidFromName>
 
+    <GenerateGuidFromName Name="$(Templates50MSIInstallerFile)">
+      <Output TaskParameter="OutputGuid"
+          PropertyName="Templates50InstallerUpgradeCode" />
+    </GenerateGuidFromName>
+
     <GenerateGuidFromName Name="$(Templates31MSIInstallerFile)">
       <Output TaskParameter="OutputGuid"
           PropertyName="Templates31InstallerUpgradeCode" />
@@ -215,6 +221,14 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <TemplatesMsiComponent Include="NetCore50TemplatesMsi">
+        <LayoutPath>$(Templates50LayoutPath.TrimEnd('\'))</LayoutPath>
+        <MSIInstallerFile>$(Templates50MSIInstallerFile)</MSIInstallerFile>
+        <BrandName>$(BundledTemplates50BrandName)</BrandName>
+        <MsiVersion>$(BundledTemplates50MsiVersion)</MsiVersion>
+        <UpgradeCode>$(Templates50InstallerUpgradeCode)</UpgradeCode>
+        <DependencyKeyName>NetCore_Templates_5.0</DependencyKeyName>
+      </TemplatesMsiComponent>
       <TemplatesMsiComponent Include="NetCore31TemplatesMsi">
         <LayoutPath>$(Templates31LayoutPath.TrimEnd('\'))</LayoutPath>
         <MSIInstallerFile>$(Templates31MSIInstallerFile)</MSIInstallerFile>
@@ -267,7 +281,7 @@
                       '$(DownloadsFolder)$(DownloadedArm64NetCoreAppHostPackInstallerFileName)' ^
                       '$(DownloadsFolder)$(DownloadedAspNetTargetingPackInstallerFileName)' ^
                       '$(DownloadsFolder)$(DownloadedWindowsDesktopTargetingPackInstallerFileName)' ^
-                      '$(Templates31MSIInstallerFile)' ^
+                      '$(Templates50MSIInstallerFile)' ^
                       '$(CombinedFrameworkSdkHostMSIInstallerFile)' ^
                       '$(WixRoot)' ^
                       '$(SdkBrandName)' ^
@@ -344,6 +358,11 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <TemplatesNupkgComponent Include="NetCore50TemplatesNupkg">
+        <MSIInstallerFile>$(Templates50MSIInstallerFile)</MSIInstallerFile>
+        <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates50MajorMinorVersion).$(FullNugetVersion).nupkg</NupkgFile>
+        <MajorMinorVersion>$(BundledTemplates50MajorMinorVersion)</MajorMinorVersion>
+      </TemplatesNupkgComponent>
       <TemplatesNupkgComponent Include="NetCore31TemplatesNupkg">
         <MSIInstallerFile>$(Templates31MSIInstallerFile)</MSIInstallerFile>
         <NupkgFile>$(ArtifactsNonShippingPackagesDir)VS.Redist.Common.NetCore.Templates.$(BundledTemplates31MajorMinorVersion).$(FullNugetVersion).nupkg</NupkgFile>

src/redist/targets/Signing.targets

@@ -175,10 +175,11 @@
       DependsOnTargets="SetSignProps">
 
     <ItemGroup>
+      <TemplatesMsiFilesToSign Include="$(Templates50MSIInstallerFile)" />
       <TemplatesMsiFilesToSign Include="$(Templates31MSIInstallerFile)" />
       <TemplatesMsiFilesToSign Include="$(Templates30MSIInstallerFile)" />
       <TemplatesMsiFilesToSign Include="$(Templates21MSIInstallerFile)" />
-      
+
       <TemplatesMsiFileSignInfo Include="@(TemplatesMsiFilesToSign->'%(Filename)%(Extension)')">
         <CertificateName>$(InternalCertificateId)</CertificateName>
       </TemplatesMsiFileSignInfo>