Retire .NET 5 #69911

ArminShoeibi · 2022-05-27T18:58:51Z

Hello there folks.
This pull request fixes: #69028

ghost · 2022-05-27T18:58:59Z

Tagging subscribers to this area: @JulieLeeMSFT
See info in area-owners.md if you want to be subscribed.

Issue Details

Hello there folks.
This pull request fixes: #69028

Author:	ArminShoeibi
Assignees:	-
Labels:	`area-CodeGen-coreclr`
Milestone:	-

dnfadmin · 2022-05-27T18:59:05Z

All CLA requirements met.

docs/design/coreclr/jit/viewing-jit-dumps.md

danmoseley · 2022-05-28T03:23:13Z

@ViktorHofer

ViktorHofer

Changes to files that reside under eng/common/ shouldn't be made in this repo but instead in https://github.com/dotnet/arcade which then mirrors then changes back to dotnet/runtime and other repos.

docs/design/coreclr/jit/viewing-jit-dumps.md

am11 · 2022-07-01T13:51:56Z

@ArminShoeibi, I have made a patch for the instances which I think are enough to accomplish the purpose of this PR: am11@b8c9946 (on top of your branch main...am11:feature/infrasturcture/retire-net5). Feel free to cherry-pick it and continue with testing.

ArminShoeibi · 2022-07-01T18:22:36Z

@ArminShoeibi, I have made a patch for the instances which I think are enough to accomplish the purpose of this PR: am11@b8c9946 (on top of your branch main...am11:feature/infrasturcture/retire-net5). Feel free to cherry-pick it and continue with testing.

Okay, Thank you.

ArminShoeibi · 2022-07-01T19:00:15Z

@ArminShoeibi, I have made a patch for the instances which I think are enough to accomplish the purpose of this PR: am11@b8c9946 (on top of your branch main...am11:feature/infrasturcture/retire-net5). Feel free to cherry-pick it and continue with testing.

Thank you for help, I will complete this ASAP.
I had some problems with generating this test again but I gave up.
https://github.com/dotnet/runtime/blob/main/src/libraries/Common/tests/StaticTestGenerator/README.md

ArminShoeibi · 2022-07-01T20:23:23Z

src/workloads/workloads.csproj

  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />

  <PropertyGroup>
    <MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">net7.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
-    <MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net5.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>
+    <MicrosoftDotNetBuildTasksInstallersTaskTargetFramework Condition="'$(DotNetBuildFromSource)' == 'true'">net6.0</MicrosoftDotNetBuildTasksInstallersTaskTargetFramework>


@am11 Could you please check this?

This is for source-build, which is why I left it out from the patch. I think it can be updated later, when source-build requires it.

The end-to-end test for source build runs in dotnet/installer repo; first the PRs are merged in dotnet/runtime repo, dotnet/sdk is updated with latest runtime, and finally installer repo is updated with SDK where source-build happens in the CI. Therefore, it is not immediately obvious whether it is OK to make this change.

Thanks for the information, I couldn't have done it without you 😍
Ok, I'll revert this.

The Installers package uses net7.0 in both the normal build and the source build: https://github.com/dotnet/arcade/blob/8e8cab10677494713f64937650d4996782223740/src/Microsoft.DotNet.Build.Tasks.Installers/build/Microsoft.DotNet.Build.Tasks.Installers.props#L3. Ideally we would not hardcode the tfm here at all, but we can do that in a separate change if we would like to.

Thanks Viktor @ViktorHofer I changed it to 7.0

ArminShoeibi · 2022-07-01T22:45:16Z

Changes to files that reside under eng/common/ shouldn't be made in this repo but instead in https://github.com/dotnet/arcade which then mirrors then changes back to dotnet/runtime and other repos.

@am11 Is it okay to revert these 2 files?
eng/common/SetupNugetSources.ps1
eng/common/SetupNugetSources.sh

src/tests/BuildWasmApps/testassets/BlazorApp/BlazorApp.csproj

am11 · 2022-07-01T23:30:30Z

You don't have to revert eng/common in this PR, as long as you open a parallel PR in arcade repo with eng/common changes.
Regardless of the order these PRs are merged, changes will eventually synchronize.

ArminShoeibi · 2022-07-02T06:53:52Z

