Merge pull request #4857 from dotnet/darc-release/3.1.1xx-6b1fb78b-7c28-494d-8c13-7b8154f0306b

[release/3.1.1xx] Update dependencies from aspnet/AspNetCore
2019-09-24 10:18:26 -07:00 · 2019-09-24 10:18:26 -07:00 · 9b60152978
commit 9b60152978
parent abd1e70d5f 8683689d7b
8 changed files with 94 additions and 35 deletions
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -14,29 +14,29 @@
      <Uri>https://github.com/dotnet/core-setup</Uri>
      <Sha>72b39b0473993b932a08c8fc24a8988d45b416a5</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc2.19462.2">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.1.0-preview1.19473.5">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>db1aca12a532e4b37a91d8037b50a22d1ef21239</Sha>
+      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-rc2.19462.2">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.0-preview1.19473.5">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>db1aca12a532e4b37a91d8037b50a22d1ef21239</Sha>
+      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-rc2.19462.2">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.1.0-preview1.19473.5">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>db1aca12a532e4b37a91d8037b50a22d1ef21239</Sha>
+      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="3.0.0-rc2.19462.2">
+    <Dependency Name="dotnet-dev-certs" Version="3.1.0-preview1.19473.5">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>db1aca12a532e4b37a91d8037b50a22d1ef21239</Sha>
+      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="3.0.0-rc2.19462.2">
+    <Dependency Name="dotnet-user-secrets" Version="3.1.0-preview1.19473.5">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>db1aca12a532e4b37a91d8037b50a22d1ef21239</Sha>
+      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
    </Dependency>
-    <Dependency Name="dotnet-watch" Version="3.0.0-rc2.19462.2">
+    <Dependency Name="dotnet-watch" Version="3.1.0-preview1.19473.5">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>db1aca12a532e4b37a91d8037b50a22d1ef21239</Sha>
+      <Sha>26f160d1649350083fad67f45741ceb1c798b110</Sha>
    </Dependency>
    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
      <Uri>https://github.com/dotnet/templating</Uri>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -24,12 +24,12 @@
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-rc2.19462.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-rc2.19462.2</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-rc2.19462.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <dotnetdevcertsPackageVersion>3.0.0-rc2.19462.2</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>3.0.0-rc2.19462.2</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>3.0.0-rc2.19462.2</dotnetwatchPackageVersion>
+    <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>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/cli -->
@ -60,14 +60,22 @@
    <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
+    <!-- 3.1 Template versions -->
+    <MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates31PackageVersion>
+    <MicrosoftDotNetWpfProjectTemplates31PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates31PackageVersion>
+    <NUnit3Templates31PackageVersion>1.6.3</NUnit3Templates31PackageVersion>
+    <MicrosoftDotNetCommonItemTemplates31PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates31PackageVersion>
+    <MicrosoftDotNetCommonProjectTemplates31PackageVersion>$(MicrosoftDotNetCommonItemTemplates31PackageVersion)</MicrosoftDotNetCommonProjectTemplates31PackageVersion>
+    <MicrosoftDotNetTestProjectTemplates31PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates31PackageVersion>
+    <AspNetCorePackageVersionFor31Templates>$(AspNetCoreVersion)</AspNetCorePackageVersionFor31Templates>
    <!-- 3.0 Template versions -->
-    <MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>$(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion)</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
-    <MicrosoftDotNetWpfProjectTemplates30PackageVersion>$(MicrosoftDotNetWpfProjectTemplatesPackageVersion)</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>4.8.0-rc2.19462.10</MicrosoftDotnetWinFormsProjectTemplates30PackageVersion>
+    <MicrosoftDotNetWpfProjectTemplates30PackageVersion>3.0.0-rc2.19459.11</MicrosoftDotNetWpfProjectTemplates30PackageVersion>
    <NUnit3Templates30PackageVersion>1.6.3</NUnit3Templates30PackageVersion>
    <MicrosoftDotNetCommonItemTemplates30PackageVersion>2.0.0-preview8.19373.1</MicrosoftDotNetCommonItemTemplates30PackageVersion>
    <MicrosoftDotNetCommonProjectTemplates30PackageVersion>$(MicrosoftDotNetCommonItemTemplates30PackageVersion)</MicrosoftDotNetCommonProjectTemplates30PackageVersion>
    <MicrosoftDotNetTestProjectTemplates30PackageVersion>1.0.2-beta4.19354.2</MicrosoftDotNetTestProjectTemplates30PackageVersion>
