From f1b61ba8177b7f4ae0b053c53003c2fb21bf1ee8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 12 Jul 2024 22:04:19 +0000 Subject: [PATCH 01/32] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240708.8 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.7-servicing.24314.2 -> To Version 8.0.8-servicing.24358.8 --- NuGet.config | 12 ++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad96f900fb61..54c77e0711a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,11 +14,7 @@ - - - - - + @@ -71,11 +67,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8d144f0c4aa..2fd6b9176a72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,13 +107,13 @@ https://github.com/dotnet/roslyn 26240cf3e46e45a9fc8c879f793793defe2c0b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 https://github.com/nuget/nuget.client @@ -236,50 +236,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 43bb8cc831c2658e1117415019264bfe6f644f94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 https://github.com/dotnet/razor @@ -294,21 +294,21 @@ https://github.com/dotnet/razor ea83da42ade2a5e193507d780559d79f0cb16c75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 https://github.com/dotnet/xdt @@ -425,9 +425,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + fa60f23c1e50c731e37761ac88708f787a1bee97 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 493daa074bb8..1dd294d158b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,7 +65,7 @@ 8.0.7 8.0.0 8.0.0 - 8.0.7 + 8.0.8 8.0.0 8.0.0 8.0.0 @@ -166,13 +166,13 @@ - 8.0.7 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7 + 8.0.8 + 8.0.8-servicing.24358.8 + 8.0.8-servicing.24358.8 + 8.0.8-servicing.24358.8 + 8.0.8-servicing.24358.8 + 8.0.8-servicing.24358.8 + 8.0.8 From 6d8390918180f04e60589fe526a821242a3261c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 12 Jul 2024 22:05:06 +0000 Subject: [PATCH 02/32] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240702.10 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Security.Cryptography.Xml , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.1 -> To Version 8.0.1 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.7 -> To Version 8.0.7 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 18 +++-------------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 12 +++++------ 3 files changed, 31 insertions(+), 43 deletions(-) diff --git a/NuGet.config b/NuGet.config index 54c77e0711a5..d1cae4706de7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,7 @@ - - - - - + @@ -22,11 +18,7 @@ - - - - - + @@ -72,11 +64,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2fd6b9176a72..18627aa13217 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -10,46 +10,46 @@ https://github.com/dotnet/templating b99f176daf9c78f315701025a071a453400dd4e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + be13dabf6f89f0ee48705e71c5ccee961e200934 https://github.com/dotnet/msbuild @@ -196,9 +196,9 @@ https://github.com/microsoft/vstest 910ca0dcc779068418464794f5af570eda195222 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -415,7 +415,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -467,7 +467,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1dd294d158b8..c73927fbdecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -50,19 +50,19 @@ - 8.0.7 - 8.0.7-servicing.24313.11 - 8.0.7 + 8.0.8 + 8.0.8-servicing.24352.10 + 8.0.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.1 - 8.0.7 - 8.0.7-servicing.24313.11 + 8.0.8 + 8.0.8-servicing.24352.10 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.0 8.0.1 8.0.0 - 8.0.7 + 8.0.8 8.0.0 8.0.0 8.0.8 From 9e98c56a173899aabe8fcc423edecc7ed391583d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 12 Jul 2024 22:05:41 +0000 Subject: [PATCH 03/32] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240710.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.7 -> To Version 8.0.8 --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index d1cae4706de7..117fe29e1add 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,11 +23,7 @@ - - - - - + @@ -67,11 +63,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 18627aa13217..7879a9e7e2d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -216,21 +216,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a https://dev.azure.com/dnceng/internal/_git/dotnet-wpf From 636a95ef147d55906f5c4d35f38d928cd892f824 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 13 Jul 2024 04:54:30 +0000 Subject: [PATCH 04/32] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240712.9 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.7-servicing.24314.2 -> To Version 8.0.8-servicing.24362.9 --- NuGet.config | 4 +-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 117fe29e1add..ebfdf67f96f8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7879a9e7e2d2..79913e1f9811 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,13 +107,13 @@ https://github.com/dotnet/roslyn 26240cf3e46e45a9fc8c879f793793defe2c0b2a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://github.com/nuget/nuget.client @@ -238,48 +238,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://github.com/dotnet/razor @@ -296,19 +296,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://github.com/dotnet/xdt @@ -427,7 +427,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fa60f23c1e50c731e37761ac88708f787a1bee97 + 3483d65ea57ac7711115b873fa815b05c7a624e1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c73927fbdecc..81ae1186968c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,11 +167,11 @@ 8.0.8 - 8.0.8-servicing.24358.8 - 8.0.8-servicing.24358.8 - 8.0.8-servicing.24358.8 - 8.0.8-servicing.24358.8 - 8.0.8-servicing.24358.8 + 8.0.8-servicing.24362.9 + 8.0.8-servicing.24362.9 + 8.0.8-servicing.24362.9 + 8.0.8-servicing.24362.9 + 8.0.8-servicing.24362.9 8.0.8 From 9f498c3f26fe91a8f0fce06ac1d108474a962504 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Jul 2024 22:58:36 +0000 Subject: [PATCH 05/32] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20240716.12 Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0 From Version 8.0.8-servicing.24352.10 -> To Version 8.0.8-servicing.24366.12 Dependency coherency updates Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.7 -> To Version 8.0.8 (parent: Microsoft.NETCore.App.Runtime.win-x64 --- NuGet.config | 4 +++- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 6 +++--- 3 files changed, 21 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index ebfdf67f96f8..5a83c2e48710 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -19,6 +19,7 @@ + @@ -60,6 +61,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f43a1d2f04ff..8b73da45fc67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -12,32 +12,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -45,11 +45,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://github.com/dotnet/emsdk - be13dabf6f89f0ee48705e71c5ccee961e200934 + e92f92efe5854b6fe013787830b59166cb9b4ed9 https://github.com/dotnet/msbuild @@ -198,7 +198,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8b86f768f4de..530dd187c3bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,12 +51,12 @@ 8.0.8 - 8.0.8-servicing.24352.10 + 8.0.8-servicing.24366.12 8.0.8 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.1 8.0.8 - 8.0.8-servicing.24352.10 + 8.0.8-servicing.24366.12 8.0.0 $(MicrosoftExtensionsDependencyModelPackageVersion) 8.0.0 @@ -226,7 +226,7 @@ - 8.0.7 + 8.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 5a6870487000f8d736301398419da4e0b8a7133c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 07:05:53 +0000 Subject: [PATCH 06/32] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240716.8 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0 From Version 8.0.8 -> To Version 8.0.8 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 8.0.7-servicing.24313.7 -> To Version 8.0.8-servicing.24366.7 (parent: Microsoft.WindowsDesktop.App.Ref --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5a83c2e48710..c7e31e11b4c2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65e8c9411669..2123155fdbdf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -218,23 +218,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a + 1526afd4eae1d862d586402ef8e005151a919d52 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 43bb8cc831c2658e1117415019264bfe6f644f94 + 883fc207bb50622d4458ff09ae6a62548783826a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index dab90189dddf..7f1aed0c7328 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,7 +182,7 @@ - 8.0.7-servicing.24313.7 + 8.0.8-servicing.24366.7 From 791ba2172a908ebef5346c488d00c1ccdfad119c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Jul 2024 00:32:33 +0000 Subject: [PATCH 07/32] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240719.8 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0 From Version 8.0.8-servicing.24362.9 -> To Version 8.0.8-servicing.24369.8 --- NuGet.config | 4 +-- eng/Version.Details.xml | 56 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++---- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index c7e31e11b4c2..aa1aade35abf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -56,7 +56,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2123155fdbdf..b5222b5538cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,13 +107,13 @@ https://github.com/dotnet/roslyn 9e9c7c1d223bcc6ff6922fd6792d9dfff9cd71ad - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://github.com/nuget/nuget.client @@ -238,48 +238,48 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://github.com/dotnet/razor @@ -296,19 +296,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://github.com/dotnet/xdt @@ -427,7 +427,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3483d65ea57ac7711115b873fa815b05c7a624e1 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7f1aed0c7328..01ccb633ab2f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -167,11 +167,11 @@ 8.0.8 - 8.0.8-servicing.24362.9 - 8.0.8-servicing.24362.9 - 8.0.8-servicing.24362.9 - 8.0.8-servicing.24362.9 - 8.0.8-servicing.24362.9 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 8.0.8 From 5f41a958f7aa13577e4b57de3eb879d6669628f2 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 22 Jul 2024 17:36:48 +0000 Subject: [PATCH 08/32] Updated Version.Details.xml - fix released package shas --- eng/Version.Details.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5222b5538cb..e79c7721a504 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -41,7 +41,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -415,7 +415,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -467,7 +467,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 8133a567e2c325b49d2f2ff89404b7022ffc2448 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 22 Jul 2024 13:58:48 -0700 Subject: [PATCH 09/32] Update the version of System.Formats.Asn1 --- eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + src/Cli/dotnet/dotnet.csproj | 1 + src/Layout/tool_fsharp/tool_fsc.csproj | 1 + 4 files changed, 7 insertions(+) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a361a6ec06b..8df7c0b18a28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -158,6 +158,10 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c76ac565499f3e7c657126d46c00b67a0d74832c + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + c76ac565499f3e7c657126d46c00b67a0d74832c + https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 diff --git a/eng/Versions.props b/eng/Versions.props index 50f9fa6e0055..e8ef265b1c32 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -53,6 +53,7 @@ 6.0.32-servicing.24314.7 6.0.0-preview.7.21363.9 6.0.1 + 6.0.1 diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 327425002257..a75babfecea9 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -95,6 +95,7 @@ + diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj index a40c245de5e2..66326b59403a 100644 --- a/src/Layout/tool_fsharp/tool_fsc.csproj +++ b/src/Layout/tool_fsharp/tool_fsc.csproj @@ -9,6 +9,7 @@ + Date: Tue, 23 Jul 2024 14:12:40 -0500 Subject: [PATCH 10/32] No .deps.json for net472 Container task MSBuild only respects a .deps.json in the net8.0 engine, so there's no need to create it for a net472 task. It includes references that aren't part of the SDK, like the downlevel `System.Text.Json` that is provided by MSBuild/Visual Studio, so removing it can avoid false positives from dependency scanners. --- .../Microsoft.NET.Build.Containers.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj index 3142bdd1eaf1..ba66166d3f73 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj +++ b/src/Containers/Microsoft.NET.Build.Containers/Microsoft.NET.Build.Containers.csproj @@ -9,8 +9,8 @@ $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - true + + true . From 375e4940f138725b41a8a1b75a7ceec82fe426cc Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Wed, 24 Jul 2024 16:26:00 +0000 Subject: [PATCH 11/32] Merged PR 41305: Added new set of credential env variables to be used separately for pull and... Added new set of credential env variables to be used separately for pull and push operations. Old set of variables is used for fallback. ---- #### AI description (iteration 1) #### PR Classification New feature: Added support for separate credential environment variables for different registry modes (push, pull, pull from output). #### PR Summary This pull request introduces new environment variables for Docker credentials based on registry modes and updates the relevant classes and tests to support this feature. - `AuthHandshakeMessageHandler.cs`: Added `GetDockerCredentialsFromEnvironment` method to fetch credentials based on registry mode. - `Registry.cs`: Introduced `RegistryMode` enum and updated constructors to handle different registry modes. - `DefaultRegistryAPI.cs`: Updated to use registry mode when creating HTTP clients. - `ContainerHelpers.cs`: Added new constants for push and pull registry credentials. - Added unit tests in `AuthHandshakeMessageHandlerTests.cs` to verify the new credential fetching logic. --- .../AuthHandshakeMessageHandler.cs | 72 ++++++++++++++++--- .../ContainerBuilder.cs | 3 +- .../ContainerHelpers.cs | 6 ++ .../DestinationImageReference.cs | 5 +- .../Registry/DefaultRegistryAPI.cs | 8 +-- .../Registry/Registry.cs | 49 +++++++++++-- .../Tasks/CreateNewImage.cs | 3 +- .../CreateNewImageTests.cs | 2 +- .../DockerRegistryManager.cs | 4 +- .../DockerRegistryTests.cs | 6 +- .../EndToEndTests.cs | 8 +-- .../RegistryTests.cs | 2 +- .../AuthHandshakeMessageHandlerTests.cs | 38 ++++++++++ .../RegistryTests.cs | 6 +- 14 files changed, 179 insertions(+), 33 deletions(-) create mode 100644 src/Tests/Microsoft.NET.Build.Containers.UnitTests/AuthHandshakeMessageHandlerTests.cs diff --git a/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs b/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs index 172f968baa30..8e4bc29b7656 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/AuthHandshakeMessageHandler.cs @@ -2,6 +2,7 @@ // The .NET Foundation licenses this file to you under the MIT license. using System.Collections.Concurrent; +using System.ComponentModel; using System.Diagnostics; using System.Diagnostics.CodeAnalysis; using System.Net; @@ -38,12 +39,14 @@ private sealed record AuthInfo(string Realm, string? Service, string? Scope); private readonly string _registryName; private readonly ILogger _logger; + private readonly RegistryMode _registryMode; private static ConcurrentDictionary _authenticationHeaders = new(); - public AuthHandshakeMessageHandler(string registryName, HttpMessageHandler innerHandler, ILogger logger) : base(innerHandler) + public AuthHandshakeMessageHandler(string registryName, HttpMessageHandler innerHandler, ILogger logger, RegistryMode mode) : base(innerHandler) { _registryName = registryName; _logger = logger; + _registryMode = mode; } /// @@ -156,14 +159,10 @@ public DateTimeOffset ResolvedExpiration /// private async Task<(AuthenticationHeaderValue, DateTimeOffset)?> GetAuthenticationAsync(string registry, string scheme, AuthInfo? bearerAuthInfo, CancellationToken cancellationToken) { - // Allow overrides for auth via environment variables - string? credU = Environment.GetEnvironmentVariable(ContainerHelpers.HostObjectUser) ?? Environment.GetEnvironmentVariable(ContainerHelpers.HostObjectUserLegacy); - string? credP = Environment.GetEnvironmentVariable(ContainerHelpers.HostObjectPass) ?? Environment.GetEnvironmentVariable(ContainerHelpers.HostObjectPassLegacy); - - // fetch creds for the host + DockerCredentials? privateRepoCreds; - - if (!string.IsNullOrEmpty(credU) && !string.IsNullOrEmpty(credP)) + // Allow overrides for auth via environment variables + if (GetDockerCredentialsFromEnvironment(_registryMode) is (string credU, string credP)) { privateRepoCreds = new DockerCredentials(credU, credP); } @@ -196,6 +195,63 @@ public DateTimeOffset ResolvedExpiration } } + internal static (string credU, string credP)? TryGetCredentialsFromEnvVars(string unameVar, string passwordVar) + { + var credU = Environment.GetEnvironmentVariable(unameVar); + var credP = Environment.GetEnvironmentVariable(passwordVar); + if (!string.IsNullOrEmpty(credU) && !string.IsNullOrEmpty(credP)) + { + return (credU, credP); + } + else + { + return null; + } + } + + /// + /// Gets docker credentials from the environment variables based on registry mode. + /// + internal static (string credU, string credP)? GetDockerCredentialsFromEnvironment(RegistryMode mode) + { + if (mode == RegistryMode.Push) + { + if (TryGetCredentialsFromEnvVars(ContainerHelpers.PushHostObjectUser, ContainerHelpers.PushHostObjectPass) is (string, string) pushCreds) + { + return pushCreds; + } + + if (TryGetCredentialsFromEnvVars(ContainerHelpers.HostObjectUser, ContainerHelpers.HostObjectPass) is (string, string) genericCreds) + { + return genericCreds; + } + + return TryGetCredentialsFromEnvVars(ContainerHelpers.HostObjectUserLegacy, ContainerHelpers.HostObjectPassLegacy); + } + else if (mode == RegistryMode.Pull) + { + return TryGetCredentialsFromEnvVars(ContainerHelpers.PullHostObjectUser, ContainerHelpers.PullHostObjectPass); + } + else if (mode == RegistryMode.PullFromOutput) + { + if (TryGetCredentialsFromEnvVars(ContainerHelpers.PullHostObjectUser, ContainerHelpers.PullHostObjectPass) is (string, string) pullCreds) + { + return pullCreds; + } + + if (TryGetCredentialsFromEnvVars(ContainerHelpers.HostObjectUser, ContainerHelpers.HostObjectPass) is (string, string) genericCreds) + { + return genericCreds; + } + + return TryGetCredentialsFromEnvVars(ContainerHelpers.HostObjectUserLegacy, ContainerHelpers.HostObjectPassLegacy); + } + else + { + throw new InvalidEnumArgumentException(nameof(mode), (int)mode, typeof(RegistryMode)); + } + } + /// /// Implements the Docker OAuth2 Authentication flow as documented at . /// ContainerizeAsync( logger.LogTrace("Trace logging: enabled."); bool isLocalPull = string.IsNullOrEmpty(baseRegistry); - Registry? sourceRegistry = isLocalPull ? null : new Registry(baseRegistry, logger); + RegistryMode sourceRegistryMode = baseRegistry.Equals(outputRegistry, StringComparison.InvariantCultureIgnoreCase) ? RegistryMode.PullFromOutput : RegistryMode.Pull; + Registry? sourceRegistry = isLocalPull ? null : new Registry(baseRegistry, logger, sourceRegistryMode); SourceImageReference sourceImageReference = new(sourceRegistry, baseImageName, baseImageTag); DestinationImageReference destinationImageReference = DestinationImageReference.CreateFromSettings( diff --git a/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs b/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs index 137755cdeb3d..3a1ff7b8d004 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/ContainerHelpers.cs @@ -22,6 +22,12 @@ public static class ContainerHelpers internal const string HostObjectPass = "DOTNET_CONTAINER_REGISTRY_PWORD"; internal const string HostObjectPassLegacy = "SDK_CONTAINER_REGISTRY_PWORD"; + internal const string PushHostObjectUser = "DOTNET_CONTAINER_PUSH_REGISTRY_UNAME"; + internal const string PushHostObjectPass = "DOTNET_CONTAINER_PUSH_REGISTRY_PWORD"; + + internal const string PullHostObjectUser = "DOTNET_CONTAINER_PULL_REGISTRY_UNAME"; + internal const string PullHostObjectPass = "DOTNET_CONTAINER_PULL_REGISTRY_PWORD"; + internal const string DockerRegistryAlias = "docker.io"; /// diff --git a/src/Containers/Microsoft.NET.Build.Containers/DestinationImageReference.cs b/src/Containers/Microsoft.NET.Build.Containers/DestinationImageReference.cs index dc9c99a9fb97..a6c92d93dd80 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/DestinationImageReference.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/DestinationImageReference.cs @@ -75,7 +75,10 @@ public static DestinationImageReference CreateFromSettings( } else if (!string.IsNullOrEmpty(outputRegistry)) { - destinationImageReference = new DestinationImageReference(new Registry(outputRegistry, loggerFactory.CreateLogger()), repository, imageTags); + destinationImageReference = new DestinationImageReference( + new Registry(outputRegistry, loggerFactory.CreateLogger(), RegistryMode.Push), + repository, + imageTags); } else { diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs index 71b937233fe4..dff5a8921cc2 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/DefaultRegistryAPI.cs @@ -22,11 +22,11 @@ internal class DefaultRegistryAPI : IRegistryAPI // Making this a round 30 for convenience. private static TimeSpan LongRequestTimeout = TimeSpan.FromMinutes(30); - internal DefaultRegistryAPI(string registryName, Uri baseUri, bool isInsecureRegistry, ILogger logger) + internal DefaultRegistryAPI(string registryName, Uri baseUri, bool isInsecureRegistry, ILogger logger, RegistryMode mode) { _baseUri = baseUri; _logger = logger; - _client = CreateClient(registryName, baseUri, isInsecureRegistry, logger); + _client = CreateClient(registryName, baseUri, logger, isInsecureRegistry, mode); Manifest = new DefaultManifestOperations(_baseUri, registryName, _client, _logger); Blob = new DefaultBlobOperations(_baseUri, registryName, _client, _logger); } @@ -35,11 +35,11 @@ internal DefaultRegistryAPI(string registryName, Uri baseUri, bool isInsecureReg public IManifestOperations Manifest { get; } - private static HttpClient CreateClient(string registryName, Uri baseUri, bool isInsecureRegistry, ILogger logger) + private static HttpClient CreateClient(string registryName, Uri baseUri, ILogger logger, bool isInsecureRegistry, RegistryMode mode) { HttpMessageHandler innerHandler = CreateHttpHandler(baseUri, isInsecureRegistry, logger); - HttpMessageHandler clientHandler = new AuthHandshakeMessageHandler(registryName, innerHandler, logger); + HttpMessageHandler clientHandler = new AuthHandshakeMessageHandler(registryName, innerHandler, logger, mode); if (baseUri.IsAmazonECRRegistry()) { diff --git a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs index 387a21008f11..253ea2a2dc3a 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Registry/Registry.cs @@ -53,6 +53,13 @@ public RidGraphManifestPicker(string runtimeIdentifierGraphPath) } +internal enum RegistryMode +{ + Push, + Pull, + PullFromOutput +} + internal sealed class Registry { private const string DockerHubRegistry1 = "registry-1.docker.io"; @@ -70,11 +77,24 @@ internal sealed class Registry /// public string RegistryName { get; } - internal Registry(string registryName, ILogger logger, IRegistryAPI? registryAPI = null, RegistrySettings? settings = null) : + internal Registry(string registryName, ILogger logger, IRegistryAPI registryAPI, RegistrySettings? settings = null) : this(new Uri($"https://{registryName}"), logger, registryAPI, settings) { } - internal Registry(Uri baseUri, ILogger logger, IRegistryAPI? registryAPI = null, RegistrySettings? settings = null) + internal Registry(string registryName, ILogger logger, RegistryMode mode, RegistrySettings? settings = null) : + this(new Uri($"https://{registryName}"), logger, new RegistryApiFactory(mode), settings) + { } + + + internal Registry(Uri baseUri, ILogger logger, IRegistryAPI registryAPI, RegistrySettings? settings = null) : + this(baseUri, logger, new RegistryApiFactory(registryAPI), settings) + { } + + internal Registry(Uri baseUri, ILogger logger, RegistryMode mode, RegistrySettings? settings = null) : + this(baseUri, logger, new RegistryApiFactory(mode), settings) + { } + + private Registry(Uri baseUri, ILogger logger, RegistryApiFactory factory, RegistrySettings? settings = null) { RegistryName = DeriveRegistryName(baseUri); @@ -87,7 +107,7 @@ internal Registry(Uri baseUri, ILogger logger, IRegistryAPI? registryAPI = null, _logger = logger; _settings = settings ?? new RegistrySettings(RegistryName); - _registryAPI = registryAPI ?? new DefaultRegistryAPI(RegistryName, BaseUri, _settings.IsInsecure, logger); + _registryAPI = factory.Create(RegistryName, BaseUri, logger, _settings.IsInsecure); } private static string DeriveRegistryName(Uri baseUri) @@ -95,7 +115,7 @@ private static string DeriveRegistryName(Uri baseUri) var port = baseUri.Port == -1 ? string.Empty : $":{baseUri.Port}"; if (baseUri.OriginalString.EndsWith(port, ignoreCase: true, culture: null)) { - // the port was part of the original assignment, so it's ok to consider it part of the 'name + // the port was part of the original assignment, so it's ok to consider it part of the 'name' return baseUri.GetComponents(UriComponents.HostAndPort, UriFormat.Unescaped); } else @@ -507,4 +527,25 @@ private async Task PushAsync(BuiltImage builtImage, SourceImageReference source, _logger.LogInformation(Strings.Registry_ManifestUploaded, RegistryName); } } + + private readonly ref struct RegistryApiFactory + { + private readonly IRegistryAPI? _registryApi; + private readonly RegistryMode? _mode; + + public RegistryApiFactory(IRegistryAPI registryApi) + { + _registryApi = registryApi; + } + + public RegistryApiFactory(RegistryMode mode) + { + _mode = mode; + } + + public IRegistryAPI Create(string registryName, Uri baseUri, ILogger logger, bool isInsecureRegistry) + { + return _registryApi ?? new DefaultRegistryAPI(registryName, baseUri, isInsecureRegistry, logger, _mode!.Value); + } + } } diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs index 0bdd2eed555f..834bae6529f4 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/CreateNewImage.cs @@ -60,7 +60,8 @@ internal async Task ExecuteAsync(CancellationToken cancellationToken) return !Log.HasLoggedErrors; } - Registry? sourceRegistry = IsLocalPull ? null : new Registry(BaseRegistry, logger); + RegistryMode sourceRegistryMode = BaseRegistry.Equals(OutputRegistry, StringComparison.InvariantCultureIgnoreCase) ? RegistryMode.PullFromOutput : RegistryMode.Pull; + Registry? sourceRegistry = IsLocalPull ? null : new Registry(BaseRegistry, logger, sourceRegistryMode); SourceImageReference sourceImageReference = new(sourceRegistry, BaseImageName, BaseImageTag); DestinationImageReference destinationImageReference = DestinationImageReference.CreateFromSettings( diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs index e9fe7898dff5..cf25db4b0309 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/CreateNewImageTests.cs @@ -225,7 +225,7 @@ public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage() var logger = loggerFactory.CreateLogger(nameof(CreateNewImage_RootlessBaseImage)); // Build a rootless base runtime image. - Registry registry = new Registry(DockerRegistryManager.LocalRegistry, logger); + Registry registry = new(DockerRegistryManager.LocalRegistry, logger, RegistryMode.Push); ImageBuilder imageBuilder = await registry.GetImageManifestAsync( DockerRegistryManager.RuntimeBaseImage, diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs index 22447bc5df00..253c44653a85 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryManager.cs @@ -43,8 +43,8 @@ public static async Task StartAndPopulateDockerRegistry(ITestOutputHelper testOu int spawnRegistryDelay = 1000; //ms StringBuilder failureReasons = new(); - var pullRegistry = new Registry(BaseImageSource, logger); - var pushRegistry = new Registry(LocalRegistry, logger); + var pullRegistry = new Registry(BaseImageSource, logger, RegistryMode.Pull); + var pushRegistry = new Registry(LocalRegistry, logger, RegistryMode.Push); for (int spawnRegistryAttempt = 1; spawnRegistryAttempt <= spawnRegistryMaxRetry; spawnRegistryAttempt++) { diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs index 3529e5edec41..ba8840dc01c4 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs @@ -22,7 +22,7 @@ public async Task GetFromRegistry() { var loggerFactory = new TestLoggerFactory(_testOutput); var logger = loggerFactory.CreateLogger(nameof(GetFromRegistry)); - Registry registry = new Registry(DockerRegistryManager.LocalRegistry, logger); + Registry registry = new(DockerRegistryManager.LocalRegistry, logger, RegistryMode.Push); var ridgraphfile = ToolsetUtils.GetRuntimeGraphFilePath(); // Don't need rid graph for local registry image pulls - since we're only pushing single image manifests (not manifest lists) @@ -74,9 +74,9 @@ public async Task WriteToPrivateBasicRegistry() // login to that registry ContainerCli.LoginCommand(_testOutput, "--username", "testuser", "--password", "testpassword", registryName).Execute().Should().Pass(); // push an image to that registry using username/password - Registry localAuthed = new(new Uri($"https://{registryName}"), logger, settings: new(registryName) { ParallelUploadEnabled = false, ForceChunkedUpload = true }); + Registry localAuthed = new(new Uri($"https://{registryName}"), logger, RegistryMode.Push, settings: new() { ParallelUploadEnabled = false, ForceChunkedUpload = true }); var ridgraphfile = ToolsetUtils.GetRuntimeGraphFilePath(); - Registry mcr = new Registry(DockerRegistryManager.BaseImageSource, logger); + Registry mcr = new(DockerRegistryManager.BaseImageSource, logger, RegistryMode.Pull); var sourceImage = new SourceImageReference(mcr, DockerRegistryManager.RuntimeBaseImage, DockerRegistryManager.Net6ImageTag); var destinationImage = new DestinationImageReference(localAuthed, DockerRegistryManager.RuntimeBaseImage, new[] { DockerRegistryManager.Net6ImageTag }); diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs index 9dc7db0b6586..d78b88cc211b 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/EndToEndTests.cs @@ -46,7 +46,7 @@ public async Task ApiEndToEndWithRegistryPushAndPull() // Build the image - Registry registry = new Registry(DockerRegistryManager.LocalRegistry, logger); + Registry registry = new(DockerRegistryManager.LocalRegistry, logger, RegistryMode.Push); ImageBuilder imageBuilder = await registry.GetImageManifestAsync( DockerRegistryManager.RuntimeBaseImage, @@ -93,7 +93,7 @@ public async Task ApiEndToEndWithLocalLoad() // Build the image - Registry registry = new Registry(DockerRegistryManager.LocalRegistry, logger); + Registry registry = new(DockerRegistryManager.LocalRegistry, logger, RegistryMode.Push); ImageBuilder imageBuilder = await registry.GetImageManifestAsync( DockerRegistryManager.RuntimeBaseImage, @@ -134,7 +134,7 @@ public async Task ApiEndToEndWithArchiveWritingAndLoad() // Build the image - Registry registry = new Registry(DockerRegistryManager.LocalRegistry, logger); + Registry registry = new(DockerRegistryManager.LocalRegistry, logger, RegistryMode.Push); ImageBuilder imageBuilder = await registry.GetImageManifestAsync( DockerRegistryManager.RuntimeBaseImage, @@ -555,7 +555,7 @@ public async Task CanPackageForAllSupportedContainerRIDs(string dockerPlatform, string publishDirectory = BuildLocalApp(tfm: ToolsetInfo.CurrentTargetFramework, rid: rid); // Build the image - Registry registry = new(DockerRegistryManager.BaseImageSource, logger); + Registry registry = new(DockerRegistryManager.BaseImageSource, logger, RegistryMode.Push); var isWin = rid.StartsWith("win"); ImageBuilder? imageBuilder = await registry.GetImageManifestAsync( DockerRegistryManager.RuntimeBaseImage, diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/RegistryTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/RegistryTests.cs index 0f58b21e98ec..814892354356 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/RegistryTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/RegistryTests.cs @@ -39,7 +39,7 @@ public async Task CanReadManifestFromRegistry(string fullyQualifiedContainerName containerTag ??= "latest"; ILogger logger = _loggerFactory.CreateLogger(nameof(CanReadManifestFromRegistry)); - Registry registry = new Registry(containerRegistry, logger); + Registry registry = new(containerRegistry, logger, RegistryMode.Pull); var ridgraphfile = ToolsetUtils.GetRuntimeGraphFilePath(); diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/AuthHandshakeMessageHandlerTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/AuthHandshakeMessageHandlerTests.cs new file mode 100644 index 000000000000..9e17b99e56bc --- /dev/null +++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/AuthHandshakeMessageHandlerTests.cs @@ -0,0 +1,38 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +namespace Microsoft.NET.Build.Containers.UnitTests +{ + public class AuthHandshakeMessageHandlerTests + { + [Theory] + [InlineData("SDK_CONTAINER_REGISTRY_UNAME", "SDK_CONTAINER_REGISTRY_PWORD", (int)RegistryMode.Push)] + [InlineData("DOTNET_CONTAINER_PUSH_REGISTRY_UNAME", "DOTNET_CONTAINER_PUSH_REGISTRY_PWORD", (int)RegistryMode.Push)] + [InlineData("DOTNET_CONTAINER_PULL_REGISTRY_UNAME", "DOTNET_CONTAINER_PULL_REGISTRY_PWORD", (int)RegistryMode.Pull)] + [InlineData("DOTNET_CONTAINER_PULL_REGISTRY_UNAME", "DOTNET_CONTAINER_PULL_REGISTRY_PWORD", (int)RegistryMode.PullFromOutput)] + [InlineData("SDK_CONTAINER_REGISTRY_UNAME", "SDK_CONTAINER_REGISTRY_PWORD", (int)RegistryMode.PullFromOutput)] + public void GetDockerCredentialsFromEnvironment_ReturnsCorrectValues(string unameVarName, string pwordVarName, int mode) + { + string? originalUnameValue = Environment.GetEnvironmentVariable(unameVarName); + string? originalPwordValue = Environment.GetEnvironmentVariable(pwordVarName); + + Environment.SetEnvironmentVariable(unameVarName, "uname"); + Environment.SetEnvironmentVariable(pwordVarName, "pword"); + + if (AuthHandshakeMessageHandler.GetDockerCredentialsFromEnvironment((RegistryMode)mode) is (string credU, string credP)) + { + Assert.Equal("uname", credU); + Assert.Equal("pword", credP); + } + else + { + Assert.Fail("Should have parsed credentials from environment"); + } + + + // restore env variable values + Environment.SetEnvironmentVariable(unameVarName, originalUnameValue); + Environment.SetEnvironmentVariable(pwordVarName, originalPwordValue); + } + } +} diff --git a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs index d01aab77d77b..51fad494918f 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.UnitTests/RegistryTests.cs @@ -35,7 +35,7 @@ public void Dispose() public void CheckIfGoogleArtifactRegistry(string registryName, bool isECR) { ILogger logger = _loggerFactory.CreateLogger(nameof(CheckIfGoogleArtifactRegistry)); - Registry registry = new Registry(registryName, logger); + Registry registry = new(registryName, logger, RegistryMode.Push); Assert.Equal(isECR, registry.IsGoogleArtifactRegistry); } @@ -43,7 +43,7 @@ public void CheckIfGoogleArtifactRegistry(string registryName, bool isECR) public void DockerIoAlias() { ILogger logger = _loggerFactory.CreateLogger(nameof(DockerIoAlias)); - Registry registry = new Registry("docker.io", logger); + Registry registry = new("docker.io", logger, RegistryMode.Push); Assert.True(registry.IsDockerHub); Assert.Equal("docker.io", registry.RegistryName); Assert.Equal("registry-1.docker.io", registry.BaseUri.Host); @@ -456,7 +456,7 @@ public async Task InsecureRegistry(bool isInsecureRegistry, bool serverIsHttps, { IsInsecure = isInsecureRegistry }; - Registry registry = new(registryUri, logger, settings: settings); + Registry registry = new(registryUri, logger, RegistryMode.Pull, settings: settings); // Make a request. Task getManifest = registry.GetImageManifestAsync(repositoryName: "dotnet/runtime", reference: "latest", runtimeIdentifier: "linux-x64", manifestPicker: null!, cancellationToken: default!); From 3b2fcbe5a16b8cf7dd335f7cdc767dd9b29d148b Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Mon, 29 Jul 2024 12:46:46 -0500 Subject: [PATCH 12/32] Pin higher Microsoft.IO.Redist ``` darc add-dependency --name Microsoft.IO.Redist --version 6.0.1 --repo https://github.com/dotnet/runtime --commit e77011b31a3e5c47d931248a64b47f9b2d47853d --type toolset ``` And manually add the `PackageVersion` to `Directory.Packages.props`. --- Directory.Packages.props | 1 + eng/Version.Details.xml | 4 ++++ eng/Versions.props | 1 + 3 files changed, 6 insertions(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 2dcf8979312d..9ad8c9111787 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -39,6 +39,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77a840e8574b..7caa9a1690be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -509,5 +509,9 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a + + https://github.com/dotnet/runtime + e77011b31a3e5c47d931248a64b47f9b2d47853d + diff --git a/eng/Versions.props b/eng/Versions.props index a1b99a522747..45bb67e02852 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -21,6 +21,7 @@ servicing + 6.0.1 From 88132ec04fe8cf33d3b34f1daa22c2aa4ec7c8ab Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 6 Aug 2024 12:39:01 -0700 Subject: [PATCH 13/32] Update branding to 6.0.134 (#42553) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 909baafb17b5..73b1b903cbdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 6.0.133 + 6.0.134 servicing From 46c84683945cffbaeb9fbbdf105607a16a077f60 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 6 Aug 2024 14:07:54 -0700 Subject: [PATCH 14/32] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2509905 --- .../dotnet-workload/install/xlf/LocalizableStrings.cs.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.de.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.es.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.fr.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.it.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.ja.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.ko.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.pl.xlf | 8 ++++---- .../install/xlf/LocalizableStrings.pt-BR.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.ru.xlf | 8 ++++---- .../dotnet-workload/install/xlf/LocalizableStrings.tr.xlf | 8 ++++---- .../install/xlf/LocalizableStrings.zh-Hans.xlf | 8 ++++---- .../install/xlf/LocalizableStrings.zh-Hant.xlf | 8 ++++---- 13 files changed, 52 insertions(+), 52 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf index c183619d1c2d..31aff8530cda 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.cs.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + Možnosti {0} a {1} nelze použít společně. Jednu z možností odeberte. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + Možnost {0} se nedá použít, pokud je v global.json zadaná verze úlohy. Odeberte možnost {0} nebo odeberte element workloadVersion z {1}. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Kontrolují se aktualizované manifesty úloh. + Kontroluje se aktualizovaná verze úlohy. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + Nepovedlo se nainstalovat verzi úlohy {0}: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf index 9a0ef4029414..adc78e04f00d 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.de.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + Die Optionen {0} und {1} können nicht zusammen verwendet werden. Entfernen Sie eine der Optionen. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + Die Option {0} kann nicht verwendet werden, wenn die Workloadversion in global.json angegeben ist. Entfernen Sie die Option {0}, oder entfernen Sie das WorkloadVersion-Element aus {1}. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Es wird nach aktualisierten Workloadmanifesten gesucht. + Es wird nach einer aktualisierten Workloadversion gesucht. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + Fehler beim Installieren der Workloadversion {0}: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf index 1c36327c0f7e..718410235e84 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.es.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + No se pueden usar las opciones {0} y {1} juntas. Quite una de las opciones. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + No se puede usar la opción {0} cuando se especifica la versión de la carga de trabajo en global.json. Quite la opción {0} o quite el elemento "workloadVersion" de {1}. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Comprobando si hay manifiestos de carga de trabajo actualizados. + Comprobando la versión de las cargas de trabajo actualizadas. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + No se pudo instalar la versión de carga de trabajo {0}: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf index 262d1fd57515..d8f527ee4ac9 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.fr.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + Impossible d’utiliser les options {0} et {1} ensemble. Supprimez l’une des options. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + Impossible d’utiliser l’option {0} lorsque la version de la charge de travail est spécifiée dans global.json. Supprimez l’option {0} ou supprimez l’élément « workloadVersion » de {1}. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Recherche de manifestes de charge de travail mis à jour + Vérification de la version mise à jour de la charge de travail. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + Échec de l’installation de la version de charge de travail {0}: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf index 08486a0f1f6f..1f36e013fd53 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.it.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + Impossibile utilizzare contemporaneamente le opzioni {0} e {1}. Rimuove una delle opzioni. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + Non è possibile usare l'opzione {0} quando la versione del carico di lavoro è specificata in global.json. Rimuovere l'opzione {0} o rimuovere l'elemento 'workloadVersion' da {1}. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Verifica della disponibilità di manifesti del carico di lavoro aggiornati. + Verifica della disponibilità di versioni dei carichi di lavori aggiornate. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + Non è stato possibile installare la versione del carico di lavoro {0}: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf index 69625b03d4a3..e931d647e220 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ja.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + {0} オプションと {1} オプションを同時に使用することはできません。いずれかのオプションを削除してください。 @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + ワークロードのバージョンが global.json で指定されている場合、{0} オプションは使用できません。{0} オプションを削除するか、{1} から 'workloadVersion' 要素を削除してください。 "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - 更新されたワークロード マニフェストを確認しています。 + 更新されたワークロード バージョンを確認しています。 @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + ワークロード バージョン {0} をインストールできませんでした: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf index 67bc55e9f64d..ba3e44cec620 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ko.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + {0} 및 {1} 옵션을 함께 사용할 수 없습니다. 옵션 중 하나를 제거하세요. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + global.json에 워크로드 버전이 지정된 경우 {0} 옵션을 사용할 수 없습니다. {0} 옵션을 제거하거나, {1}에서 'workloadVersion' 요소를 제거하세요. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - 업데이트된 워크로드 매니페스트를 확인하는 중입니다. + 업데이트된 워크로드 버전을 확인하는 중입니다. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + {0} 워크로드 버전을 설치하지 못했습니다. {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf index 732f158db201..0b7065178f14 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pl.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + Nie można używać opcji {0} i {1} razem. Usuń jedną z opcji. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + Nie można użyć opcji {0}, jeśli wersja obciążenia jest określona w pliku global.json. Usuń opcję {0} lub usuń element „workloadVersion” z {1}. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Sprawdzanie zaktualizowanych manifestów obciążenia. + Sprawdzanie dostępności zaktualizowanej wersji obciążenia. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + Nie można zainstalować wersji obciążenia {0}: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf index 87fd08333cb8..96316340faa8 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.pt-BR.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + Não é possível usar as opções {0} e {1} juntas. Escolha uma das opções. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + Não é possível usar a opção {0} quando a versão da carga de trabalho é especificada em global.json. Remova a opção {0} ou remova o elemento 'workloadVersion' de {1}. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Verificando manifestos de carga de trabalho atualizados. + Verificando versões de carga de trabalho atualizadas. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + Falha ao instalar a versão da carga de trabalho {0}: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf index ae601d920cae..afb01e8c1b0d 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.ru.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + Невозможно использовать параметры {0} и {1} одновременно. Удалите один из параметров. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + Невозможно использовать параметр {0}, если версия рабочей нагрузки указана в файле global.json. Удалите параметр {0} или удалите элемент "workloadVersion" из {1}. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Проверка обновленных манифестов рабочей нагрузки. + Проверка обновленной версии рабочей нагрузки. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + Не удалось установить версию рабочей нагрузки {0}: {1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf index e9518e983218..38d16e9a52b4 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.tr.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + {0} ve {1} seçenekleri birlikte kullanılamaz. Seçeneklerden birini kaldırın. @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + Global.json'da iş yükü sürümü belirtildiğinde {0} seçeneği kullanılamaz. {0} seçeneğini kaldırın veya "workloadVersion" öğesini {1}‘den kaldırın. "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - Güncelleştirilmiş iş yükü bildirimleri denetleniyor. + Güncellenmiş iş yükü sürümü kontrol ediliyor. @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + İş yükü sürümü {0}: {1} yüklenemedi diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf index c5d962aa3cb7..d62d0490db8b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hans.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + 不能同时使用 {0} 和 {1} 选项。移除其中一个选项。 @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + 在 global.json 中指定工作负载版本时，无法使用 {0} 选项。移除 {0} 选项，或从 {1} 中移除“workloadVersion”元素。 "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - 正在检查更新的工作负载清单。 + 正在检查更新的工作负载版本。 @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + 未能安装工作负载版本 {0}：{1} diff --git a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf index 1310b788e92b..4e40f853af8d 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/install/xlf/LocalizableStrings.zh-Hant.xlf @@ -24,7 +24,7 @@ Cannot use the {0} and {1} options together. Remove one of the options. - Cannot use the {0} and {1} options together. Remove one of the options. + 無法同時使用 {0} 與 {1} 選項。移除其中一個選項。 @@ -34,12 +34,12 @@ Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. - Cannot use the {0} option when workload version is specified in global.json. Remove the {0} option, or remove the 'workloadVersion' element from {1}. + global.json 中指定工作負載版本時，無法使用 {0} 選項。移除 {0} 選項，或從 {1} 移除 'workloadVersion' 元素。 "workloadVersion" and "global.json" are literal values and should not be translated. Checking for updated workload version. - 正在檢查更新的工作負載資訊清單。 + 正在檢查更新的工作負載版本。 @@ -94,7 +94,7 @@ Failed to install workload version {0}: {1} - Failed to install workload version {0}: {1} + 無法安裝工作負載版本 {0}：{1} From f09d2212a2e28268f020dbce87891ccfde4cd2f9 Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 6 Aug 2024 14:10:15 -0700 Subject: [PATCH 15/32] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2509905 --- .../dotnet-workload/update/xlf/LocalizableStrings.cs.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.de.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.es.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.fr.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.it.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.ja.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.ko.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.pl.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.ru.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.tr.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf | 2 +- .../dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf index 7a941608bc97..c5954bd5f98e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.cs.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + Možnosti {0} a {1} nelze použít společně. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf index 5fdaa06d47c6..cd2a94e4c90b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.de.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + Die Optionen {0} und {1} können nicht zusammen verwendet werden. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf index 2e55fea4eda7..25394c54754f 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.es.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + No se pueden usar las opciones {0} y {1} juntas. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf index 16cda2250592..1ad7372ab939 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.fr.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + Désolé, impossible d’utiliser les options {0} et {1} ensemble. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf index e1bc8b2b1a15..48f2b8ca47f0 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.it.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + Impossibile utilizzare contemporaneamente le opzioni {0} e {1}. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf index 52017d86e0f0..ef0eb16f7817 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ja.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + {0} オプションと {1} オプションを同時に使用することはできません。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf index 14dbe43d77b3..075343550463 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ko.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + {0} 및 {1} 옵션을 함께 사용할 수 없습니다. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf index c1afdb678235..758794050c4e 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pl.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + Nie można używać opcji {0} i {1} razem. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf index 65214c95a716..ba4daf14bc1a 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.pt-BR.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + Não é possível usar as opções {0} e {1} juntas. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf index 90cd22087b89..af39a1f71994 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.ru.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + Невозможно использовать параметры {0} и {1} одновременно. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf index 5e06983f765d..7cc74135eb9b 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.tr.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + {0} ve {1} seçenekleri birlikte kullanılamaz. diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf index bea532aa56b1..2057bd3e8aff 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hans.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + 不能同时使用 {0} 和 {1} 选项。 diff --git a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf index 6aeb8cff4d01..dba691cb5ea1 100644 --- a/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf +++ b/src/Cli/dotnet/commands/dotnet-workload/update/xlf/LocalizableStrings.zh-Hant.xlf @@ -9,7 +9,7 @@ Cannot use the {0} and {1} options together. - Cannot use the {0} and {1} options together. + 無法同時使用 {0} 與 {1} 選項。 From 054627dcb07b40229ac32a59b397d627d3d8b9db Mon Sep 17 00:00:00 2001 From: dotnet bot Date: Tue, 6 Aug 2024 14:15:01 -0700 Subject: [PATCH 16/32] Localized file check-in by OneLocBuild Task: Build definition ID 140: Build ID 2509905 --- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf | 2 +- .../xlf/Strings.pt-BR.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf | 2 +- .../Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf | 2 +- .../xlf/Strings.zh-Hans.xlf | 2 +- .../xlf/Strings.zh-Hant.xlf | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf index 4407d1e29043..1891cc4ff30b 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.cs.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + Neexistuje žádný manifest s ID {0}. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf index 4ef614824da0..aa35c3838c22 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.de.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + Es ist kein Manifest mit der ID {0} vorhanden. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf index 965f78c7a674..485e6e0a0cf8 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.es.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + No existe ningún manifiesto con id. {0}. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf index 86ea8311cbd8..0ae7f6800bd3 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.fr.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + Aucun manifeste ayant l’ID {0} existe. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf index 7bab4f663335..7c666799e412 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.it.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + Non esiste alcun manifesto con ID {0}. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf index 7a8e0cf5bd18..cc172807eaa9 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ja.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + ID を持つ {0} マニフェストが存在しません。 diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf index ece3a585d49f..385531b1c48b 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ko.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + ID가 {0}인 매니페스트가 없습니다. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf index 4d426d6393bb..2f5dc549ddf0 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pl.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + Nie istnieje żaden manifest o identyfikatorze {0}. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf index 006a94cd72fa..f5f0331a25ec 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.pt-BR.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + Não existe nenhum manifesto com ID {0}. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf index c99667294093..bf88a6af7bbe 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.ru.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + Манифест с идентификатором {0} не существует. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf index c8522d74ad06..786f001a3435 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.tr.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + {0} kimliğine sahip bildirim yok. diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf index 0aefce1fe3ef..911a2731d284 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hans.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + 不存在 ID 为 {0} 的清单。 diff --git a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf index e34619e9f3f4..423e6216ecca 100644 --- a/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf +++ b/src/Resolvers/Microsoft.NET.Sdk.WorkloadManifestReader/xlf/Strings.zh-Hant.xlf @@ -79,7 +79,7 @@ No manifest with ID {0} exists. - No manifest with ID {0} exists. + 沒有識別碼為 {0} 的資訊清單。 From 36c13c167b5e163f7bad8566e3df34c7363bf4cc Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Thu, 8 Aug 2024 01:57:57 -0700 Subject: [PATCH 17/32] Add CompilerVisibleProperty needed for analyzer in Windows SDK projection package and set defaults. --- .../targets/Microsoft.NET.Windows.targets | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets index aae3af73c3bb..92b7133c73c0 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets @@ -45,6 +45,24 @@ Copyright (c) .NET Foundation. All rights reserved. $(TargetPlatformVersion) + + + true + true + true + 1 + + + + + + + + + + + + From 0a3bc046861efce7fb5a092c1bad97611bf4c17e Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 11 Aug 2024 23:02:42 -0700 Subject: [PATCH 18/32] Add System.Formats.Asn1 package version to directory.packages.props --- Directory.Packages.props | 1 + 1 file changed, 1 insertion(+) diff --git a/Directory.Packages.props b/Directory.Packages.props index 9ad8c9111787..3139e5cfc976 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -89,6 +89,7 @@ + From c59e2e3a10ccb1d1572b4e6f2287e814fabf6f68 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 11 Aug 2024 23:39:00 -0700 Subject: [PATCH 19/32] Update System.Formats.Asn1 package version to 8.0.0 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa14c488b749..ebd33cc04cbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -204,9 +204,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c76ac565499f3e7c657126d46c00b67a0d74832c + 5535e31a712343a63f5d7d796cd874e563e5ac14 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c3f93f0f27e6..450fb44d95d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,7 +78,7 @@ 8.0.0 8.0.4 8.0.0 - 6.0.1 + 8.0.0 From fb9eb6b4148fbfbe16dc4658f6e3529c48600ffe Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 11 Aug 2024 23:56:26 -0700 Subject: [PATCH 20/32] Update to 8.0.1 --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebd33cc04cbe..c4e03065e721 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -204,9 +204,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 450fb44d95d4..de4e730b24d4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,7 +78,7 @@ 8.0.0 8.0.4 8.0.0 - 8.0.0 + 8.0.1 From 6055e9207bdca4a28b5a0d5132b6890f74bd7114 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 12 Aug 2024 13:10:03 -0700 Subject: [PATCH 21/32] The package references aren't needed because of CPM --- src/Cli/dotnet/dotnet.csproj | 1 - src/Layout/tool_fsharp/tool_fsc.csproj | 1 - 2 files changed, 2 deletions(-) diff --git a/src/Cli/dotnet/dotnet.csproj b/src/Cli/dotnet/dotnet.csproj index 95f92c9f9b1d..87e37fe4afca 100644 --- a/src/Cli/dotnet/dotnet.csproj +++ b/src/Cli/dotnet/dotnet.csproj @@ -101,7 +101,6 @@ - diff --git a/src/Layout/tool_fsharp/tool_fsc.csproj b/src/Layout/tool_fsharp/tool_fsc.csproj index 1b7eaf531136..adb50eed038b 100644 --- a/src/Layout/tool_fsharp/tool_fsc.csproj +++ b/src/Layout/tool_fsharp/tool_fsc.csproj @@ -10,7 +10,6 @@ - Date: Tue, 13 Aug 2024 12:18:17 +0000 Subject: [PATCH 22/32] Update dependencies from https://github.com/dotnet/razor build 20240812.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.24381.2 -> To Version 9.0.0-preview.24412.2 --- 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 3ed16f145d47..ca0e354a78e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -285,18 +285,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://github.com/dotnet/razor - 78a398c6904bf0a30bcc2bb876ef518972c03f7d + ff768a661ce77edf9bdd4a2515e13453e458406f - + https://github.com/dotnet/razor - 78a398c6904bf0a30bcc2bb876ef518972c03f7d + ff768a661ce77edf9bdd4a2515e13453e458406f - + https://github.com/dotnet/razor - 78a398c6904bf0a30bcc2bb876ef518972c03f7d + ff768a661ce77edf9bdd4a2515e13453e458406f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 0eec777970bf..c9f6aef6d4df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,9 +176,9 @@ - 9.0.0-preview.24381.2 - 9.0.0-preview.24381.2 - 9.0.0-preview.24381.2 + 9.0.0-preview.24412.2 + 9.0.0-preview.24412.2 + 9.0.0-preview.24412.2 From 97c4d6555b1d834843741fcc835a937fc45fd906 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 13 Aug 2024 18:05:01 -0700 Subject: [PATCH 23/32] Scope setting warning level to when AOT is enabled. --- .../targets/Microsoft.NET.Windows.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets index 92b7133c73c0..97cf7699cfb4 100644 --- a/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets +++ b/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.Windows.targets @@ -50,7 +50,7 @@ Copyright (c) .NET Foundation. All rights reserved. true true true - 1 + 1 From 95f63676565b3ef02514fc987d6807f41d76a75e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 08:25:08 -0700 Subject: [PATCH 24/32] [release/8.0.4xx] Update dependencies from dotnet/arcade (#42727) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 10 ++++++++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0c622e276304..61a15de39db5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -35,6 +35,11 @@ + + + + + @@ -95,6 +100,11 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e85b0fcdce72..03bdc51876ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -487,22 +487,22 @@ - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6bfa423f6661..3982256470fd 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.24376.1 + 8.0.0-beta.24412.1 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.24376.1 + 8.0.0-beta.24412.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 0e93bd4c6aed..847214b29c41 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24376.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24376.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24412.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24412.1" } } From 948731f6cd4817d0979bf49801ea05b954a31d5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Aug 2024 13:09:13 +0000 Subject: [PATCH 25/32] Update dependencies from https://github.com/dotnet/templating build 20240815.2 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.401-servicing.24408.2 -> To Version 8.0.402-servicing.24415.2 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61a15de39db5..46de85d06b44 100644 --- a/NuGet.config +++ b/NuGet.config @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03bdc51876ec..9c9a76b15d8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - 3e4419f8f426cf72b7921e2a6fec7715993a8f8b + 78746ace6a5651544ac240a920bc1087adbdf3ed - + https://github.com/dotnet/templating - 3e4419f8f426cf72b7921e2a6fec7715993a8f8b + 78746ace6a5651544ac240a920bc1087adbdf3ed - + https://github.com/dotnet/templating - 3e4419f8f426cf72b7921e2a6fec7715993a8f8b + 78746ace6a5651544ac240a920bc1087adbdf3ed diff --git a/eng/Versions.props b/eng/Versions.props index 3982256470fd..30c1df27ade4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -140,13 +140,13 @@ - 8.0.401 + 8.0.402 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.401-servicing.24408.2 + 8.0.402-servicing.24415.2 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 28f6579d668dfc563eadf9b7cfa006f9e04b0caf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Aug 2024 11:20:14 -0700 Subject: [PATCH 26/32] [release/8.0.4xx] Update dependencies from dotnet/source-build-reference-packages (#42762) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03bdc51876ec..81cda1f10f28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -350,9 +350,9 @@ fb970eccb0a9cae3092464e29cbabda0d4115049 - + https://github.com/dotnet/source-build-reference-packages - 30ed464acd37779c64e9dc652d4460543ebf9966 + 8262ce49763c67d87d6233652e5460f310e8b106 From 61dbec4c18103288d50c3f96a1c5dcda5d1046ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 16 Aug 2024 12:17:03 +0000 Subject: [PATCH 27/32] Update dependencies from https://github.com/dotnet/templating build 20240815.15 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.402-servicing.24415.2 -> To Version 8.0.402-servicing.24415.15 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 46de85d06b44..6e4806f79d8e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74dc17692ee5..988d9fc6189c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 78746ace6a5651544ac240a920bc1087adbdf3ed + 7f5ebc6167f16fa9ad5be4713ff566590debd977 - + https://github.com/dotnet/templating - 78746ace6a5651544ac240a920bc1087adbdf3ed + 7f5ebc6167f16fa9ad5be4713ff566590debd977 - + https://github.com/dotnet/templating - 78746ace6a5651544ac240a920bc1087adbdf3ed + 7f5ebc6167f16fa9ad5be4713ff566590debd977 diff --git a/eng/Versions.props b/eng/Versions.props index 30c1df27ade4..d4b010dc6ebd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,7 +146,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.402-servicing.24415.2 + 8.0.402-servicing.24415.15 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 3825353b0973c66cdf7908dcef66d99a41d32aec Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Fri, 16 Aug 2024 14:22:23 -0500 Subject: [PATCH 28/32] trust the http dev-cert --- .../DockerRegistryTests.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs index ba8840dc01c4..9e91e66f2265 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs @@ -54,6 +54,7 @@ public async Task WriteToPrivateBasicRegistry() var registryCertFile = Path.Combine(registryCertsDir.FullName, "domain.crt"); // export dev cert, using --no-password also generates a matching key file + new DotnetCommand(_testOutput, $"dev-certs", "https", "--trust").Execute().Should().Pass(); new DotnetCommand(_testOutput, $"dev-certs", "https", "--export-path", registryCertFile, "--format", "PEM", "--no-password").Execute().Should().Pass(); // start up an authenticated registry using that dev cert ContainerCli.RunCommand(_testOutput, From bd8927ed342f83cc08a754d1ac6ade32d14c46c1 Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Sat, 17 Aug 2024 11:49:40 -0500 Subject: [PATCH 29/32] skip containers test and add item to reenable --- .../DockerRegistryTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs index 9e91e66f2265..a992e06b4e8c 100644 --- a/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs +++ b/src/Tests/Microsoft.NET.Build.Containers.IntegrationTests/DockerRegistryTests.cs @@ -37,7 +37,7 @@ public async Task GetFromRegistry() Assert.NotNull(downloadedImage); } - [DockerAvailableFact] + [DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/42820")] public async Task WriteToPrivateBasicRegistry() { ILogger logger = _loggerFactory.CreateLogger(nameof(WriteToPrivateBasicRegistry)); From 61135b66063947f39489b45138557faac5c9bdc0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Aug 2024 12:05:34 +0000 Subject: [PATCH 30/32] Update dependencies from https://github.com/dotnet/templating build 20240818.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.402-servicing.24415.15 -> To Version 8.0.402-servicing.24418.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e4806f79d8e..670a118bd142 100644 --- a/NuGet.config +++ b/NuGet.config @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 988d9fc6189c..2da73ba27f53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 7f5ebc6167f16fa9ad5be4713ff566590debd977 + 9a6e3e8ad9ff60c347fa70aadcdabdacc06b1feb - + https://github.com/dotnet/templating - 7f5ebc6167f16fa9ad5be4713ff566590debd977 + 9a6e3e8ad9ff60c347fa70aadcdabdacc06b1feb - + https://github.com/dotnet/templating - 7f5ebc6167f16fa9ad5be4713ff566590debd977 + 9a6e3e8ad9ff60c347fa70aadcdabdacc06b1feb diff --git a/eng/Versions.props b/eng/Versions.props index d4b010dc6ebd..9e31a7252ead 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -146,7 +146,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.402-servicing.24415.15 + 8.0.402-servicing.24418.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From f21eab1055d4aa8122acda5ad1f19afb03901998 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Aug 2024 12:52:43 +0000 Subject: [PATCH 31/32] Update dependencies from https://github.com/dotnet/razor build 20240820.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 9.0.0-preview.24412.2 -> To Version 9.0.0-preview.24420.1 --- NuGet.config | 33 ++++++++++++++++++++++++++++++--- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b22eff6bd0c6..5c3058e8e35a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,6 +5,15 @@ + + + + + + + + + @@ -20,6 +29,7 @@ + @@ -27,8 +37,6 @@ - - @@ -39,12 +47,22 @@ + + + + + + + + + + @@ -76,13 +94,13 @@ + - @@ -95,6 +113,15 @@ + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b005463875e9..279e1d57af32 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 - ff768a661ce77edf9bdd4a2515e13453e458406f + 68650a7d94261bc56a1f4bc522c2ee35314b1abb - + https://github.com/dotnet/razor - ff768a661ce77edf9bdd4a2515e13453e458406f + 68650a7d94261bc56a1f4bc522c2ee35314b1abb - + https://github.com/dotnet/razor - ff768a661ce77edf9bdd4a2515e13453e458406f + 68650a7d94261bc56a1f4bc522c2ee35314b1abb https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 69dbc707cf35..9043b85b60bc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,9 +178,9 @@ - 9.0.0-preview.24412.2 - 9.0.0-preview.24412.2 - 9.0.0-preview.24412.2 + 9.0.0-preview.24420.1 + 9.0.0-preview.24420.1 + 9.0.0-preview.24420.1 From 5bb55cd5b0ac01cac517eb466ef28cb0ceb28d19 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 28 Aug 2024 02:19:08 -0700 Subject: [PATCH 32/32] Update the System.Formats.Asn1 package version --- eng/Version.Details.xml | 6 +++--- eng/Versions.props | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 545dc99ff94c..c68bff5fd349 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime fc775d2cb27fe6c3fb2461f72a284306063aa2d1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + + https://github.com/dotnet/runtime + fc775d2cb27fe6c3fb2461f72a284306063aa2d1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 74edf3f71147..d2f0f9b52f8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,7 +162,7 @@ because in those cases, Visual Studio is providing System.Text.Json, and we should work with whichever version it ships. --> 8.0.4 9.0.0-rc.2.24426.3 - 8.0.1 + 9.0.0-rc.2.24426.3