Merge branch 'release/3.1.1xx' into release/3.1.2xx

eng/Version.Details.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.4">
+    <Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="3.1.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
+      <Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.4-servicing.20221.3">
+    <Dependency Name="Microsoft.NETCore.App.Internal" Version="3.1.5-servicing.20270.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
+      <Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.4">
+    <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="3.1.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
+      <Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.4">
+    <Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="3.1.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
+      <Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.4">
+    <Dependency Name="Microsoft.NETCore.DotNetHostResolver" Version="3.1.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-core-setup</Uri>
-      <Sha>0c2e69caa609d5164e16df91d6d646eb9ed74640</Sha>
+      <Sha>65cd7897774a464b5991c1962f7a0d476bb63101</Sha>
     </Dependency>
     <!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
     <!-- No new netstandard.library planned for 3.1 timeframe at this time. -->
@@ -45,33 +45,33 @@
       <Uri>https://github.com/dotnet/aspnetcore</Uri>
       <Sha>e81033e094d4663ffd227bb4aed30b76b0631e6d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.4">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>35628a67800a3e269eb375989d2fffa9d67b8dbf</Sha>
+      <Sha>844a82e37cae48af2ab2ee4f39b41283e6bb4f0e</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.4-servicing.20222.19">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.5-servicing.20271.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>35628a67800a3e269eb375989d2fffa9d67b8dbf</Sha>
+      <Sha>844a82e37cae48af2ab2ee4f39b41283e6bb4f0e</Sha>
     </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="3.1.4-servicing.20222.19">
+    <Dependency Name="dotnet-dev-certs" Version="3.1.5-servicing.20271.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>35628a67800a3e269eb375989d2fffa9d67b8dbf</Sha>
+      <Sha>844a82e37cae48af2ab2ee4f39b41283e6bb4f0e</Sha>
     </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="3.1.4-servicing.20222.19">
+    <Dependency Name="dotnet-user-secrets" Version="3.1.5-servicing.20271.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>35628a67800a3e269eb375989d2fffa9d67b8dbf</Sha>
+      <Sha>844a82e37cae48af2ab2ee4f39b41283e6bb4f0e</Sha>
     </Dependency>
-    <Dependency Name="dotnet-watch" Version="3.1.4-servicing.20222.19">
+    <Dependency Name="dotnet-watch" Version="3.1.5-servicing.20271.5">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore</Uri>
-      <Sha>35628a67800a3e269eb375989d2fffa9d67b8dbf</Sha>
+      <Sha>844a82e37cae48af2ab2ee4f39b41283e6bb4f0e</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.3.1" Version="1.0.2-beta4.20176.1">
       <Uri>https://github.com/dotnet/test-templates</Uri>
       <Sha>2720fcade72d709a5d2fe80d0b80fbdac54213f6</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.1.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-templating</Uri>
-      <Sha>d503e3a0aeafd9cd580d44495aafc116b5f71588</Sha>
+      <Sha>fefccd4c1edee4f9e3cfe4377e00592fb5fe172b</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.1.202-servicing.20223.7">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-toolset</Uri>

eng/Versions.props

@@ -24,7 +24,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/templating -->
-    <MicrosoftDotNetCommonItemTemplatesPackageVersion>3.1.4</MicrosoftDotNetCommonItemTemplatesPackageVersion>
+    <MicrosoftDotNetCommonItemTemplatesPackageVersion>3.1.5</MicrosoftDotNetCommonItemTemplatesPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependency from https://github.com/dotnet/test-templates -->
@@ -36,12 +36,13 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.1.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
     <MicrosoftAspNetCoreAppRefPackageVersion>3.1.3</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.4-servicing.20222.19</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <dotnetdevcertsPackageVersion>3.1.4-servicing.20222.19</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>3.1.4-servicing.20222.19</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>3.1.4-servicing.20222.19</dotnetwatchPackageVersion>
+    <MicrosoftAspNetCoreAppRefInternalPackageVersion>3.1.3</MicrosoftAspNetCoreAppRefInternalPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.1.5-servicing.20271.5</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <dotnetdevcertsPackageVersion>3.1.5-servicing.20271.5</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>3.1.5-servicing.20271.5</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>3.1.5-servicing.20271.5</dotnetwatchPackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/cli -->
@@ -61,12 +62,12 @@
   </PropertyGroup>
   <PropertyGroup>
     <!-- Dependencies from https://github.com/dotnet/core-setup -->