-    <AspNetCorePackageVersionFor30Templates>$(AspNetCoreVersion)</AspNetCorePackageVersionFor30Templates>
+    <AspNetCorePackageVersionFor30Templates>3.0.0-rc2.19461.12</AspNetCorePackageVersionFor30Templates>
    <!-- 2.2 Template versions -->
    <NUnit3Templates22PackageVersion>1.6.0</NUnit3Templates22PackageVersion>
    <MicrosoftDotNetCommonItemTemplates22PackageVersion>1.0.2-beta4</MicrosoftDotNetCommonItemTemplates22PackageVersion>
--- a/src/redist/targets/BundledTemplates.targets
+++ b/src/redist/targets/BundledTemplates.targets
@ -2,6 +2,16 @@
  <Target Name="CalculateTemplatesVersions"
          DependsOnTargets="SetSdkVersionInfo">
    <PropertyGroup>
+      <AspNetCore31VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor31Templates.IndexOf('-'))</AspNetCore31VersionPreReleaseSeparator>
+      <AspNetCore31VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor31Templates)</AspNetCore31VersionMajorMinorPatchVersion>
+      <AspNetCore31VersionMajorMinorPatchVersion Condition=" '$(AspNetCore1VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor31Templates.Substring(0, $(AspNetCore31VersionPreReleaseSeparator)))</AspNetCore31VersionMajorMinorPatchVersion>
+      <BundledTemplates31MSIVersion>$(AspNetCore31VersionMajorMinorPatchVersion).$(GitCommitCount)</BundledTemplates31MSIVersion>
+      <BundledTemplates31InstallPath>$(AspNetCore31VersionMajorMinorPatchVersion)</BundledTemplates31InstallPath>
+      <BundledTemplates31InstallPath Condition=" '$(AspNetCore31VersionPreReleaseSeparator)' != -1 ">$(BundledTemplates31InstallPath)-$(VersionSuffix)</BundledTemplates31InstallPath>
+      <Templates31VersionPatchSeparatorIndex>$([MSBuild]::Add($(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.')), 1))</Templates31VersionPatchSeparatorIndex>
+      <Templates31VersionPatchSeparatorIndex>$(AspNetCore31VersionMajorMinorPatchVersion.IndexOf('.', $(Templates31VersionPatchSeparatorIndex)))</Templates31VersionPatchSeparatorIndex>
+      <BundledTemplates31MajorMinorVersion>$(AspNetCore31VersionMajorMinorPatchVersion.Substring(0, $(Templates31VersionPatchSeparatorIndex)))</BundledTemplates31MajorMinorVersion>
+
      <AspNetCore30VersionPreReleaseSeparator>$(AspNetCorePackageVersionFor30Templates.IndexOf('-'))</AspNetCore30VersionPreReleaseSeparator>
      <AspNetCore30VersionMajorMinorPatchVersion>$(AspNetCorePackageVersionFor30Templates)</AspNetCore30VersionMajorMinorPatchVersion>
      <AspNetCore30VersionMajorMinorPatchVersion Condition=" '$(AspNetCore30VersionPreReleaseSeparator)' != -1 ">$(AspNetCorePackageVersionFor30Templates.Substring(0, $(AspNetCore30VersionPreReleaseSeparator)))</AspNetCore30VersionMajorMinorPatchVersion>
@ -34,6 +44,17 @@
    </PropertyGroup>
  </Target>

+  <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.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWpfProjectTemplates31PackageVersion)" />
+    <Bundled31Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftDotnetWinFormsProjectTemplates31PackageVersion)" />
+    <Bundled31Templates Include="Microsoft.DotNet.Web.ItemTemplates" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
+    <Bundled31Templates Include="Microsoft.DotNet.Web.ProjectTemplates.3.1" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
+    <Bundled31Templates Include="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" PackageVersion="$(AspNetCorePackageVersionFor31Templates)" />
+    <Bundled31Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates31PackageVersion)" />
+  </ItemGroup>
  <ItemGroup>
    <Bundled30Templates Include="Microsoft.DotNet.Common.ItemTemplates" PackageVersion="$(MicrosoftDotNetCommonItemTemplates30PackageVersion)" />
    <Bundled30Templates Include="Microsoft.DotNet.Common.ProjectTemplates.3.0" PackageVersion="$(MicrosoftDotNetCommonProjectTemplates30PackageVersion)" />
@ -64,6 +85,13 @@
    <Bundled21Templates Include="NUnit3.DotNetNew.Template" PackageVersion="$(NUnit3Templates21PackageVersion)" />
  </ItemGroup>

+  <ItemGroup>
+    <Bundled31Templates Update="@(Bundled31Templates)">
+      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
+      <RestoredNupkgPath>$(NuGetPackageRoot)$([MSBuild]::ValueOrDefault('%(NupkgPathRelativeToPackageRoot)', '').ToLower())</RestoredNupkgPath>
+      <Version>[%(PackageVersion)]</Version>
+    </Bundled31Templates>
+  </ItemGroup>
  <ItemGroup>
    <Bundled30Templates Update="@(Bundled30Templates)">
      <NupkgPathRelativeToPackageRoot>%(Identity)/%(PackageVersion)/%(Identity).%(PackageVersion).nupkg</NupkgPathRelativeToPackageRoot>
