From b4c172107ff2d681a668626d06f58ca642d004c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 30 Oct 2024 11:43:24 +0100 Subject: [PATCH 01/13] Add MSTest among common workloads Fix https://github.com/microsoft/testfx/issues/3964 --- .../Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs index c3b953a9fdb7..65de23794080 100644 --- a/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs +++ b/src/Cli/Microsoft.TemplateEngine.Cli/TemplateListCoordinator.cs @@ -253,7 +253,8 @@ private async Task> GetCuratedListAsync(CancellationT "Microsoft.Common.Console", //console "Microsoft.Common.WPF", //wpf "Microsoft.Common.WinForms", //winforms - "Microsoft.Web.Blazor" //blazor + "Microsoft.Web.Blazor", //blazor + "Microsoft.Test.MSTest" //mstest }; IReadOnlyList templates = await _templatePackageManager.GetTemplatesAsync(cancellationToken).ConfigureAwait(false); From a1f23848629ead0ae8fc40bf5016b6b9b874d863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 6 Nov 2024 10:51:19 +0100 Subject: [PATCH 02/13] Fix test --- test/EndToEnd.Tests/ProjectBuildTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/test/EndToEnd.Tests/ProjectBuildTests.cs b/test/EndToEnd.Tests/ProjectBuildTests.cs index ca82b9a9f2bb..c5fbc6ace5c1 100644 --- a/test/EndToEnd.Tests/ProjectBuildTests.cs +++ b/test/EndToEnd.Tests/ProjectBuildTests.cs @@ -192,6 +192,7 @@ public void DotnetNewShowsCuratedListCorrectly() [\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+ [\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ +[\w \.\(\)]+mstest\s+\[C#\],F#,VB[\w\ \/]+ "; if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) From cc5ecdc7df46195e24c78ed5f3d5ae64f5ca998b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 8 Jan 2025 09:15:47 +0100 Subject: [PATCH 03/13] fix tests on linux and macos hopefully --- ...owConfigWithDebugShowConfig.Linux.verified.txt | 9 +++++---- ...ShowConfigWithDebugShowConfig.OSX.verified.txt | 9 +++++---- ...ConfigWithDebugShowConfig.Windows.verified.txt | 13 +++++++------ ...etNewTests.CanShowBasicInfo.Linux.verified.txt | 11 ++++++----- ...tnetNewTests.CanShowBasicInfo.OSX.verified.txt | 11 ++++++----- ...NewTests.CanShowBasicInfo.Windows.verified.txt | 15 ++++++++------- 6 files changed, 37 insertions(+), 31 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt index 640c3a5af928..1f2a70b8e3bc 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt @@ -14,11 +14,12 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web An example would be: dotnet new console diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt index 640c3a5af928..974073fff0cb 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt @@ -14,11 +14,12 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web An example would be: dotnet new console diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt index 4bbeae77fd59..f383afe4a573 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Windows.verified.txt @@ -14,13 +14,14 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -Windows Forms App winforms [C#],VB Common/WinForms -WPF Application wpf [C#],VB Common/WPF +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web +Windows Forms App winforms [C#],VB Common/WinForms +WPF Application wpf [C#],VB Common/WPF An example would be: dotnet new console diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt index ae5a7b8a37f8..f431df0f5ecd 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt @@ -1,11 +1,12 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags --------------- ---------- ---------- ---------------------- -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Template Name Short Name Language Tags +------------------- ---------- ---------- ---------------------- +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web An example would be: dotnet new console diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt index ae5a7b8a37f8..2308ed44e796 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt @@ -1,11 +1,12 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags --------------- ---------- ---------- ---------------------- -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Template Name Short Name Language Tags +------------------- ---------- ---------- ----------------------- +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web An example would be: dotnet new console diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt index e0cb3b78ef7f..97410383cb3f 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Windows.verified.txt @@ -1,13 +1,14 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags ------------------ ---------- ---------- ---------------------- -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console -Windows Forms App winforms [C#],VB Common/WinForms -WPF Application wpf [C#],VB Common/WPF +Template Name Short Name Language Tags +------------------- ---------- ---------- ----------------------- +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console +MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web +Windows Forms App winforms [C#],VB Common/WinForms +WPF Application wpf [C#],VB Common/WPF An example would be: dotnet new console From b1e048fcfd20a1f0d31bf1ff6f56439e0bd05617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 8 Jan 2025 09:16:09 +0100 Subject: [PATCH 04/13] dash --- .../DotnetNewTests.CanShowBasicInfo.Linux.verified.txt | 10 +++++----- .../DotnetNewTests.CanShowBasicInfo.OSX.verified.txt | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt index f431df0f5ecd..70a26b56c9d8 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.Linux.verified.txt @@ -1,11 +1,11 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags -------------------- ---------- ---------- ---------------------- -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Template Name Short Name Language Tags +------------------- ---------- ---------- ----------------------- +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web An example would be: diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt index 2308ed44e796..70a26b56c9d8 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewTests.CanShowBasicInfo.OSX.verified.txt @@ -1,11 +1,11 @@ The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags ------------------- ---------- ---------- ----------------------- -Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Blazor Web App blazor [C#] Web/Blazor/WebAssembly +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web An example would be: From 50d3b558fa7d80c7e6625794b169e53636942a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Jare=C5=A1?= Date: Wed, 8 Jan 2025 13:14:43 +0100 Subject: [PATCH 05/13] whitespace --- ...ests.CanShowConfigWithDebugShowConfig.Linux.verified.txt | 6 +++--- ...sTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt index 1f2a70b8e3bc..340594c524ce 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.Linux.verified.txt @@ -14,11 +14,11 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web An example would be: diff --git a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt index 974073fff0cb..340594c524ce 100644 --- a/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt +++ b/test/dotnet-new.Tests/Approvals/DotnetNewDebugOptionsTests.CanShowConfigWithDebugShowConfig.OSX.verified.txt @@ -14,11 +14,11 @@ Generators Type The 'dotnet new' command creates a .NET project based on a template. Common templates are: -Template Name Short Name Language Tags +Template Name Short Name Language Tags %TABLE HEADER DELIMITER% Blazor Web App blazor [C#] Web/Blazor/WebAssembly -Class Library classlib [C#],F#,VB Common/Library -Console App console [C#],F#,VB Common/Console +Class Library classlib [C#],F#,VB Common/Library +Console App console [C#],F#,VB Common/Console MSTest Test Project mstest [C#],F#,VB Test/MSTest/Desktop/Web An example would be: From e874a219da2ef98c2c0d798a27cdab9fa2ce185c Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Wed, 8 Jan 2025 16:43:03 +0100 Subject: [PATCH 06/13] Update VMR orchestrator dependencies --- src/SourceBuild/content/eng/Versions.props | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index cc57fe707fc6..2bb9444913fc 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -31,12 +31,13 @@ 17.8.3 - 8.0.0 - 8.0.0 - 8.0.0 + 9.0.0 + 9.0.0 + 9.0.0 + + 6.11.0 13.0.3 - 6.9.1 10.0.0 From 7b0b3681316a9b8b2c8c6d4c5a81209f69618102 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 22:00:03 +0100 Subject: [PATCH 07/13] [main] Update dependencies from dotnet/runtime (#45790) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 144 ++++++++++++++++++++-------------------- eng/Versions.props | 70 +++++++++---------- 2 files changed, 107 insertions(+), 107 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 088de4a85950..6c3151075f12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,46 +15,46 @@ 88673185ead8999b65e57ff791aa7e26eb2b773a - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 @@ -230,29 +230,29 @@ f56ab6936969deb42c9ecf2f2193b16f0579be28 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 https://github.com/dotnet/windowsdesktop @@ -473,89 +473,89 @@ - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 https://github.com/dotnet/aspnetcore 7ba02e8ac71eeba562476953d5ff6030b8eda765 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 @@ -589,9 +589,9 @@ e58820063a8754d418518bce69ca2df0e3b4ac25 - + https://github.com/dotnet/runtime - efdd29953304f1fc494bb45c5785d37961c4a14b + 0741a32a738f303693947afa63e52d28fb79a576 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 2ea229af75f0..0bce16158146 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,43 +87,43 @@ - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 8.0.0-rc.1.23414.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 2.1.0 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 - 10.0.0-alpha.1.25052.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 + 10.0.0-alpha.1.25058.4 8.0.0 From 6d3569de4218c5a6c46ecd868bca00cd931c1d78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:12:08 -0800 Subject: [PATCH 08/13] [main] Update dependencies from microsoft/vstest (#45794) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c3151075f12..2090a67b66eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -212,22 +212,22 @@ https://github.com/nuget/nuget.client bf603fb32f32478a1ce0d6a1e27b7b64d14e244a - + https://github.com/microsoft/vstest - f56ab6936969deb42c9ecf2f2193b16f0579be28 + 69c2d3e61a2baf76e1491727e81c4d9b344e4d91 - + https://github.com/microsoft/vstest - f56ab6936969deb42c9ecf2f2193b16f0579be28 + 69c2d3e61a2baf76e1491727e81c4d9b344e4d91 - + https://github.com/microsoft/vstest - f56ab6936969deb42c9ecf2f2193b16f0579be28 + 69c2d3e61a2baf76e1491727e81c4d9b344e4d91 - + https://github.com/microsoft/vstest - f56ab6936969deb42c9ecf2f2193b16f0579be28 + 69c2d3e61a2baf76e1491727e81c4d9b344e4d91 diff --git a/eng/Versions.props b/eng/Versions.props index 0bce16158146..b5c82b0b308b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,9 +157,9 @@ - 17.13.0-preview-25055-01 - 17.13.0-preview-25055-01 - 17.13.0-preview-25055-01 + 17.13.0-preview-25058-03 + 17.13.0-preview-25058-03 + 17.13.0-preview-25058-03 From 7dc8f0be8b1bc6f879e86c1c553c4c419dd3b853 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:12:48 -0800 Subject: [PATCH 09/13] [main] Update dependencies from nuget/nuget.client (#45786) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++-------- 2 files changed, 46 insertions(+), 46 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2090a67b66eb..209d4472802a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -143,74 +143,74 @@ https://github.com/dotnet/aspnetcore 7ba02e8ac71eeba562476953d5ff6030b8eda765 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 - + https://github.com/nuget/nuget.client - bf603fb32f32478a1ce0d6a1e27b7b64d14e244a + c4b26195ee5a77e70b2ea5fd50db87d6a9194c24 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index b5c82b0b308b..28ee0088894f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,18 +142,18 @@ - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 - 6.13.0-rc.111 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 + 6.13.0-rc.113 From 1edbc8097ebb30bef4838c356b955c8e18a80139 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:14:32 -0800 Subject: [PATCH 10/13] [main] Update dependencies from microsoft/testfx (#45780) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 209d4472802a..9425d83ee432 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -634,13 +634,13 @@ https://github.com/dotnet/runtime e77011b31a3e5c47d931248a64b47f9b2d47853d - + https://github.com/microsoft/testfx - f7ddde6db81476dc031fb5c327abb2eef7f38969 + e8edc352e84880a7bc9d3b23fe1eb2d14fa8f229 - + https://github.com/microsoft/testfx - f7ddde6db81476dc031fb5c327abb2eef7f38969 + e8edc352e84880a7bc9d3b23fe1eb2d14fa8f229 diff --git a/eng/Versions.props b/eng/Versions.props index 28ee0088894f..b5b3166f9008 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -28,7 +28,7 @@ true 6.0.1 true - 1.6.0-preview.25056.11 + 1.6.0-preview.25057.8 30 @@ -285,7 +285,7 @@ 6.12.0 6.1.0 4.18.4 - 3.8.0-preview.25056.11 + 3.8.0-preview.25057.8 1.3.2 8.0.0-beta.23607.1 From 5966361e04a05c7591284f72926ec1c3dabe4a17 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:16:58 -0800 Subject: [PATCH 11/13] [main] Update dependencies from dotnet/aspnetcore (#45772) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9425d83ee432..035e7ce3bd37 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 911cf5f462960bdd01df1ea3c0d0c217b3c3838b - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf ea12a1704cdd52ca6460ded2183d37b795b61c05 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 @@ -343,21 +343,21 @@ 46efcec83821d7f0322c01bc9549de83e855dcac - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 @@ -509,9 +509,9 @@ https://github.com/dotnet/runtime 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/aspnetcore - 7ba02e8ac71eeba562476953d5ff6030b8eda765 + 77b91e15c1403acd793322b7163469ad7d8babf9 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b5b3166f9008..875871301a00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -220,19 +220,19 @@ - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 - 10.0.0-alpha.2.25056.9 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 + 10.0.0-alpha.2.25058.2 From 7ba9beac3728287d99a2a90a483328150cbf3253 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 23:46:12 +0000 Subject: [PATCH 12/13] [main] Update dependencies from dotnet/windowsdesktop (#45782) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 035e7ce3bd37..c72b188de599 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -254,26 +254,26 @@ https://github.com/dotnet/runtime 0741a32a738f303693947afa63e52d28fb79a576 - + https://github.com/dotnet/windowsdesktop - 2e5f1f84d94c144d951cbf70a36110aa90fb6178 + 482e721f784460a0c6464bbf9b7306edb2ee3791 - + https://github.com/dotnet/windowsdesktop - 2e5f1f84d94c144d951cbf70a36110aa90fb6178 + 482e721f784460a0c6464bbf9b7306edb2ee3791 - + https://github.com/dotnet/windowsdesktop - 2e5f1f84d94c144d951cbf70a36110aa90fb6178 + 482e721f784460a0c6464bbf9b7306edb2ee3791 - + https://github.com/dotnet/windowsdesktop - 2e5f1f84d94c144d951cbf70a36110aa90fb6178 + 482e721f784460a0c6464bbf9b7306edb2ee3791 - + https://github.com/dotnet/wpf - ea12a1704cdd52ca6460ded2183d37b795b61c05 + 538cc805308fb006f5f793a0f299609d3007b612 https://github.com/dotnet/aspnetcore @@ -360,13 +360,13 @@ 77b91e15c1403acd793322b7163469ad7d8babf9 - + https://github.com/dotnet/winforms - f292cd280117173fe064be18c5159e6823cbc699 + a3da2c91433c32b8ed267fe660af6581cdbe1da0 - + https://github.com/dotnet/wpf - ea12a1704cdd52ca6460ded2183d37b795b61c05 + 538cc805308fb006f5f793a0f299609d3007b612 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 875871301a00..c794c55a6a50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,7 +83,7 @@ - 10.0.0-alpha.1.25056.6 + 10.0.0-alpha.1.25057.7 @@ -136,9 +136,9 @@ - 10.0.0-alpha.1.25057.15 - 10.0.0-alpha.1.25057.15 - 10.0.0-alpha.1.25057.15 + 10.0.0-alpha.1.25058.1 + 10.0.0-alpha.1.25058.1 + 10.0.0-alpha.1.25058.1 @@ -242,8 +242,8 @@ - 10.0.0-alpha.1.25057.4 - 10.0.0-alpha.1.25057.4 + 10.0.0-alpha.1.25058.2 + 10.0.0-alpha.1.25058.2 From 535f8402195ba520ffe4671bd30b29b403b51c7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Jan 2025 00:19:56 +0000 Subject: [PATCH 13/13] [main] Update dependencies from dotnet/arcade (#45777) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/cross/build-rootfs.sh | 15 ++++++--------- global.json | 4 ++-- 4 files changed, 26 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c72b188de599..bc2302f62c3c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -559,34 +559,34 @@ - + https://github.com/dotnet/arcade - e58820063a8754d418518bce69ca2df0e3b4ac25 + 43494f7be1c54e6a065f02f92842e08f29a1ff6f - + https://github.com/dotnet/arcade - e58820063a8754d418518bce69ca2df0e3b4ac25 + 43494f7be1c54e6a065f02f92842e08f29a1ff6f - + https://github.com/dotnet/arcade - e58820063a8754d418518bce69ca2df0e3b4ac25 + 43494f7be1c54e6a065f02f92842e08f29a1ff6f - + https://github.com/dotnet/arcade - e58820063a8754d418518bce69ca2df0e3b4ac25 + 43494f7be1c54e6a065f02f92842e08f29a1ff6f - + https://github.com/dotnet/arcade - e58820063a8754d418518bce69ca2df0e3b4ac25 + 43494f7be1c54e6a065f02f92842e08f29a1ff6f - + https://github.com/dotnet/arcade - e58820063a8754d418518bce69ca2df0e3b4ac25 + 43494f7be1c54e6a065f02f92842e08f29a1ff6f - + https://github.com/dotnet/arcade - e58820063a8754d418518bce69ca2df0e3b4ac25 + 43494f7be1c54e6a065f02f92842e08f29a1ff6f diff --git a/eng/Versions.props b/eng/Versions.props index c794c55a6a50..2d75ecc73c05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -262,10 +262,10 @@ - 10.0.0-beta.25056.1 - 10.0.0-beta.25056.1 - 10.0.0-beta.25056.1 - 10.0.0-beta.25056.1 + 10.0.0-beta.25057.5 + 10.0.0-beta.25057.5 + 10.0.0-beta.25057.5 + 10.0.0-beta.25057.5 diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 6f49d748285f..74f399716ba8 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -33,7 +33,6 @@ __QEMUArch=arm __UbuntuArch=armhf __UbuntuRepo= __UbuntuSuites="updates security backports" -__DebianSuites= __LLDB_Package="liblldb-3.9-dev" __SkipUnmount=0 @@ -188,8 +187,7 @@ while :; do __AlpineArch=loongarch64 __QEMUArch=loongarch64 __UbuntuArch=loong64 - __UbuntuSuites= - __DebianSuites=unreleased + __UbuntuSuites=unreleased __LLDB_Package="liblldb-19-dev" if [[ "$__CodeName" == "sid" ]]; then @@ -782,6 +780,8 @@ elif [[ "$__CodeName" == "haiku" ]]; then popd rm -rf "$__RootfsDir/tmp" elif [[ -n "$__CodeName" ]]; then + __Suites="$__CodeName $(for suite in $__UbuntuSuites; do echo -n "$__CodeName-$suite "; done)" + if [[ "$__SkipEmulation" == "1" ]]; then if [[ -z "$AR" ]]; then if command -v ar &>/dev/null; then @@ -794,19 +794,16 @@ elif [[ -n "$__CodeName" ]]; then fi fi - # shellcheck disable=SC2086 - suites="$__CodeName $__DebianSuites $(echo $__UbuntuSuites | xargs -n 1 | xargs -I {} echo -n "$__CodeName-{} ")" - PYTHON=${PYTHON_EXECUTABLE:-python3} # shellcheck disable=SC2086,SC2046 echo running "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \ - $(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \ + $(for suite in $__Suites; do echo -n "--suite $suite "; done) \ $__UbuntuPackages # shellcheck disable=SC2086,SC2046 "$PYTHON" "$__CrossDir/install-debs.py" --arch "$__UbuntuArch" --mirror "$__UbuntuRepo" --rootfsdir "$__RootfsDir" --artool "$AR" \ - $(echo $suites | xargs -n 1 | xargs -I {} echo -n "--suite {} ") \ + $(for suite in $__Suites; do echo -n "--suite $suite "; done) \ $__UbuntuPackages exit 0 @@ -837,7 +834,7 @@ elif [[ -n "$__CodeName" ]]; then cat > "$__RootfsDir/etc/apt/sources.list.d/$__CodeName.sources" <