Update SDK to 7.0.100-alpha.1.21480.20 (#37192)

* Update SDK to 7.0.100-alpha.1.21480.20


Co-authored-by: Tanay Parikh <[email protected]>
Co-authored-by: Pranav K <[email protected]>

eng/docker/rhel.Dockerfile

@@ -1,5 +1,5 @@
 # Dockerfile that creates a container suitable to build dotnet-cli
-FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359
+FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-rpmpkg-20210714125435-9b5bbc2
 
 # Setup User to match Host User, and give superuser permissions
 ARG USER
@@ -9,6 +9,15 @@ ARG WORKDIR
 
 WORKDIR ${WORKDIR}
 
+# Workaround per https://github.com/dotnet/aspnetcore/pull/37192#issuecomment-936589233
+RUN gem uninstall fpm
+RUN yum remove -y rubygems
+RUN yum remove -y ruby-devel
+RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25
+RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25-ruby-devel
+RUN yum --enablerepo=centos-sclo-rh -y install rh-ruby25-rubygems
+RUN scl enable rh-ruby25 'gem install --no-document fpm'
+
 RUN useradd -m ${USER} --uid ${USER_ID} -g root
 RUN echo '${USER} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
 

eng/helix/content/RunTests/RunTests.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <DefineConstants Condition=" '$(InstallPlaywright)' == 'true' ">$(DefineConstants);INSTALLPLAYWRIGHT</DefineConstants>
   </PropertyGroup>
 

eng/tools/RepoTasks/RepoTasks.csproj

@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <!-- Keep this project at net6.0 until there is an SDK with net7.0 runtimes -->
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks>
     <DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(DefineConstants);BUILD_MSI_TASKS</DefineConstants>
     <Optimize>false</Optimize>
@@ -20,8 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="$(MicrosoftExtensionsDependencyModelVersion)" />
   </ItemGroup>
 
-  <!-- Change this back to '$(DefaultNetCoreTargetFramework)' once we have an SDK with net7.0 runtimes -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
     <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" />
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTaskCoreVersion)" />
     <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" />

eng/tools/RepoTasks/RepoTasks.tasks

@@ -1,7 +1,6 @@
 <Project>
   <PropertyGroup>
-    <!-- Keep this project at net6.0 until there is an SDK with net7.0 runtimes -->
-    <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net6.0</_RepoTaskAssemblyFolder>
+    <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework)</_RepoTaskAssemblyFolder>
     <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder>
     <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly>
   </PropertyGroup>

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "7.0.100-alpha.1.21474.3"
+    "version": "7.0.100-alpha.1.21480.20"
   },
   "tools": {
-    "dotnet": "7.0.100-alpha.1.21474.3",
+    "dotnet": "7.0.100-alpha.1.21480.20",
     "runtimes": {
       "dotnet/x64": [
         "2.1.27",

src/Installers/Rpm/Directory.Build.targets

@@ -77,7 +77,7 @@
       <FpmArgs Include="&quot;$(PackageContentRoot)=$(RpmPackageInstallRoot)&quot;" />
     </ItemGroup>
 
-    <Exec Command="fpm @(FpmArgs,' ')" />
+    <Exec Command="scl enable rh-ruby25 'fpm @(FpmArgs,' ')'" />
 
     <Copy SourceFiles="$(TargetPath)"
           DestinationFiles="$(CblMarinerTargetPath)"

src/Servers/Kestrel/Core/src/HttpProtocols.cs

@@ -1,9 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System;
-using System.Runtime.Versioning;
-
 namespace Microsoft.AspNetCore.Server.Kestrel.Core
 {
     /// <summary>
@@ -16,9 +13,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
         Http1 = 0x1,
         Http2 = 0x2,
         Http1AndHttp2 = Http1 | Http2,
-        [RequiresPreviewFeatures("Kestrel HTTP/3 support for .NET 6 is in preview.", Url = "https://aka.ms/aspnet/kestrel/http3reqs")]
         Http3 = 0x4,
-        [RequiresPreviewFeatures("Kestrel HTTP/3 support for .NET 6 is in preview.", Url = "https://aka.ms/aspnet/kestrel/http3reqs")]
         Http1AndHttp2AndHttp3 = Http1 | Http2 | Http3
     }
 }

src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs

@@ -12,7 +12,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic
     /// <summary>
     /// Options for Quic based connections.
     /// </summary>
-    [RequiresPreviewFeatures("Kestrel HTTP/3 support for .NET 6 is in preview.", Url = "https://aka.ms/aspnet/kestrel/http3reqs")]
     public class QuicTransportOptions
     {
         /// <summary>

src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs

@@ -15,7 +15,6 @@ namespace Microsoft.AspNetCore.Hosting
     /// </summary>
     public static class WebHostBuilderQuicExtensions
     {
-        [RequiresPreviewFeatures("Kestrel HTTP/3 support for .NET 6 is in preview.", Url = "https://aka.ms/aspnet/kestrel/http3reqs")]
         public static IWebHostBuilder UseQuic(this IWebHostBuilder hostBuilder)
         {
             if (QuicImplementationProviders.Default.IsSupported)
@@ -29,7 +28,6 @@ namespace Microsoft.AspNetCore.Hosting
             return hostBuilder;
         }
 
-        [RequiresPreviewFeatures("Kestrel HTTP/3 support for .NET 6 is in preview.", Url = "https://aka.ms/aspnet/kestrel/http3reqs")]
         public static IWebHostBuilder UseQuic(this IWebHostBuilder hostBuilder, Action<QuicTransportOptions> configureOptions)
         {
             return hostBuilder.UseQuic().ConfigureServices(services =>