@ -87,16 +115,16 @@
  </ItemGroup>

  <ItemGroup>
-    <PackageDownload Include="@(Bundled22Templates);@(Bundled21Templates)" />
+    <PackageDownload Include="@(Bundled30Templates);@(Bundled22Templates);@(Bundled21Templates)" />
  </ItemGroup>

  <!-- Restore bundled templates via PackageReference -->
  <ItemGroup>
-    <PackageReference Include="@(Bundled30Templates)" />
+    <PackageReference Include="@(Bundled31Templates)" />
  </ItemGroup>

  <Target Name="LayoutTemplates"
-        DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
+        DependsOnTargets="LayoutTemplatesForSDK;LayoutTemplatesFor31MSI;LayoutTemplatesFor30MSI;LayoutTemplatesFor22MSI;LayoutTemplatesFor21MSI" />
    
  <Target Name="LayoutTemplatesForSDK"
          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions">
@ -104,8 +132,15 @@
      <BundledTemplate Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
      <BundledTemplate Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
    </ItemGroup>
-    <Copy SourceFiles="%(Bundled30Templates.RestoredNupkgPath)"
-          DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates30InstallPath)"/>
+    <Copy SourceFiles="%(Bundled31Templates.RestoredNupkgPath)"
+          DestinationFolder="$(RedistLayoutPath)templates/$(BundledTemplates31InstallPath)"/>
+  </Target>
+
+  <Target Name="LayoutTemplatesFor31MSI"
+          DependsOnTargets="SetupBundledComponents;CalculateTemplatesVersions"
+          Condition="$(ProductMonikerRid.StartsWith('win')) And !$(Architecture.StartsWith('arm'))">
+    <Copy SourceFiles="%(Bundled31Templates.RestoredNupkgPath)"
+          DestinationFolder="$(Templates31LayoutPath)templates/$(BundledTemplates31InstallPath)"/>
  </Target>

  <Target Name="LayoutTemplatesFor30MSI"
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@ -35,6 +35,9 @@
      <_MicrosoftWindowsDesktop30PackageVersion>$(_NETCoreApp30PackageVersion)</_MicrosoftWindowsDesktop30PackageVersion>
      <_MicrosoftWindowsDesktop30TargetingPackVersion>$(_NETCoreApp30TargetingPackVersion)</_MicrosoftWindowsDesktop30TargetingPackVersion>

+      <_MicrosoftAspNetCoreApp30PackageVersion>3.0.0-rc2.19461.12</_MicrosoftAspNetCoreApp30PackageVersion>
+      <_AspNet30TargetingPackVersion>$(_MicrosoftAspNetCoreApp30PackageVersion)</_AspNet30TargetingPackVersion>
+
      <!-- Use only major and minor in target framework version -->
      <_NETCoreAppTargetFrameworkVersion>$(_NETCoreAppPackageVersion.Split('.')[0]).$(_NETCoreAppPackageVersion.Split('.')[1])</_NETCoreAppTargetFrameworkVersion>
      <_NETStandardTargetFrameworkVersion>$(_NETStandardLibraryPackageVersion.Split('.')[0]).$(_NETStandardLibraryPackageVersion.Split('.')[1])</_NETStandardTargetFrameworkVersion>
@ -238,6 +241,17 @@ Copyright (c) .NET Foundation. All rights reserved.
                              Profile="WindowsForms"
                              />

+        <KnownFrameworkReference Include="Microsoft.AspNetCore.App"
+                              TargetFramework="netcoreapp3.1"
+                              RuntimeFrameworkName="Microsoft.AspNetCore.App"
+                              DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)"
+                              LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)"
+                              TargetingPackName="Microsoft.AspNetCore.App.Ref"
+                              TargetingPackVersion="$(AspNetTargetingPackVersion)"
+                              RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
+                              RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
+                              />
+
    <!-- .NET Core 3.0 -->

    <KnownFrameworkReference Include="Microsoft.NETCore.App"
@ -300,10 +314,10 @@ Copyright (c) .NET Foundation. All rights reserved.
    <KnownFrameworkReference Include="Microsoft.AspNetCore.App"
                              TargetFramework="netcoreapp3.0"
                              RuntimeFrameworkName="Microsoft.AspNetCore.App"
-                              DefaultRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)"
-                              LatestRuntimeFrameworkVersion="$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)"
+                              DefaultRuntimeFrameworkVersion="$(_MicrosoftAspNetCoreApp30PackageVersion)"
+                              LatestRuntimeFrameworkVersion="$(_MicrosoftAspNetCoreApp30PackageVersion)"
                              TargetingPackName="Microsoft.AspNetCore.App.Ref"