You don't have to revert eng/common in this PR, as long as you open a parallel PR in arcade repo with eng/common changes. Regardless of the order these PRs are merged, changes will eventually synchronize.

Okay Thanks.

ArminShoeibi · 2022-07-02T14:58:24Z

You don't have to revert eng/common in this PR, as long as you open a parallel PR in arcade repo with eng/common changes. Regardless of the order these PRs are merged, changes will eventually synchronize.

Thanks, Done.
dotnet/arcade#9866

src/tests/BuildWasmApps/testassets/BlazorApp/_Imports.razor

src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs

am11 · 2022-07-02T18:34:03Z

Wasm tests are still failing. I suggest you revert all changes under src/tests. The WebAssembly SDK has many changes since .NET 5, so it is a non-travial change. You will need to investigate how the SDK targets were evolved and which properties to set to make it pass etc.

To revert:

git remote add dotnet https://github.com/dotnet/runtime
git fetch --all

git checkout dotnet/main src/tests
# commit and push

So lets revert src/tests, open a follow up issue for Blazor_net50 update for the future.

ArminShoeibi · 2022-07-02T19:06:19Z

Thanks @am11 , Done. I'll open an issue after this PR.

src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs

ArminShoeibi · 2022-10-04T22:52:56Z

Hi @ArminShoeibi - just checking in here. Are you still working on this?

Hello there
Yes, I'm going to sync my branch with main and after that I will resolve comments.

…ionError

…tion_CurrentDirectoryIsIgnored

ArminShoeibi · 2022-10-04T23:41:03Z

Hi @ArminShoeibi - just checking in here. Are you still working on this?

Could you please review my changes?
Thanks for your hints

src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs

elinor-fung

Looking good - I think we just have some minor comments left.

elinor-fung · 2022-10-06T16:29:43Z

eng/common/SetupNugetSources.ps1

@@ -2,7 +2,7 @@
 # This file should be removed as part of this issue: https://github.com/dotnet/arcade/issues/4080
 #
 # What the script does is iterate over all package sources in the pointed NuGet.config and add a credential entry
-# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential 
+# under <packageSourceCredentials> for each Maestro managed private feed. Two additional credential


I would just revert these whitespace-only changes in eng/common.

elinor-fung · 2022-10-06T16:42:47Z

src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs

@@ -80,7 +80,7 @@ public static int CompileNuget(BuildOptions options)
                    }

                    // This is not a reliable way of building the publish folder
-                    string publishFolder = Path.Combine(appFolder, @"artifacts\Debug\net5.0\publish");
+                    string publishFolder = Path.Combine(appFolder, @"artifacts\Debug\net6.0\publish");


@trylek I'm not sure what the expected tfm corresponds to here. From what I can tell, it is running dotnet new without specifying a framework, so it will be whatever the default is for the dotnet it picked up? Is just changing this to net6.0 fine here?

it will be whatever the default is for the dotnet it picked up?

if so, then this will work here too:

runtime/src/libraries/Common/tests/StaticTestGenerator/Program.cs

Line 205 in 8fd74f3

GetCsprojTemplate($"net{version.Major}.{version.Minor}")

Version version = Environment.Version;
string _framework = $"net{version.Major}.{version.Minor}"
DotnetCli.New(.. -f _framework)
string publishFolder = Path.Combine(appFolder, $@"artifacts\Debug\{_framework}\..

for net5 and above. netcore3.1's l.t.s will end in mid dec, main branch can consider it retired as well

Looks reasonable / better than the current hard-coding - let's do that.

Done, Thanks @kasperk81 @elinor-fung

src/installer/managed/Microsoft.NET.HostModel/Bundle/Manifest.cs

Co-authored-by: Elinor Fung <[email protected]>

elinor-fung · 2022-10-20T16:15:50Z

@ArminShoeibi could you resolve the merge conflicts when you get the chance?

Other than that, I believe #69911 (comment) is the remaining thing to address.

ArminShoeibi · 2022-10-24T20:47:38Z

@ArminShoeibi could you resolve the merge conflicts when you get the chance?

Other than that, I believe #69911 (comment) is the remaining thing to address.

Sure, I'll do it today.

…o.cs Co-authored-by: kasperk81 <[email protected]>

…ethod

ArminShoeibi · 2022-10-24T21:16:52Z

src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs

@@ -58,7 +58,9 @@ public static int CompileNuget(BuildOptions options)
                    string appFolder = Path.Combine(nugetOutputFolder, $"{package}.TestApp");
                    Directory.CreateDirectory(appFolder);

-                    int exitCode = DotnetCli.New(appFolder, "console", nugetLog);
+                    Version version = Environment.Version;
+                    string targetFramework = $"net{version.Major}.{version.Minor}";


@kasperk81 @elinor-fung if you folks have any recommendations about this variable name I'm all ears.

src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs

Co-authored-by: kasperk81 <[email protected]>

elinor-fung

Thanks, @ArminShoeibi!

ArminShoeibi · 2022-10-27T19:44:37Z

@am11 Thanks for your help.

am11 · 2022-10-27T20:37:33Z

Thanks for your contribution! :)

