diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 9bdefc81fa42..88fbb271fbcf 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -58,7 +58,7 @@ configuration: label: Area-ILLink then: - addReply: - reply: '@dotnet/illink-contrib a new issue has been filed in the ILLink area, please triage' + reply: '@dotnet/illink a new issue has been filed in the ILLink area, please triage' description: Notify linker of new untriaged bugs - if: - payloadType: Pull_Request diff --git a/CODEOWNERS b/CODEOWNERS index 2edf47c23081..47af50930744 100644 --- a/CODEOWNERS +++ b/CODEOWNERS @@ -61,13 +61,13 @@ # ILLink and ReadyToRun targets and tasks owned by runtime team # Area-ILLink Area-ReadyToRun -/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets @dotnet/illink-contrib +/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets @dotnet/illink /src/Tasks/Microsoft.NET.Build.Tasks/PrepareForReadyToRunCompilation.cs @AntonLapounov /src/Tasks/Microsoft.NET.Build.Tasks/RunReadyToRunCompiler.cs @AntonLapounov -/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @dotnet/illink-contrib +/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToRunILLink.cs @dotnet/illink /test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishReadyToRun.cs @AntonLapounov # Publish.targets related to ILLink and ReadyToRun is own by both runtime and SDK team -/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @dotnet/illink-contrib @AntonLapounov @dotnet/dotnet-cli +/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Publish.targets @dotnet/illink @AntonLapounov @dotnet/dotnet-cli # Area-ClickOnce /src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ClickOnce.targets @sujitnayak diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 027ad54e65f8..c3c662f200cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ 81ab22e8bf15861237b11d3900ff49de07ee3844 - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f @@ -93,51 +93,51 @@ 02adf13f8d69e0105fff4d68dbd5fb1d43bc0e17 - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/roslyn - 105491f4631e605012f90819e559cfa939a6124f + 8814b230299733c9be14a01d3a81da8b4c97b51d - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a https://github.com/nuget/nuget.client @@ -226,25 +226,25 @@ 5b69fd31169dd07ced917329bbb483f3b73ea98f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f https://github.com/dotnet/windowsdesktop @@ -267,54 +267,54 @@ https://github.com/dotnet/wpf 0628a7722ccdc47ebe66beb5eb8cee756d05f7d9 - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a @@ -335,21 +335,21 @@ 1e807699db6db8bfe7c6b3043a1b50ddf32ddba9 - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a - + https://github.com/dotnet/aspnetcore - 77994c64cee73e0093fe25cd434bee8bd2580b4e + d301328737c4912b95f236c4b349cf46ef7a473a https://github.com/dotnet/test-templates @@ -426,9 +426,9 @@ Adding an explicit dependency to make sure the latest version is used instead of the SBRP one under source build. --> - + https://github.com/dotnet/symreader - 200bba3d3695c902b740931b8d9c2ba09d037f24 + 0710a7892d89999956e8808c28e9dd0512bd53f3 @@ -489,35 +489,35 @@ - + https://github.com/dotnet/symreader - 200bba3d3695c902b740931b8d9c2ba09d037f24 + 0710a7892d89999956e8808c28e9dd0512bd53f3 - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f @@ -551,9 +551,9 @@ ede13bd35571c0c8b0c01edcb057031904c5c955 - + https://github.com/dotnet/runtime - a900bbf6fcf33fa2e799ed599ab86e00d6124c05 + 5044e936ce154fcf3223cbe6f5e2ad66605cea9f https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 2fc2d7bcaff9..389e9d368694 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,17 +79,17 @@ 8.0.0 4.0.0 8.0.0 - 9.0.0-preview.7.24328.10 + 9.0.0-preview.7.24351.4 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-preview.7.24328.10 + 9.0.0-preview.7.24351.4 4.6.0 2.0.0-beta4.24324.3 0.4.0-alpha.24324.3 2.0.0-preview.1.24305.1 - 2.1.0-beta.24321.1 + 2.2.0-beta.24327.2 1.1.2-beta1.22216.1 10.3.0 3.2.2146 @@ -130,21 +130,21 @@ - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 8.0.0-rc.1.23414.4 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 2.1.0 @@ -177,9 +177,9 @@ - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 - 9.0.0-preview.7.24328.10 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 + 9.0.0-preview.7.24351.4 @@ -224,30 +224,30 @@ - 4.12.0-1.24351.5 - 4.12.0-1.24351.5 - 4.12.0-1.24351.5 - 4.12.0-1.24351.5 - 4.12.0-1.24351.5 - 4.12.0-1.24351.5 - 4.12.0-1.24351.5 - 4.12.0-1.24351.5 + 4.12.0-1.24351.13 + 4.12.0-1.24351.13 + 4.12.0-1.24351.13 + 4.12.0-1.24351.13 + 4.12.0-1.24351.13 + 4.12.0-1.24351.13 + 4.12.0-1.24351.13 + 4.12.0-1.24351.13 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 - 9.0.0-preview.7.24328.7 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 + 9.0.0-preview.7.24329.2 diff --git a/github-merge-flow.jsonc b/github-merge-flow.jsonc new file mode 100644 index 000000000000..93c862112b6d --- /dev/null +++ b/github-merge-flow.jsonc @@ -0,0 +1,30 @@ +// IMPORTANT: This file is read by the merge flow from main branch only. +{ + "merge-flow-configurations": { + // Automate opening PRs to merge cli release/6.0.1xx to .4xx + "release/6.0.1xx":{ + "MergeToBranch": "release/6.0.4xx", + "ExtraSwitches": "-QuietComments" + }, + // Automate opening PRs to merge cli release/6.0.4xx to 8.0.1xx + "release/6.0.4xx":{ + "MergeToBranch": "release/8.0.1xx", + "ExtraSwitches": "-QuietComments" + }, + // Automate opening PRs to merge cli release/8.0.1xx to 8.0.3xx + "release/8.0.1xx":{ + "MergeToBranch": "release/8.0.3xx", + "ExtraSwitches": "-QuietComments" + }, + // Automate opening PRs to merge cli release/8.0.3xx to 8.0.4xx + "release/8.0.3xx":{ + "MergeToBranch": "release/8.0.4xx", + "ExtraSwitches": "-QuietComments" + }, + // Automate opening PRs to merge sdk repos from release/8.0.4xx to main + "release/8.0.4xx":{ + "MergeToBranch": "main", + "ExtraSwitches": "-QuietComments" + } + } +} \ No newline at end of file diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs index 8ed35c24c6c2..7cd3bb4c852c 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/DebugTests.cs @@ -14,7 +14,7 @@ namespace Microsoft.DotNet.SourceBuild.SmokeTests; public class DebugTests : SdkTests { - private record ScanResult(string FileName, bool HasDebugInfo, bool HasDebugAbbrevs, bool HasFileSymbols, bool HasGnuDebugLink); + private record ScanResult(string FileName, bool HasDebugInfo, bool HasDebugAbbrevs, bool HasGnuDebugLink); public DebugTests(ITestOutputHelper outputHelper) : base(outputHelper) { } @@ -30,7 +30,7 @@ public void SourceBuiltSdkContainsNativeDebugSymbols() StringBuilder issueDetails = new(); foreach (var fileName in fileNames) { - if (!IsElfFile(fileName) || SkipFile(fileName)) + if (!IsElfFile(fileName)) { continue; } @@ -49,11 +49,6 @@ public void SourceBuiltSdkContainsNativeDebugSymbols() foundIssue = true; issueDetails.Append($"missing .debug_abbrev section in {fileName}{newLine}"); } - if (!result.HasFileSymbols) - { - foundIssue = true; - issueDetails.Append($"missing FILE symbols in {fileName}{newLine}"); - } if (result.HasGnuDebugLink) { foundIssue = true; @@ -70,14 +65,6 @@ private bool IsElfFile(string fileName) return Regex.IsMatch(fileStdOut, @"ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)"); } - private static bool SkipFile(string path) - { - string fileName = Path.GetFileName(path); - - // 'ilc' is a NativeAOT-built application which doesn't meet the expectations set by the test. - return fileName == "ilc"; - } - private ScanResult ScanFile(string fileName) { string readelfSStdOut = ExecuteHelper.ExecuteProcessValidateExitCode("eu-readelf", $"-S {fileName}", OutputHelper); @@ -96,35 +83,11 @@ private ScanResult ScanFile(string fileName) string readelfsStdOut = ExecuteHelper.ExecuteProcessValidateExitCode("eu-readelf", $"-s {fileName}", OutputHelper); - // Test FILE symbols. These will most likely be removed by anyting that - // manipulates symbol tables because it's generally useless. So a nice test - // that nothing has messed with symbols. - bool hasFileSymbols = readelfsStdOut.Split("\n").Where(ContainsFileSymbols).Any(); - // Test that there are no .gnu_debuglink sections pointing to another // debuginfo file. There shouldn't be any debuginfo files, so the link makes // no sense either. bool hasGnuDebuglink = readelfsStdOut.Split("\n").Where(line => line.Contains("] .gnu_debuglink")).Any(); - return new ScanResult(fileName, hasDebugInfo, hasDebugAbbrev, hasFileSymbols, hasGnuDebuglink); - } - - private bool ContainsFileSymbols(string line) - { - // Try matching against output like this: - // 10: 0000000000000000 0 FILE LOCAL DEFAULT ABS coreclr_resolver.cpp - // 779: 0000000000000000 0 FILE LOCAL DEFAULT ABS header.cpp - - var parts = new Regex(@"[ \t\n\r]+").Split(line); - int expectedNumberOfParts = 9; - - if (parts.Length < expectedNumberOfParts) - { - return false; - } - - var fileNameRegex = new Regex(@"(.*/)?[-_a-zA-Z0-9]+\.(c|cc|cpp|cxx)"); - return (parts[3] == "0") && (parts[4] == "FILE") && (parts[5] == "LOCAL") && (parts[6] == "DEFAULT") && - (parts[7] == "ABS") && (fileNameRegex.IsMatch(parts[8])); + return new ScanResult(fileName, hasDebugInfo, hasDebugAbbrev, hasGnuDebuglink); } }