Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update SDK to 7.0.100-alpha.1.21480.20 #37192

Merged
merged 16 commits into from
Oct 8, 2021
Merged

Update SDK to 7.0.100-alpha.1.21480.20 #37192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d703ca2
Update SDK to 7.0.100-alpha.1.21480.20
Tratcher Oct 1, 2021
41c5262
EnablePreviewFeatures in Transport.Quic
Tratcher Oct 1, 2021
37f9ce1
Remove RequiresPreviewFeatures
Tratcher Oct 1, 2021
3b7f281
Update RunTests.csproj
Tratcher Oct 1, 2021
e045062
Use DefaultNetCoreTargetFramework
Tratcher Oct 4, 2021
ab087e1
More DefaultNetCoreTargetFramework
Tratcher Oct 4, 2021
5982858
centos7
Tratcher Oct 4, 2021
9671ae3
Less DefaultNetCoreTargetFramework
Tratcher Oct 4, 2021
6b222cc
Update eng/docker/rhel.Dockerfile
TanayParikh Oct 6, 2021
a0d5593
Use CentOS 7 image
pranavkm Oct 7, 2021
273a50b
Update eng/docker/rhel.Dockerfile
pranavkm Oct 7, 2021
5cebe3e
Update eng/docker/rhel.Dockerfile
pranavkm Oct 7, 2021
979089b
Update eng/docker/rhel.Dockerfile
pranavkm Oct 7, 2021
c54faee
Run yum while root
pranavkm Oct 7, 2021
685b125
Cool surgery
pranavkm Oct 8, 2021
d826016
WIP
pranavkm Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion eng/docker/rhel.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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'
Comment on lines +13 to +19
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a lot and all the more reason to move to a Docker image with matching fpm and ruby installations soon

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yup. @janvorli helped with it. The problem was that fpm uses the ruby in the /usr/bin dir and we had to reset enough state to be have it use the new version. Again, I'd much rather we use this as a stop-gap and merge it (assuming it works this time), than hold out for a compatible image.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I completely agree on this being a stop gap. My comment amounted to "Ick, let's burn this w/ fire ASAP" 😃

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#37406 tracks undoing these changes.


RUN useradd -m ${USER} --uid ${USER_ID} -g root
RUN echo '${USER} ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers

Expand Down
2 changes: 1 addition & 1 deletion eng/helix/content/RunTests/RunTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<DefineConstants Condition=" '$(InstallPlaywright)' == 'true' ">$(DefineConstants);INSTALLPLAYWRIGHT</DefineConstants>
</PropertyGroup>

Expand Down
6 changes: 2 additions & 4 deletions eng/tools/RepoTasks/RepoTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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)" />
Expand Down
3 changes: 1 addition & 2 deletions eng/tools/RepoTasks/RepoTasks.tasks
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/Installers/Rpm/Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"
Expand Down
5 changes: 0 additions & 5 deletions src/Servers/Kestrel/Core/src/HttpProtocols.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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
}
}
1 change: 0 additions & 1 deletion src/Servers/Kestrel/Transport.Quic/src/QuicTransportOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions src/Servers/Kestrel/Transport.Quic/src/WebHostBuilderQuicExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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<QuicTransportOptions> configureOptions)
{
return hostBuilder.UseQuic().ConfigureServices(services =>
Expand Down