-    <MicrosoftNETCoreAppInternalPackageVersion>3.1.4-servicing.20221.3</MicrosoftNETCoreAppInternalPackageVersion>
-    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.4</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.4</MicrosoftNETCoreAppHostwinx64PackageVersion>
+    <MicrosoftNETCoreAppInternalPackageVersion>3.1.5-servicing.20270.5</MicrosoftNETCoreAppInternalPackageVersion>
+    <MicrosoftNETCoreAppRuntimewinx64PackageVersion>3.1.5</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreAppHostwinx64PackageVersion>3.1.5</MicrosoftNETCoreAppHostwinx64PackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>3.1.0</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
-    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.4</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
+    <MicrosoftNETCoreDotNetHostResolverPackageVersion>3.1.5</MicrosoftNETCoreDotNetHostResolverPackageVersion>
+    <MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>3.1.5</MicrosoftWindowsDesktopAppRuntimewinx64PackageVersion>
     <MicrosoftWindowsDesktopAppRefPackageVersion>3.1.0</MicrosoftWindowsDesktopAppRefPackageVersion>
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
   </PropertyGroup>

src/redist/targets/GenerateBundledVersions.targets

@@ -92,19 +92,19 @@
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.0"
-                               LatestVersion="2.1.18" />
+                               LatestVersion="2.1.20" />
       <ImplicitPackageVariable Include="Microsoft.NETCore.App"
                                TargetFrameworkVersion="2.2"
                                DefaultVersion="2.2.0"
                                LatestVersion="2.2.8" />
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.18"/>
+                               LatestVersion="2.1.20"/>
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.All"
                                TargetFrameworkVersion="2.1"
                                DefaultVersion="2.1.1"
-                               LatestVersion="2.1.18"/>
+                               LatestVersion="2.1.20"/>
 
       <ImplicitPackageVariable Include="Microsoft.AspNetCore.App"
                                TargetFrameworkVersion="2.2"

src/redist/targets/GenerateLayout.targets

@@ -76,10 +76,11 @@
       <AspNetCoreSharedFxInstallerRid Condition="'$(InstallerExtension)' == '.deb' OR '$(InstallerExtension)' == '.rpm'">x64</AspNetCoreSharedFxInstallerRid>
 
       <DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' != '' AND '$(HostOSName)' != 'osx' ">aspnetcore-runtime-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
+      <DownloadedAspNetCoreSharedFxInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-$(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetCoreSharedFxInstallerFileName>
       <!-- Note: we use the "-internal" archives and installers that contain only the aspnetcore shared framework, and shouldn't overlap with Microsoft.NETCore.App. -->
       <DownloadedAspNetCoreSharedFxWixLibFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxWixLibFileName>
       <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
-      <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
+      <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefInternalPackageVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
       <DownloadedAspNetCoreV2ModuleInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcoremodule_$(Architecture)_en_v2_$(MicrosoftAspNetCoreAppRuntimePackageVersion)$(InstallerExtension)</DownloadedAspNetCoreV2ModuleInstallerFileName>
       <AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(MicrosoftAspNetCoreAppRefPackageVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
       <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(MicrosoftAspNetCoreAppRuntimePackageVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>

src/redist/targets/Versions.targets

@@ -2,8 +2,8 @@
   <PropertyGroup>
     <VersionMajor>3</VersionMajor>
     <VersionMinor>1</VersionMinor>
-    <VersionSDKMinor>2</VersionSDKMinor>
-    <VersionPatch>03</VersionPatch>
+    <VersionSDKMinor>1</VersionSDKMinor>
+    <VersionPatch>06</VersionPatch>
     <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">servicing</ReleaseSuffix>
     <!--
         When DropSuffix is set to 'true', this branch will produce stable outputs for 'Shipping' packages

src/redist/targets/packaging/windows/clisdk/dotnet.wxs

@@ -14,6 +14,7 @@
     <Feature Id="MainFeature" Title="Main Feature" Level="1">
       <ComponentGroupRef Id="InstallFiles" />
       <ComponentGroupRef Id="AuthoredRegistryKeys_x86node"/>
+      <ComponentGroupRef Id="DotnetToolSetup"/>
     </Feature>
     <Feature Id="Provider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" Level="1" InstallDefault="local" Title="RefCounting" TypicalDefault="install">
       <ComponentRef Id="$(var.DependencyKeyId)" />
@@ -59,4 +60,11 @@
       </Directory>
     </Directory>
   </Fragment>
+  <Fragment>
+    <ComponentGroup Id="DotnetToolSetup">
+      <Component Id="AppendDotnetToolShimPath" Directory="TARGETDIR" Guid="{241B7B8D-7817-41C1-807F-5F4010BF583A}">
+        <Environment Id="E_PATH" Name="PATH" Value="%USERPROFILE%\.dotnet\tools" Part="last" Action="set" System="no" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
 </Wix>