dotnet-issue-labeler bot added the area-CodeGen-coreclr CLR JIT compiler in src/coreclr/src/jit and related components such as SuperPMI label May 27, 2022

ghost added the community-contribution Indicates that the PR has been added by a community member label May 27, 2022

danmoseley reviewed May 28, 2022

View reviewed changes

docs/design/coreclr/jit/viewing-jit-dumps.md Outdated Show resolved Hide resolved

ViktorHofer reviewed May 30, 2022

View reviewed changes

am11 reviewed May 30, 2022

View reviewed changes

docs/design/coreclr/jit/viewing-jit-dumps.md Outdated Show resolved Hide resolved

ArminShoeibi force-pushed the arminshoeibi/rev-net5 branch from cff0377 to c6879ad Compare May 31, 2022 19:06

ArminShoeibi force-pushed the arminshoeibi/rev-net5 branch from 584859e to 6d547fa Compare July 1, 2022 18:39

ArminShoeibi changed the title ~~Rev .NET 5 to net6.0 or $(NetCoreAppCurrent)~~ Retire .NET 5 Jul 1, 2022

ArminShoeibi commented Jul 1, 2022

View reviewed changes

am11 reviewed Jul 1, 2022

View reviewed changes

src/tests/BuildWasmApps/testassets/BlazorApp/BlazorApp.csproj Outdated Show resolved Hide resolved

am11 closed this Jul 1, 2022

am11 reopened this Jul 1, 2022

ArminShoeibi mentioned this pull request Jul 2, 2022

Delete .NET 5 nuget sources from SetupNugetSources files dotnet/arcade#9866

Closed

1 task

ArminShoeibi force-pushed the arminshoeibi/rev-net5 branch from 73e2486 to 84bdf1e Compare July 2, 2022 15:07

am11 reviewed Jul 2, 2022

View reviewed changes

src/tests/BuildWasmApps/testassets/BlazorApp/_Imports.razor Outdated Show resolved Hide resolved

am11 reviewed Jul 2, 2022

View reviewed changes

src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs Outdated Show resolved Hide resolved

ArminShoeibi force-pushed the arminshoeibi/rev-net5 branch from a3231bf to 03433cc Compare July 2, 2022 19:13

am11 reviewed Jul 2, 2022

View reviewed changes

src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs Show resolved Hide resolved

ArminShoeibi added 5 commits October 5, 2022 02:48

Resolve conflicts

d6d3e43

Add comments to inline data attributes of FrameworkHiveSelection

3596a21

change net5.0 to net6.0 in inline data attributes of FrameworkResolut…

046af4b

…ionError

change Constants.Tfm.Net5 to Constants.Tfm.Net6 in FrameworkHiveSelec…

d488e4b

…tion_CurrentDirectoryIsIgnored

fix CodeSnippetsToValidateFallbackForwarder in Compiles.cs

927e5f3

kasperk81 reviewed Oct 5, 2022

View reviewed changes

src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInfo.cs Outdated Show resolved Hide resolved

elinor-fung reviewed Oct 6, 2022

View reviewed changes

Update src/installer/managed/Microsoft.NET.HostModel/Bundle/Manifest.cs

4c8255d

Co-authored-by: Elinor Fung <[email protected]>

ArminShoeibi and others added 3 commits October 25, 2022 00:25

Resolve conflicts

a2a4db3

Update src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInf…

45f06a4

…o.cs Co-authored-by: kasperk81 <[email protected]>

