From a8dab49fd500adb7f0c8b79ff4ee8f686912de70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 13 Sep 2024 13:04:35 +0000 Subject: [PATCH 01/17] Update dependencies from https://github.com/dotnet/roslyn build 20240912.9 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.11.0-3.24460.3 -> To Version 4.11.0-3.24462.9 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b1bce81721a6..6a2442043ce3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 7bb270d0f3380ff4adcb5e917fb5a2111d50bbad - + https://github.com/dotnet/roslyn - 5649376e0e5f5db3743a94a62b073f2cce4be5d9 + 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 - + https://github.com/dotnet/roslyn - 5649376e0e5f5db3743a94a62b073f2cce4be5d9 + 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 - + https://github.com/dotnet/roslyn - 5649376e0e5f5db3743a94a62b073f2cce4be5d9 + 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 - + https://github.com/dotnet/roslyn - 5649376e0e5f5db3743a94a62b073f2cce4be5d9 + 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 - + https://github.com/dotnet/roslyn - 5649376e0e5f5db3743a94a62b073f2cce4be5d9 + 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 - + https://github.com/dotnet/roslyn - 5649376e0e5f5db3743a94a62b073f2cce4be5d9 + 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 - + https://github.com/dotnet/roslyn - 5649376e0e5f5db3743a94a62b073f2cce4be5d9 + 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 068c6e79a6fe..954fbd7cd936 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,13 +157,13 @@ - 4.11.0-3.24460.3 - 4.11.0-3.24460.3 - 4.11.0-3.24460.3 - 4.11.0-3.24460.3 - 4.11.0-3.24460.3 - 4.11.0-3.24460.3 - 4.11.0-3.24460.3 + 4.11.0-3.24462.9 + 4.11.0-3.24462.9 + 4.11.0-3.24462.9 + 4.11.0-3.24462.9 + 4.11.0-3.24462.9 + 4.11.0-3.24462.9 + 4.11.0-3.24462.9 $(MicrosoftNetCompilersToolsetPackageVersion) From ddf3716007baa505d45c40e5fb64cc19d7f62b2b Mon Sep 17 00:00:00 2001 From: David Lee Date: Sun, 1 Sep 2024 07:51:21 +0800 Subject: [PATCH 02/17] Fix null reference exception for full global tools update. --- .../commands/dotnet-tool/update/ToolUpdateCommand.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs index 1499142be4c0..42b9dd56417e 100644 --- a/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs +++ b/src/Cli/dotnet/commands/dotnet-tool/update/ToolUpdateCommand.cs @@ -8,6 +8,7 @@ using Microsoft.DotNet.ToolManifest; using Microsoft.DotNet.ToolPackage; using Microsoft.DotNet.Tools.Tool.Common; +using Microsoft.Extensions.EnvironmentAbstractions; using CreateShellShimRepository = Microsoft.DotNet.Tools.Tool.Install.CreateShellShimRepository; namespace Microsoft.DotNet.Tools.Tool.Update @@ -43,16 +44,17 @@ public ToolUpdateCommand( localToolsResolverCache, reporter); + _global = result.GetValue(ToolInstallCommandParser.GlobalOption); + _toolPath = result.GetValue(ToolInstallCommandParser.ToolPathOption); + DirectoryPath? location = string.IsNullOrWhiteSpace(_toolPath) ? null : new DirectoryPath(_toolPath); _toolUpdateGlobalOrToolPathCommand = toolUpdateGlobalOrToolPathCommand ?? new ToolUpdateGlobalOrToolPathCommand( result, createToolPackageStoreDownloaderUninstaller, createShellShimRepository, - reporter); - - _global = result.GetValue(ToolInstallCommandParser.GlobalOption); - _toolPath = result.GetValue(ToolInstallCommandParser.ToolPathOption); + reporter, + ToolPackageFactory.CreateToolPackageStoreQuery(location)); } From 08c9449356a448b897a60b35021e84d6d1582b33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 21 Sep 2024 12:05:59 +0000 Subject: [PATCH 03/17] Update dependencies from https://github.com/dotnet/roslyn build 20240920.10 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.11.0-3.24462.9 -> To Version 4.11.0-3.24470.10 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a2442043ce3..2bbcc13e2d87 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 7bb270d0f3380ff4adcb5e917fb5a2111d50bbad - + https://github.com/dotnet/roslyn - 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 + 40fe659895cf94c3477d3c3d6153c1b05f978d14 - + https://github.com/dotnet/roslyn - 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 + 40fe659895cf94c3477d3c3d6153c1b05f978d14 - + https://github.com/dotnet/roslyn - 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 + 40fe659895cf94c3477d3c3d6153c1b05f978d14 - + https://github.com/dotnet/roslyn - 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 + 40fe659895cf94c3477d3c3d6153c1b05f978d14 - + https://github.com/dotnet/roslyn - 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 + 40fe659895cf94c3477d3c3d6153c1b05f978d14 - + https://github.com/dotnet/roslyn - 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 + 40fe659895cf94c3477d3c3d6153c1b05f978d14 - + https://github.com/dotnet/roslyn - 6ec7736d0dfe33fddb751387925dee1cdaee5bf1 + 40fe659895cf94c3477d3c3d6153c1b05f978d14 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 954fbd7cd936..152f34090fc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,13 +157,13 @@ - 4.11.0-3.24462.9 - 4.11.0-3.24462.9 - 4.11.0-3.24462.9 - 4.11.0-3.24462.9 - 4.11.0-3.24462.9 - 4.11.0-3.24462.9 - 4.11.0-3.24462.9 + 4.11.0-3.24470.10 + 4.11.0-3.24470.10 + 4.11.0-3.24470.10 + 4.11.0-3.24470.10 + 4.11.0-3.24470.10 + 4.11.0-3.24470.10 + 4.11.0-3.24470.10 $(MicrosoftNetCompilersToolsetPackageVersion) From 89548125e75387c7da6b55457f6d3a5fedbb476b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Sep 2024 13:07:27 +0000 Subject: [PATCH 04/17] Update dependencies from https://github.com/dotnet/roslyn build 20240925.2 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.11.0-3.24470.10 -> To Version 4.11.0-3.24475.2 --- NuGet.config | 6 ++++++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1157eba38f0..134c2215e72f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -51,6 +51,12 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bbcc13e2d87..44ea6c7b6f95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 7bb270d0f3380ff4adcb5e917fb5a2111d50bbad - + https://github.com/dotnet/roslyn - 40fe659895cf94c3477d3c3d6153c1b05f978d14 + 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn - 40fe659895cf94c3477d3c3d6153c1b05f978d14 + 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn - 40fe659895cf94c3477d3c3d6153c1b05f978d14 + 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn - 40fe659895cf94c3477d3c3d6153c1b05f978d14 + 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn - 40fe659895cf94c3477d3c3d6153c1b05f978d14 + 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn - 40fe659895cf94c3477d3c3d6153c1b05f978d14 + 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn - 40fe659895cf94c3477d3c3d6153c1b05f978d14 + 4aebda63143f4f79b40b11eeab10db9b103cb889 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 152f34090fc9..c9ae9503134a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,13 +157,13 @@ - 4.11.0-3.24470.10 - 4.11.0-3.24470.10 - 4.11.0-3.24470.10 - 4.11.0-3.24470.10 - 4.11.0-3.24470.10 - 4.11.0-3.24470.10 - 4.11.0-3.24470.10 + 4.11.0-3.24475.2 + 4.11.0-3.24475.2 + 4.11.0-3.24475.2 + 4.11.0-3.24475.2 + 4.11.0-3.24475.2 + 4.11.0-3.24475.2 + 4.11.0-3.24475.2 $(MicrosoftNetCompilersToolsetPackageVersion) From bf300014b5e013be692ff20febd30c6297145b96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Sep 2024 12:11:48 +0000 Subject: [PATCH 05/17] Update dependencies from https://github.com/dotnet/fsharp build 20240927.4 Microsoft.SourceBuild.Intermediate.fsharp , Microsoft.FSharp.Compiler From Version 8.0.401-beta.24421.7 -> To Version 8.0.402-beta.24477.4 --- NuGet.config | 7 +++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1157eba38f0..8a49ff383893 100644 --- a/NuGet.config +++ b/NuGet.config @@ -51,6 +51,13 @@ + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f68c9a02d38d..82aae52e6b57 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -68,13 +68,13 @@ a69bbaaf5f8d7249b8cab7309e81ad2221ce396c - + https://github.com/dotnet/fsharp - af2f522de602281d4ef5a7b71507c428e814c5c1 + 05af489c957d1846f60b2e6b40df3841c0f1cfa6 - + https://github.com/dotnet/fsharp - af2f522de602281d4ef5a7b71507c428e814c5c1 + 05af489c957d1846f60b2e6b40df3841c0f1cfa6 diff --git a/eng/Versions.props b/eng/Versions.props index d7f1d03db028..abab285476fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -153,7 +153,7 @@ - 12.8.401-beta.24421.7 + 12.8.402-beta.24477.4 From 985a32e1314d69bbffe4cbddaa663c9eee767c35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Sep 2024 12:07:21 +0000 Subject: [PATCH 06/17] Update dependencies from https://github.com/dotnet/roslyn build 20240929.3 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.11.0-3.24475.2 -> To Version 4.11.0-3.24479.3 --- NuGet.config | 1 + eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 14 +++++++------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 134c2215e72f..8a49ff383893 100644 --- a/NuGet.config +++ b/NuGet.config @@ -51,6 +51,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44ea6c7b6f95..862cc8bb1433 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,32 +82,32 @@ 7bb270d0f3380ff4adcb5e917fb5a2111d50bbad - + https://github.com/dotnet/roslyn 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn 4aebda63143f4f79b40b11eeab10db9b103cb889 - + https://github.com/dotnet/roslyn 4aebda63143f4f79b40b11eeab10db9b103cb889 diff --git a/eng/Versions.props b/eng/Versions.props index c9ae9503134a..a06975fe7a2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,13 +157,13 @@ - 4.11.0-3.24475.2 - 4.11.0-3.24475.2 - 4.11.0-3.24475.2 - 4.11.0-3.24475.2 - 4.11.0-3.24475.2 - 4.11.0-3.24475.2 - 4.11.0-3.24475.2 + 4.11.0-3.24479.3 + 4.11.0-3.24479.3 + 4.11.0-3.24479.3 + 4.11.0-3.24479.3 + 4.11.0-3.24479.3 + 4.11.0-3.24479.3 + 4.11.0-3.24479.3 $(MicrosoftNetCompilersToolsetPackageVersion) From 56a20a398e26a0324a6796baba939c1276f57512 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Oct 2024 15:54:00 -0700 Subject: [PATCH 07/17] Update branding to 8.0.404 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d7f1d03db028..479db3acb01d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.403 + 8.0.404 8.0.400 true From a287ed92d4ebd1d201de218878415cc669d2f4fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Oct 2024 22:50:07 +0000 Subject: [PATCH 08/17] Update dependencies from https://github.com/dotnet/razor build 20241001.2 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24453.9 -> To Version 9.0.0-preview.24501.2 --- NuGet.config | 1 + eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a49ff383893..0f4182d95ce2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -57,6 +57,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb6cefb65e2f..5bbdb6e1b930 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -289,18 +289,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 954f61dd38b33caa2b736c73530bd5a294174437 - + https://github.com/dotnet/razor - 41acbdeb665c11bf26fea16b017ebf54e6a74e22 + 19b715d1342849b2ac876aab8abc76208c5094b3 - + https://github.com/dotnet/razor - 41acbdeb665c11bf26fea16b017ebf54e6a74e22 + 19b715d1342849b2ac876aab8abc76208c5094b3 - + https://github.com/dotnet/razor - 41acbdeb665c11bf26fea16b017ebf54e6a74e22 + 19b715d1342849b2ac876aab8abc76208c5094b3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 53c461bc6fd2..9a35656f8236 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,9 +178,9 @@ - 9.0.0-preview.24453.9 - 9.0.0-preview.24453.9 - 9.0.0-preview.24453.9 + 9.0.0-preview.24501.2 + 9.0.0-preview.24501.2 + 9.0.0-preview.24501.2 From d66326b754f6a8d49d74de3c48c79579ed07e2ff Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 2 Oct 2024 22:52:41 +0000 Subject: [PATCH 09/17] Update dependencies from https://github.com/dotnet/arcade build 20240925.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24461.2 -> To Version 8.0.0-beta.24475.3 --- NuGet.config | 1 + eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a49ff383893..0f4182d95ce2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -57,6 +57,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb6cefb65e2f..9b998d6cd875 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -487,22 +487,22 @@ - + https://github.com/dotnet/arcade - 0028fccccc2181a64c5c4a283ac0baae3913284b + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 - + https://github.com/dotnet/arcade - 0028fccccc2181a64c5c4a283ac0baae3913284b + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 - + https://github.com/dotnet/arcade - 0028fccccc2181a64c5c4a283ac0baae3913284b + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 - + https://github.com/dotnet/arcade - 0028fccccc2181a64c5c4a283ac0baae3913284b + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 53c461bc6fd2..57e128e6cb56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.24461.2 + 8.0.0-beta.24475.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -212,7 +212,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24461.2 + 8.0.0-beta.24475.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 0277edd823ee..2f47fc0a873e 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24461.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24461.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24475.3" } } From 73d4d59957192adf6a575b3d4083ce642a4542fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Oct 2024 12:19:24 +0000 Subject: [PATCH 10/17] Update dependencies from https://github.com/dotnet/roslyn build 20241002.13 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.11.0-3.24479.3 -> To Version 4.11.0-3.24502.13 --- NuGet.config | 1 + eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a49ff383893..0f4182d95ce2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -57,6 +57,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb6cefb65e2f..164ef85f29bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 7bb270d0f3380ff4adcb5e917fb5a2111d50bbad - + https://github.com/dotnet/roslyn - 4aebda63143f4f79b40b11eeab10db9b103cb889 + e8b0250806b741a3476e008993c864aa73ae7725 - + https://github.com/dotnet/roslyn - 4aebda63143f4f79b40b11eeab10db9b103cb889 + e8b0250806b741a3476e008993c864aa73ae7725 - + https://github.com/dotnet/roslyn - 4aebda63143f4f79b40b11eeab10db9b103cb889 + e8b0250806b741a3476e008993c864aa73ae7725 - + https://github.com/dotnet/roslyn - 4aebda63143f4f79b40b11eeab10db9b103cb889 + e8b0250806b741a3476e008993c864aa73ae7725 - + https://github.com/dotnet/roslyn - 4aebda63143f4f79b40b11eeab10db9b103cb889 + e8b0250806b741a3476e008993c864aa73ae7725 - + https://github.com/dotnet/roslyn - 4aebda63143f4f79b40b11eeab10db9b103cb889 + e8b0250806b741a3476e008993c864aa73ae7725 - + https://github.com/dotnet/roslyn - 4aebda63143f4f79b40b11eeab10db9b103cb889 + e8b0250806b741a3476e008993c864aa73ae7725 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 53c461bc6fd2..65f87a5788d0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,13 +157,13 @@ - 4.11.0-3.24479.3 - 4.11.0-3.24479.3 - 4.11.0-3.24479.3 - 4.11.0-3.24479.3 - 4.11.0-3.24479.3 - 4.11.0-3.24479.3 - 4.11.0-3.24479.3 + 4.11.0-3.24502.13 + 4.11.0-3.24502.13 + 4.11.0-3.24502.13 + 4.11.0-3.24502.13 + 4.11.0-3.24502.13 + 4.11.0-3.24502.13 + 4.11.0-3.24502.13 $(MicrosoftNetCompilersToolsetPackageVersion) From 07b5fe8483c0a12125a5b7053f1715ff042a707a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Oct 2024 12:19:58 +0000 Subject: [PATCH 11/17] Update dependencies from https://github.com/dotnet/razor build 20241002.7 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24501.2 -> To Version 9.0.0-preview.24502.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bbdb6e1b930..37adcc8771a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -289,18 +289,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 954f61dd38b33caa2b736c73530bd5a294174437 - + https://github.com/dotnet/razor - 19b715d1342849b2ac876aab8abc76208c5094b3 + 8b1b103ae8587094180fd43303622205c83e2f71 - + https://github.com/dotnet/razor - 19b715d1342849b2ac876aab8abc76208c5094b3 + 8b1b103ae8587094180fd43303622205c83e2f71 - + https://github.com/dotnet/razor - 19b715d1342849b2ac876aab8abc76208c5094b3 + 8b1b103ae8587094180fd43303622205c83e2f71 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9a35656f8236..24a908d7ec14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,9 +178,9 @@ - 9.0.0-preview.24501.2 - 9.0.0-preview.24501.2 - 9.0.0-preview.24501.2 + 9.0.0-preview.24502.7 + 9.0.0-preview.24502.7 + 9.0.0-preview.24502.7 From d3a3cea5387a209059af7a514d4b126ffef722d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 4 Oct 2024 12:49:42 +0000 Subject: [PATCH 12/17] Update dependencies from https://github.com/dotnet/roslyn build 20241003.19 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.11.0-3.24502.13 -> To Version 4.11.0-3.24503.19 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5361c26f3fcc..933215506f0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 7bb270d0f3380ff4adcb5e917fb5a2111d50bbad - + https://github.com/dotnet/roslyn - e8b0250806b741a3476e008993c864aa73ae7725 + 1774597b08061480402650b1b30f8a3745d45a50 - + https://github.com/dotnet/roslyn - e8b0250806b741a3476e008993c864aa73ae7725 + 1774597b08061480402650b1b30f8a3745d45a50 - + https://github.com/dotnet/roslyn - e8b0250806b741a3476e008993c864aa73ae7725 + 1774597b08061480402650b1b30f8a3745d45a50 - + https://github.com/dotnet/roslyn - e8b0250806b741a3476e008993c864aa73ae7725 + 1774597b08061480402650b1b30f8a3745d45a50 - + https://github.com/dotnet/roslyn - e8b0250806b741a3476e008993c864aa73ae7725 + 1774597b08061480402650b1b30f8a3745d45a50 - + https://github.com/dotnet/roslyn - e8b0250806b741a3476e008993c864aa73ae7725 + 1774597b08061480402650b1b30f8a3745d45a50 - + https://github.com/dotnet/roslyn - e8b0250806b741a3476e008993c864aa73ae7725 + 1774597b08061480402650b1b30f8a3745d45a50 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index b34203246bcc..c8510117eb6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,13 +157,13 @@ - 4.11.0-3.24502.13 - 4.11.0-3.24502.13 - 4.11.0-3.24502.13 - 4.11.0-3.24502.13 - 4.11.0-3.24502.13 - 4.11.0-3.24502.13 - 4.11.0-3.24502.13 + 4.11.0-3.24503.19 + 4.11.0-3.24503.19 + 4.11.0-3.24503.19 + 4.11.0-3.24503.19 + 4.11.0-3.24503.19 + 4.11.0-3.24503.19 + 4.11.0-3.24503.19 $(MicrosoftNetCompilersToolsetPackageVersion) From 29991fa80a27055780b595de2c9d23e244de1ac5 Mon Sep 17 00:00:00 2001 From: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com> Date: Fri, 4 Oct 2024 22:05:53 +0200 Subject: [PATCH 13/17] [DO NOT MERGE] Restore ability for users to consume the containers package easily (#43794) Co-authored-by: Chet Husk --- .../Microsoft.NET.Build.Containers/KnownStrings.cs | 6 ++++++ .../packaging/build/Microsoft.NET.Build.Containers.targets | 1 + src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets | 6 ++++-- .../EndToEndTests.cs | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs b/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs index 82df9dc64404..ed6b31031841 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/KnownStrings.cs @@ -48,8 +48,14 @@ public static class Items public static class ErrorCodes { + // current version doesn't support containerization public static readonly string CONTAINER002 = nameof(CONTAINER002); + // containerimagename rename public static readonly string CONTAINER003 = nameof(CONTAINER003); + // generic http error + public static readonly string CONTAINER004 = nameof(CONTAINER004); + // don't use the containers package + public static readonly string CONTAINER005 = nameof(CONTAINER005); public static readonly string CONTAINER1011 = nameof(CONTAINER1011); public static readonly string CONTAINER1012 = nameof(CONTAINER1012); public static readonly string CONTAINER1013 = nameof(CONTAINER1013); diff --git a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets index 0a880a3b710c..16c70d8e09dc 100644 --- a/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets +++ b/src/Containers/packaging/build/Microsoft.NET.Build.Containers.targets @@ -222,6 +222,7 @@ ($(_SdkCanPublishWorker) and $(_IsWorkerProject)) or ($(_SdkCanPublishConsole) and '$(EnableSdkContainerSupport)' == 'true') )" + Code="CONTAINER005" Text="The $(_ContainersPackageIdentity) NuGet package is explicitly referenced but the current SDK can natively publish the project as a container. Consider removing the package reference to $(_ContainersPackageIdentity) because it is no longer needed." /> diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets index a506081a2017..3d68d1de7830 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/sdk/Sdk.targets @@ -55,12 +55,14 @@ Copyright (c) .NET Foundation. All rights reserved. - <_ContainersTargetsDir Condition=" '$(_ContainersTargetsDir)'=='' ">$(MSBuildThisFileDirectory)..\..\..\Containers\build\ + <_IsNotSetContainersTargetsDir>false + <_IsNotSetContainersTargetsDir Condition=" '$(_ContainersTargetsDir)'=='' ">true + <_ContainersTargetsDir Condition="$(_IsNotSetContainersTargetsDir)">$(MSBuildThisFileDirectory)..\..\..\Containers\build\ + Condition="$(_IsNotSetContainersTargetsDir) AND Exists('$(_ContainersTargetsDir)Microsoft.NET.Build.Containers.targets') AND '$(TargetFramework)' != ''" /> diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index d78b88cc211b..efe6ddcd039f 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -369,7 +369,7 @@ public async Task EndToEnd_NoAPI_ProjectType(string projectType, bool addPackage if (addPackageReference) { - commandResult.Should().HaveStdOutContaining("warning : The Microsoft.NET.Build.Containers NuGet package is explicitly referenced but the current SDK can natively publish the project as a container. Consider removing the package reference to Microsoft.NET.Build.Containers because it is no longer needed."); + commandResult.Should().HaveStdOutContaining("warning CONTAINER005: The Microsoft.NET.Build.Containers NuGet package is explicitly referenced but the current SDK can natively publish the project as a container. Consider removing the package reference to Microsoft.NET.Build.Containers because it is no longer needed."); } else { From 7d35c46d671614d1a8b259455668dbf00b3bd8bf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 5 Oct 2024 12:54:05 +0000 Subject: [PATCH 14/17] Update dependencies from https://github.com/dotnet/roslyn build 20241004.6 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.11.0-3.24503.19 -> To Version 4.11.0-3.24504.6 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 933215506f0e..d9c9103f566a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -82,34 +82,34 @@ 7bb270d0f3380ff4adcb5e917fb5a2111d50bbad - + https://github.com/dotnet/roslyn - 1774597b08061480402650b1b30f8a3745d45a50 + 5a06a4caf73c5b086776763ebbee36c9b51c515e - + https://github.com/dotnet/roslyn - 1774597b08061480402650b1b30f8a3745d45a50 + 5a06a4caf73c5b086776763ebbee36c9b51c515e - + https://github.com/dotnet/roslyn - 1774597b08061480402650b1b30f8a3745d45a50 + 5a06a4caf73c5b086776763ebbee36c9b51c515e - + https://github.com/dotnet/roslyn - 1774597b08061480402650b1b30f8a3745d45a50 + 5a06a4caf73c5b086776763ebbee36c9b51c515e - + https://github.com/dotnet/roslyn - 1774597b08061480402650b1b30f8a3745d45a50 + 5a06a4caf73c5b086776763ebbee36c9b51c515e - + https://github.com/dotnet/roslyn - 1774597b08061480402650b1b30f8a3745d45a50 + 5a06a4caf73c5b086776763ebbee36c9b51c515e - + https://github.com/dotnet/roslyn - 1774597b08061480402650b1b30f8a3745d45a50 + 5a06a4caf73c5b086776763ebbee36c9b51c515e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c8510117eb6b..ccfd8e0e7fd2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -157,13 +157,13 @@ - 4.11.0-3.24503.19 - 4.11.0-3.24503.19 - 4.11.0-3.24503.19 - 4.11.0-3.24503.19 - 4.11.0-3.24503.19 - 4.11.0-3.24503.19 - 4.11.0-3.24503.19 + 4.11.0-3.24504.6 + 4.11.0-3.24504.6 + 4.11.0-3.24504.6 + 4.11.0-3.24504.6 + 4.11.0-3.24504.6 + 4.11.0-3.24504.6 + 4.11.0-3.24504.6 $(MicrosoftNetCompilersToolsetPackageVersion) From bd78418f613d0148a95fe4b6f057cd3d38d8550f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 6 Oct 2024 19:04:03 -0500 Subject: [PATCH 15/17] [release/8.0.4xx] [Containers] Fix parsing and error reporting of ports that lack port type metadata (#43934) Co-authored-by: Chet Husk --- .../ContainerHelpers.cs | 12 ++++++------ .../PublicAPI/net472/PublicAPI.Unshipped.txt | 8 ++++---- .../PublicAPI/net8.0/PublicAPI.Unshipped.txt | 8 ++++---- .../ContainerHelpersTests.cs | 2 +- src/Tests/containerize.UnitTests/ParserTests.cs | 6 +++--- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs b/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs index 3a1ff7b8d004..46d1b7ba3cae 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs @@ -41,10 +41,10 @@ public static class ContainerHelpers [Flags] public enum ParsePortError { - MissingPortNumber, - InvalidPortNumber, - InvalidPortType, - UnknownPortFormat + MissingPortNumber = 1, + InvalidPortNumber = 2, + InvalidPortType = 4, + UnknownPortFormat = 8 } /// @@ -68,9 +68,9 @@ public static bool TryParsePort(string? portNumber, string? portType, [NotNullWh error = ParsePortError.InvalidPortNumber; } - if (!Enum.TryParse(portType, out PortType t)) + if (!Enum.TryParse(portType, out PortType t)) { - if (portType is not null) + if (!string.IsNullOrEmpty(portType)) { error = (error ?? ParsePortError.InvalidPortType) | ParsePortError.InvalidPortType; } diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt index adf04ca7a59b..6dd6551ddb37 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt +++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net472/PublicAPI.Unshipped.txt @@ -1,9 +1,9 @@ Microsoft.NET.Build.Containers.ContainerHelpers Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError -Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortNumber = 1 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError -Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortType = 2 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError -Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.MissingPortNumber = 0 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError -Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.UnknownPortFormat = Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortNumber | Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortType -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError +Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortNumber = 2 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError +Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortType = 4 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError +Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.MissingPortNumber = 1 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError +Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.UnknownPortFormat = 8 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError Microsoft.NET.Build.Containers.Port Microsoft.NET.Build.Containers.Port.Deconstruct(out int Number, out Microsoft.NET.Build.Containers.PortType Type) -> void Microsoft.NET.Build.Containers.Port.Equals(Microsoft.NET.Build.Containers.Port other) -> bool diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt index 698c2894586b..c1a657fc58b9 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt +++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt @@ -21,10 +21,10 @@ Microsoft.NET.Build.Containers.Tasks.ComputeDotnetBaseImageAndTag.UsesInvariantG static readonly Microsoft.NET.Build.Containers.Constants.Version -> string! Microsoft.NET.Build.Containers.ContainerHelpers Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError -Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortNumber = 1 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError -Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortType = 2 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError -Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.MissingPortNumber = 0 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError -Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.UnknownPortFormat = Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortNumber | Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortType -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError +Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortNumber = 2 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError +Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.InvalidPortType = 4 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError +Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.MissingPortNumber = 1 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError +Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError.UnknownPortFormat = 8 -> Microsoft.NET.Build.Containers.ContainerHelpers.ParsePortError Microsoft.NET.Build.Containers.Descriptor Microsoft.NET.Build.Containers.Descriptor.Annotations.get -> System.Collections.Generic.Dictionary? Microsoft.NET.Build.Containers.Descriptor.Annotations.init -> void diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ContainerHelpersTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ContainerHelpersTests.cs index 4d83f91b175c..ecf0cf61f691 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ContainerHelpersTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/ContainerHelpersTests.cs @@ -109,7 +109,7 @@ public void IsValidImageTag_InvalidLength() [InlineData("80", true, 80, PortType.tcp, null)] [InlineData("125/dup", false, 125, PortType.tcp, ContainerHelpers.ParsePortError.InvalidPortType)] [InlineData("invalidNumber", false, null, null, ContainerHelpers.ParsePortError.InvalidPortNumber)] - [InlineData("welp/unknowntype", false, null, null, (ContainerHelpers.ParsePortError)3)] + [InlineData("welp/unknowntype", false, null, null, (ContainerHelpers.ParsePortError)6)] [InlineData("a/b/c", false, null, null, ContainerHelpers.ParsePortError.UnknownPortFormat)] [InlineData("/tcp", false, null, null, ContainerHelpers.ParsePortError.MissingPortNumber)] public void CanParsePort(string input, bool shouldParse, int? expectedPortNumber, PortType? expectedType, ContainerHelpers.ParsePortError? expectedError) { diff --git a/src/Tests/containerize.UnitTests/ParserTests.cs b/src/Tests/containerize.UnitTests/ParserTests.cs index 7a43de11b233..079d3068d1ae 100644 --- a/src/Tests/containerize.UnitTests/ParserTests.cs +++ b/src/Tests/containerize.UnitTests/ParserTests.cs @@ -204,9 +204,9 @@ public void CanParsePorts() } [Theory] - [InlineData("1501/smth", "(MissingPortNumber, InvalidPortType)")] - [InlineData("1501\\tcp", "(MissingPortNumber, InvalidPortNumber)")] - [InlineData("not-a-number", "(MissingPortNumber, InvalidPortNumber)")] + [InlineData("1501/smth", "(InvalidPortType)")] + [InlineData("1501\\tcp", "(InvalidPortNumber)")] + [InlineData("not-a-number", "(InvalidPortNumber)")] public void CanHandleInvalidPorts(string portStr, string reason) { string errorMessage = $"Incorrectly formatted ports:{Environment.NewLine}\t{portStr}:\t{reason}{Environment.NewLine}"; From 3d5723814265d7020b88c248ae21c44ea6033e61 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:27:10 -0500 Subject: [PATCH 16/17] [release/8.0.4xx] Allow reading of OCI Image Indexes to determine RID-specific base image for multi-architecture images (#43914) Co-authored-by: Chet Husk --- .../ManifestListV2.cs | 2 + .../PublicAPI/net8.0/PublicAPI.Unshipped.txt | 18 +++++- .../Registry/HttpExtensions.cs | 18 ++++-- .../Registry/Registry.cs | 59 ++++++++++++++++--- .../Registry/SchemaTypes.cs | 1 + 5 files changed, 84 insertions(+), 14 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/ManifestListV2.cs b/src/Containers/Microsoft.NET.Build.Containers/ManifestListV2.cs index 44a294d65473..b75547d8f166 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ManifestListV2.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ManifestListV2.cs @@ -10,3 +10,5 @@ public record struct ManifestListV2(int schemaVersion, string mediaType, Platfor public record struct PlatformInformation(string architecture, string os, string? variant, string[] features, [property: JsonPropertyName("os.version")][field: JsonPropertyName("os.version")] string? version); public record struct PlatformSpecificManifest(string mediaType, long size, string digest, PlatformInformation platform); + +public record struct ImageIndexV1(int schemaVersion, string mediaType, PlatformSpecificManifest[] manifests); diff --git a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt index c1a657fc58b9..8e7f42f35d3f 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt +++ b/src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net8.0/PublicAPI.Unshipped.txt @@ -72,6 +72,15 @@ Microsoft.NET.Build.Containers.ManifestListV2.mediaType.get -> string! Microsoft.NET.Build.Containers.ManifestListV2.mediaType.set -> void Microsoft.NET.Build.Containers.ManifestListV2.schemaVersion.get -> int Microsoft.NET.Build.Containers.ManifestListV2.schemaVersion.set -> void +Microsoft.NET.Build.Containers.ImageIndexV1 +Microsoft.NET.Build.Containers.ImageIndexV1.ImageIndexV1() -> void +Microsoft.NET.Build.Containers.ImageIndexV1.ImageIndexV1(int schemaVersion, string! mediaType, Microsoft.NET.Build.Containers.PlatformSpecificManifest[]! manifests) -> void +Microsoft.NET.Build.Containers.ImageIndexV1.manifests.get -> Microsoft.NET.Build.Containers.PlatformSpecificManifest[]! +Microsoft.NET.Build.Containers.ImageIndexV1.manifests.set -> void +Microsoft.NET.Build.Containers.ImageIndexV1.mediaType.get -> string! +Microsoft.NET.Build.Containers.ImageIndexV1.mediaType.set -> void +Microsoft.NET.Build.Containers.ImageIndexV1.schemaVersion.get -> int +Microsoft.NET.Build.Containers.ImageIndexV1.schemaVersion.set -> void Microsoft.NET.Build.Containers.ManifestV2 Microsoft.NET.Build.Containers.ManifestV2.Config.get -> Microsoft.NET.Build.Containers.ManifestConfig Microsoft.NET.Build.Containers.ManifestV2.Config.init -> void @@ -268,4 +277,11 @@ static Microsoft.NET.Build.Containers.ManifestListV2.operator ==(Microsoft.NET.B override Microsoft.NET.Build.Containers.ManifestListV2.GetHashCode() -> int ~override Microsoft.NET.Build.Containers.ManifestListV2.Equals(object obj) -> bool Microsoft.NET.Build.Containers.ManifestListV2.Equals(Microsoft.NET.Build.Containers.ManifestListV2 other) -> bool -Microsoft.NET.Build.Containers.ManifestListV2.Deconstruct(out int schemaVersion, out string! mediaType, out Microsoft.NET.Build.Containers.PlatformSpecificManifest[]! manifests) -> void \ No newline at end of file +Microsoft.NET.Build.Containers.ManifestListV2.Deconstruct(out int schemaVersion, out string! mediaType, out Microsoft.NET.Build.Containers.PlatformSpecificManifest[]! manifests) -> void +~override Microsoft.NET.Build.Containers.ImageIndexV1.ToString() -> string +static Microsoft.NET.Build.Containers.ImageIndexV1.operator !=(Microsoft.NET.Build.Containers.ImageIndexV1 left, Microsoft.NET.Build.Containers.ImageIndexV1 right) -> bool +static Microsoft.NET.Build.Containers.ImageIndexV1.operator ==(Microsoft.NET.Build.Containers.ImageIndexV1 left, Microsoft.NET.Build.Containers.ImageIndexV1 right) -> bool +override Microsoft.NET.Build.Containers.ImageIndexV1.GetHashCode() -> int +~override Microsoft.NET.Build.Containers.ImageIndexV1.Equals(object obj) -> bool +Microsoft.NET.Build.Containers.ImageIndexV1.Equals(Microsoft.NET.Build.Containers.ImageIndexV1 other) -> bool +Microsoft.NET.Build.Containers.ImageIndexV1.Deconstruct(out int schemaVersion, out string! mediaType, out Microsoft.NET.Build.Containers.PlatformSpecificManifest[]! manifests) -> void \ No newline at end of file diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/HttpExtensions.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/HttpExtensions.cs index 09d2274467db..5439d3755aa7 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/HttpExtensions.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/HttpExtensions.cs @@ -1,21 +1,27 @@ // Copyright (c) .NET Foundation and contributors. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -// +using System.Net.Http.Headers; using Microsoft.Extensions.Logging; +using NuGet.Packaging; namespace Microsoft.NET.Build.Containers; internal static class HttpExtensions { + private static readonly MediaTypeWithQualityHeaderValue[] _knownManifestFormats = [ + new("application/json"), + new(SchemaTypes.DockerManifestListV2), + new(SchemaTypes.OciImageIndexV1), + new(SchemaTypes.DockerManifestV2), + new(SchemaTypes.OciManifestV1), + new(SchemaTypes.DockerContainerV1), + ]; + internal static HttpRequestMessage AcceptManifestFormats(this HttpRequestMessage request) { request.Headers.Accept.Clear(); - request.Headers.Accept.Add(new("application/json")); - request.Headers.Accept.Add(new(SchemaTypes.DockerManifestListV2)); - request.Headers.Accept.Add(new(SchemaTypes.DockerManifestV2)); - request.Headers.Accept.Add(new(SchemaTypes.OciManifestV1)); - request.Headers.Accept.Add(new(SchemaTypes.DockerContainerV1)); + request.Headers.Accept.AddRange(_knownManifestFormats); return request; } diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs index b5bd47226a05..6f64ec7d4f64 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs @@ -81,7 +81,7 @@ internal Registry(string registryName, ILogger logger, IRegistryAPI registryAPI, this(new Uri($"https://{registryName}"), logger, registryAPI, settings) { } - internal Registry(string registryName, ILogger logger, RegistryMode mode, RegistrySettings? settings = null) : + internal Registry(string registryName, ILogger logger, RegistryMode mode, RegistrySettings? settings = null) : this(new Uri($"https://{registryName}"), logger, new RegistryApiFactory(mode), settings) { } @@ -191,6 +191,14 @@ await initialManifestResponse.Content.ReadFromJsonAsync(cancella runtimeIdentifier, manifestPicker, cancellationToken).ConfigureAwait(false), + SchemaTypes.OciImageIndexV1 => + await PickBestImageFromImageIndexAsync( + repositoryName, + reference, + await initialManifestResponse.Content.ReadFromJsonAsync(cancellationToken: cancellationToken).ConfigureAwait(false), + runtimeIdentifier, + manifestPicker, + cancellationToken).ConfigureAwait(false), var unknownMediaType => throw new NotImplementedException(Resource.FormatString( nameof(Strings.UnknownMediaType), repositoryName, @@ -236,10 +244,10 @@ private async Task ReadSingleImageAsync(string repositoryName, Man } - private static IReadOnlyDictionary GetManifestsByRid(ManifestListV2 manifestList) + private static IReadOnlyDictionary GetManifestsByRid(PlatformSpecificManifest[] manifestList) { var ridDict = new Dictionary(); - foreach (var manifest in manifestList.manifests) + foreach (var manifest in manifestList) { if (CreateRidForPlatform(manifest.platform) is { } rid) { @@ -291,14 +299,51 @@ private async Task PickBestImageFromManifestListAsync( CancellationToken cancellationToken) { cancellationToken.ThrowIfCancellationRequested(); - var ridManifestDict = GetManifestsByRid(manifestList); - if (manifestPicker.PickBestManifestForRid(ridManifestDict, runtimeIdentifier) is PlatformSpecificManifest matchingManifest) + var ridManifestDict = GetManifestsByRid(manifestList.manifests); + return await PickBestImageFromManifestsAsync( + repositoryName, + reference, + ridManifestDict, + runtimeIdentifier, + manifestPicker, + cancellationToken).ConfigureAwait(false); + } + + private async Task PickBestImageFromImageIndexAsync( + string repositoryName, + string reference, + ImageIndexV1 index, + string runtimeIdentifier, + IManifestPicker manifestPicker, + CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + var ridManifestDict = GetManifestsByRid(index.manifests); + return await PickBestImageFromManifestsAsync( + repositoryName, + reference, + ridManifestDict, + runtimeIdentifier, + manifestPicker, + cancellationToken).ConfigureAwait(false); + } + + private async Task PickBestImageFromManifestsAsync( + string repositoryName, + string reference, + IReadOnlyDictionary knownManifests, + string runtimeIdentifier, + IManifestPicker manifestPicker, + CancellationToken cancellationToken) + { + cancellationToken.ThrowIfCancellationRequested(); + if (manifestPicker.PickBestManifestForRid(knownManifests, runtimeIdentifier) is PlatformSpecificManifest matchingManifest) { using HttpResponseMessage manifestResponse = await _registryAPI.Manifest.GetAsync(repositoryName, matchingManifest.digest, cancellationToken).ConfigureAwait(false); cancellationToken.ThrowIfCancellationRequested(); var manifest = await manifestResponse.Content.ReadFromJsonAsync(cancellationToken: cancellationToken).ConfigureAwait(false); - if (manifest is null) throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, ridManifestDict.Keys); + if (manifest is null) throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, knownManifests.Keys); manifest.KnownDigest = matchingManifest.digest; return await ReadSingleImageAsync( repositoryName, @@ -307,7 +352,7 @@ private async Task PickBestImageFromManifestListAsync( } else { - throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, ridManifestDict.Keys); + throw new BaseImageNotFoundException(runtimeIdentifier, repositoryName, reference, knownManifests.Keys); } } diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs index d740c7621ecc..8021f652f72d 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/SchemaTypes.cs @@ -10,6 +10,7 @@ internal class SchemaTypes internal const string DockerManifestListV2 = "application/vnd.docker.distribution.manifest.list.v2+json"; internal const string DockerManifestV2 = "application/vnd.docker.distribution.manifest.v2+json"; internal const string OciManifestV1 = "application/vnd.oci.image.manifest.v1+json"; // https://containers.gitbook.io/build-containers-the-hard-way/#registry-format-oci-image-manifest + internal const string OciImageIndexV1 = "application/vnd.oci.image.index.v1+json"; internal const string DockerLayerGzip = "application/vnd.docker.image.rootfs.diff.tar.gzip"; internal const string OciLayerGzipV1 = "application/vnd.oci.image.layer.v1.tar+gzip"; } From d02a393168fc25aa65a9daaa0713a44ad99e9646 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Oct 2024 12:29:10 +0000 Subject: [PATCH 17/17] Update dependencies from https://github.com/dotnet/arcade build 20241004.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24504.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9c9103f566a..6b5bf1179e77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -487,22 +487,22 @@ - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + 103916ccdbe7f4ab2e194068a1a3cd330542601f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ccfd8e0e7fd2..b47dbb2bf8b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.24475.3 + 8.0.0-beta.24504.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -212,7 +212,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24475.3 + 8.0.0-beta.24504.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 2f47fc0a873e..57d319093292 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24475.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2" } }