-                              TargetingPackVersion="$(AspNetTargetingPackVersion)"
+                              TargetingPackVersion="$(_AspNet30TargetingPackVersion)"
                              RuntimePackNamePatterns="Microsoft.AspNetCore.App.Runtime.**RID**"
                              RuntimePackRuntimeIdentifiers="@(AspNetCoreRuntimePackRids, '%3B')"
                              />
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@ -2,6 +2,7 @@
  <PropertyGroup>
    <RedistLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet\</RedistLayoutPath>
    <SdkInternalLayoutPath>$(BaseOutputPath)$(Configuration)\dotnet-internal\</SdkInternalLayoutPath>
+    <Templates31LayoutPath>$(BaseOutputPath)$(Configuration)\templates-3.1\</Templates31LayoutPath>
    <Templates30LayoutPath>$(BaseOutputPath)$(Configuration)\templates-3.0\</Templates30LayoutPath>
    <Templates22LayoutPath>$(BaseOutputPath)$(Configuration)\templates-2.2\</Templates22LayoutPath>
    <Templates21LayoutPath>$(BaseOutputPath)$(Configuration)\templates-2.1\</Templates21LayoutPath>
@ -59,7 +60,7 @@
      <DownloadedAspNetCoreSharedFxWixLibFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib</DownloadedAspNetCoreSharedFxWixLibFileName>
      <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' != '' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
      <DownloadedAspNetTargetingPackInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcore-targeting-pack-$(AspNetTargetingPackVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)</DownloadedAspNetTargetingPackInstallerFileName>
-      <DownloadedAspNetCoreV2ModuleInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcoremodule_$(Architecture)_en_v2$(InstallerExtension)</DownloadedAspNetCoreV2ModuleInstallerFileName>
+      <DownloadedAspNetCoreV2ModuleInstallerFileName Condition=" '$(InstallerExtension)' == '.msi' ">aspnetcoremodule_$(Architecture)_en_v2_$(AspNetCoreVersion)$(InstallerExtension)</DownloadedAspNetCoreV2ModuleInstallerFileName>
      <AspNetTargetingPackArchiveFileName>aspnetcore-targeting-pack-$(AspNetCoreVersion)$(ArchiveExtension)</AspNetTargetingPackArchiveFileName>
      <AspNetCoreSharedFxArchiveFileName>aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)</AspNetCoreSharedFxArchiveFileName>

--- a/test/EndToEnd/GivenFrameworkDependentApps.cs
+++ b/test/EndToEnd/GivenFrameworkDependentApps.cs
@ -19,7 +19,7 @@ namespace EndToEnd
        [ClassData(typeof(SupportedNetCoreAppVersions))]
        public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion)
        {
-            if (minorVersion == "3.0")
+            if (minorVersion == "3.0" || minorVersion == "3.1")
            {
                //  https://github.com/dotnet/core-sdk/issues/621
                return;
@ -31,7 +31,7 @@ namespace EndToEnd
        [ClassData(typeof(SupportedAspNetCoreVersions))]
        public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion)
        {
-            if (minorVersion == "3.0")
+            if (minorVersion == "3.0" || minorVersion == "3.1")
            {
                //  https://github.com/dotnet/core-sdk/issues/621
                return;
--- a/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
+++ b/test/EndToEnd/GivenSelfContainedAppsRollForward.cs
@ -23,7 +23,7 @@ namespace EndToEnd
        [ClassData(typeof(SupportedNetCoreAppVersions))]
        public void ItRollsForwardToTheLatestNetCoreVersion(string minorVersion)
        {
-            if (minorVersion == "3.0")
+            if (minorVersion == "3.0" || minorVersion == "3.1")
            {
                //  https://github.com/dotnet/core-sdk/issues/621
                return;
@ -35,7 +35,7 @@ namespace EndToEnd
        [ClassData(typeof(SupportedAspNetCoreVersions))]
        public void ItRollsForwardToTheLatestAspNetCoreAppVersion(string minorVersion)
        {
-            if (minorVersion == "3.0")
+            if (minorVersion == "3.0" || minorVersion == "3.1")
            {
                //  https://github.com/dotnet/core-sdk/issues/621
                return;
--- a/test/EndToEnd/SupportedNetCoreAppVersions.cs
+++ b/test/EndToEnd/SupportedNetCoreAppVersions.cs
@ -21,7 +21,8 @@ namespace EndToEnd
                    "2.0",
                    "2.1",
                    "2.2",
-                    "3.0"
+                    "3.0",
+                    "3.1",
                };
            }
        }