Use Environment.Version instead of hard code values in CompileNuget m…

8cfe719

…ethod

ArminShoeibi commented Oct 24, 2022

View reviewed changes

kasperk81 reviewed Oct 24, 2022

View reviewed changes

src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs Outdated Show resolved Hide resolved

Update src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs

56db16f

Co-authored-by: kasperk81 <[email protected]>

build-analysis bot mentioned this pull request Oct 25, 2022

ComInterfaceGenerator.Unit.Tests.WorkItemExecution failing with Internal CLR error on Win x86 #77087

Closed

ArminShoeibi requested review from elinor-fung and am11 and removed request for elinor-fung and am11 October 26, 2022 17:12

elinor-fung approved these changes Oct 26, 2022

View reviewed changes

elinor-fung merged commit f4a6849 into dotnet:main Oct 27, 2022

ArminShoeibi deleted the arminshoeibi/rev-net5 branch October 27, 2022 19:43

ghost locked as resolved and limited conversation to collaborators Nov 27, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Retire .NET 5 #69911

Retire .NET 5 #69911

ArminShoeibi commented May 27, 2022

ghost commented May 27, 2022

dnfadmin commented May 27, 2022 •

edited

Loading

danmoseley commented May 28, 2022

ViktorHofer left a comment

am11 commented Jul 1, 2022

ArminShoeibi commented Jul 1, 2022

ArminShoeibi commented Jul 1, 2022 •

edited

Loading

ArminShoeibi Jul 1, 2022

am11 Jul 1, 2022

ArminShoeibi Jul 1, 2022

ViktorHofer Jul 2, 2022

ArminShoeibi Jul 2, 2022 •

edited

Loading

ArminShoeibi commented Jul 1, 2022

am11 commented Jul 1, 2022

ArminShoeibi commented Jul 2, 2022

ArminShoeibi commented Jul 2, 2022 •

edited

Loading

am11 commented Jul 2, 2022 •

edited

Loading

ArminShoeibi commented Jul 2, 2022 •

edited

Loading

ArminShoeibi commented Oct 4, 2022

ArminShoeibi commented Oct 4, 2022

elinor-fung left a comment

elinor-fung Oct 6, 2022

elinor-fung Oct 6, 2022

kasperk81 Oct 6, 2022

elinor-fung Oct 14, 2022

ArminShoeibi Oct 24, 2022

elinor-fung commented Oct 20, 2022

ArminShoeibi commented Oct 24, 2022

ArminShoeibi Oct 24, 2022

elinor-fung left a comment

ArminShoeibi commented Oct 27, 2022

am11 commented Oct 27, 2022

Retire .NET 5 #69911

Retire .NET 5 #69911

Conversation

ArminShoeibi commented May 27, 2022

ghost commented May 27, 2022

dnfadmin commented May 27, 2022 • edited Loading

danmoseley commented May 28, 2022

ViktorHofer left a comment

Choose a reason for hiding this comment

am11 commented Jul 1, 2022

ArminShoeibi commented Jul 1, 2022

ArminShoeibi commented Jul 1, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ArminShoeibi Jul 2, 2022 • edited Loading

Choose a reason for hiding this comment

ArminShoeibi commented Jul 1, 2022

am11 commented Jul 1, 2022

ArminShoeibi commented Jul 2, 2022

ArminShoeibi commented Jul 2, 2022 • edited Loading

am11 commented Jul 2, 2022 • edited Loading

ArminShoeibi commented Jul 2, 2022 • edited Loading

ArminShoeibi commented Oct 4, 2022

ArminShoeibi commented Oct 4, 2022

elinor-fung left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

elinor-fung commented Oct 20, 2022

ArminShoeibi commented Oct 24, 2022

Choose a reason for hiding this comment

elinor-fung left a comment

Choose a reason for hiding this comment

ArminShoeibi commented Oct 27, 2022

am11 commented Oct 27, 2022

dnfadmin commented May 27, 2022 •

edited

Loading

ArminShoeibi commented Jul 1, 2022 •

edited

Loading

ArminShoeibi Jul 2, 2022 •

edited

Loading

ArminShoeibi commented Jul 2, 2022 •

edited

Loading

am11 commented Jul 2, 2022 •

edited

Loading

ArminShoeibi commented Jul 2, 2022 •

edited

Loading