-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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.
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
Retire .NET 5 #69911
Merged
+43
−64
Merged
Retire .NET 5 #69911
Changes from 34 commits
Commits
Show all changes
35 commits
Select commit
Hold shift + click to select a range
769881f
Change net5.0 to $(NetCoreAppCurrent) in viewing-jit-dumps.md
ArminShoeibi 7da703f
Change net5.0 to $(NetCoreAppCurrent) and net6.0 in cross-building.md
ArminShoeibi c3da7ee
Change net5.0 to net6.0 in debugging.md
ArminShoeibi 69d9031
Change netcoreapp5.0 to net6.0 in running-aspnet-benchmarks-with-cros…
ArminShoeibi 82da010
Change net5.0 to $(NetCoreAppCurrent) in testing.md
ArminShoeibi 0ba2ebb
Delete $dotnet5Source in SetupNugetSources.ps1
ArminShoeibi 268d369
Delete dotnet5-internal and dotnet5-internal-transport in SetupNugetS…
ArminShoeibi eaaf145
Update docs/design/coreclr/jit/viewing-jit-dumps.md
ArminShoeibi ef93490
Address remaining occurrences
am11 00f45b2
Change net5.0 to net6.0 in workloads.csproj
ArminShoeibi 4a19ced
Use Net6 enum member instead of Net5 in Compiles file
ArminShoeibi 7ad2a26
Delete Net5 from TestTargetFramework enum
ArminShoeibi c18e494
Delete TestTargetFramework.Net5 reference from AdditionalAttrinutesOn…
ArminShoeibi 0c04b0c
Delete net5.0 and netcoreapp3.0 from MultipleHives.cs
ArminShoeibi 750aa96
Update src/tests/BuildWasmApps/testassets/BlazorApp/BlazorApp.csproj
ArminShoeibi e54f5a3
Change tfm to net7.0 in workloads.csproj
ArminShoeibi eb64e01
Revert 'src/tests' changes
ArminShoeibi 79c5fa6
Revert a condition in TargetInfo.cs
ArminShoeibi d6db845
Apply patch to TargetInfo.cs
ArminShoeibi 4c142b5
Update src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInf…
ArminShoeibi 3e320d6
Update src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInf…
ArminShoeibi c750ee8
Revert CompatibilitySuppressions.xml
ArminShoeibi 9d4e4c5
Delete 'src\tests\BuildWasmApps\testassets\BlazorApp' directory
ArminShoeibi 143d22b
Revert 'src/libraries/System.Security.Permissions/src/CompatibilitySu…
ArminShoeibi a78a6a9
Revert 'eng/tesing' directory
ArminShoeibi d6d3e43
Resolve conflicts
ArminShoeibi 3596a21
Add comments to inline data attributes of FrameworkHiveSelection
ArminShoeibi 046af4b
change net5.0 to net6.0 in inline data attributes of FrameworkResolut…
ArminShoeibi d488e4b
change Constants.Tfm.Net5 to Constants.Tfm.Net6 in FrameworkHiveSelec…
ArminShoeibi 927e5f3
fix CodeSnippetsToValidateFallbackForwarder in Compiles.cs
ArminShoeibi 4c8255d
Update src/installer/managed/Microsoft.NET.HostModel/Bundle/Manifest.cs
ArminShoeibi a2a4db3
Resolve conflicts
ArminShoeibi 45f06a4
Update src/installer/managed/Microsoft.NET.HostModel/Bundle/TargetInf…
ArminShoeibi 8cfe719
Use Environment.Version instead of hard code values in CompileNuget m…
ArminShoeibi 56db16f
Update src/coreclr/tools/r2rtest/Commands/CompileNugetCommand.cs
ArminShoeibi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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}"; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @kasperk81 @elinor-fung if you folks have any recommendations about this variable name I'm all ears. |
||
int exitCode = DotnetCli.New(appFolder, $"console -f {targetFramework}", nugetLog); | ||
if (exitCode != 0) | ||
{ | ||
nugetLog.WriteLine($"dotnet new console for {package} failed with exit code {exitCode}"); | ||
|
@@ -80,7 +82,8 @@ 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\{targetFramework}\publish"); | ||
ArminShoeibi marked this conversation as resolved.
Show resolved
Hide resolved
|
||
if (!Directory.Exists(publishFolder)) | ||
{ | ||
nugetLog.WriteLine($"Could not find folder {publishFolder} containing the published app."); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would just revert these whitespace-only changes in eng/common.