diff --git a/eng/docker/rhel.Dockerfile b/eng/docker/rhel.Dockerfile index d42ab7b38993..61d42539e8f4 100644 --- a/eng/docker/rhel.Dockerfile +++ b/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 diff --git a/eng/helix/content/RunTests/RunTests.csproj b/eng/helix/content/RunTests/RunTests.csproj index db5888e80343..486e4bb10748 100644 --- a/eng/helix/content/RunTests/RunTests.csproj +++ b/eng/helix/content/RunTests/RunTests.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 $(DefineConstants);INSTALLPLAYWRIGHT diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index 5e495d347b30..67e01850f836 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -1,7 +1,6 @@ - - net6.0 + $(DefaultNetCoreTargetFramework) $(TargetFrameworks);net472 $(DefineConstants);BUILD_MSI_TASKS false @@ -20,8 +19,7 @@ - - + diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index 7483f6e41aae..788558c3fa4c 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -1,7 +1,6 @@ - - <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net6.0 + <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework) <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472 <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll diff --git a/global.json b/global.json index e91da934a604..5808b048a8fb 100644 --- a/global.json +++ b/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", diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index cc13e2801dd9..964ab6c4c30f 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -77,7 +77,7 @@ - + @@ -16,9 +13,7 @@ public enum HttpProtocols 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 } } diff --git a/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs b/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs index 4078b31259ba..56be5eb480bf 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs @@ -12,7 +12,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Transport.Quic /// /// Options for Quic based connections. /// - [RequiresPreviewFeatures("Kestrel HTTP/3 support for .NET 6 is in preview.", Url = "https://aka.ms/aspnet/kestrel/http3reqs")] public class QuicTransportOptions { /// diff --git a/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs b/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs index 18065026f0c2..ff3f49aad273 100644 --- a/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs +++ b/src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs @@ -15,7 +15,6 @@ namespace Microsoft.AspNetCore.Hosting /// 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 @@ public static IWebHostBuilder UseQuic(this IWebHostBuilder hostBuilder) 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 configureOptions) { return hostBuilder.UseQuic().ConfigureServices(services =>