From 9d7d8a91d9f7d9206469a8bbc57472f05fff5879 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 00:16:51 +0000 Subject: [PATCH 01/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20240305.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.128 -> To Version 6.0.129 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 33 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 16ec56f205ea..e3c9aaf64589 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,19 +5,25 @@ + + + + - + + + @@ -34,17 +40,23 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af96de59d1c8..10695b1739f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + b18087511c81450ede0a2111e52502dc79898ad7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + b18087511c81450ede0a2111e52502dc79898ad7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + b18087511c81450ede0a2111e52502dc79898ad7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + b18087511c81450ede0a2111e52502dc79898ad7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + b18087511c81450ede0a2111e52502dc79898ad7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + b18087511c81450ede0a2111e52502dc79898ad7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 5603759138c012b54bb40b1ff33a45f79188a0f5 + b18087511c81450ede0a2111e52502dc79898ad7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b2e5510cacbb..430c6721437e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,11 +110,11 @@ - 6.0.128-servicing.24120.4 - 6.0.128 - 6.0.128 - 6.0.128 - 6.0.128 + 6.0.129-servicing.24155.9 + 6.0.129 + 6.0.129 + 6.0.129 + 6.0.129 From e034f40d2b3c0749e07e8a2f0b9f360704ac92c5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 00:36:46 +0000 Subject: [PATCH 02/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240305.4 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.4 --- NuGet.config | 8 ++---- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3c9aaf64589..cdc9178b61e3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -40,9 +38,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10695b1739f4..0db408367b89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3b519aa7d1a1b66e1d329d694f814e1d8228dc8c + afa33a63582b8801f2feb3964b0564a1acdba74f https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 430c6721437e..ea32e059226e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.28-servicing.24120.5 + 6.0.28-servicing.24155.4 6.0.28 - 6.0.28-servicing.24120.5 - 6.0.28-servicing.24120.5 - 6.0.28-servicing.24120.5 + 6.0.28-servicing.24155.4 + 6.0.28-servicing.24155.4 + 6.0.28-servicing.24155.4 6.0.28 6.0.28 6.0.28 6.0.28 - 6.0.28-servicing.24120.5 + 6.0.28-servicing.24155.4 From 476e05f2738dfce293071dad82fda0b570e133de Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 04:17:28 +0000 Subject: [PATCH 03/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240305.11 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.11 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index cdc9178b61e3..6a947510e672 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0db408367b89..ca9ce78f5007 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - afa33a63582b8801f2feb3964b0564a1acdba74f + d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ea32e059226e..74e68fd989ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.28-servicing.24155.4 + 6.0.28-servicing.24155.11 6.0.28 - 6.0.28-servicing.24155.4 - 6.0.28-servicing.24155.4 - 6.0.28-servicing.24155.4 + 6.0.28-servicing.24155.11 + 6.0.28-servicing.24155.11 + 6.0.28-servicing.24155.11 6.0.28 6.0.28 6.0.28 6.0.28 - 6.0.28-servicing.24155.4 + 6.0.28-servicing.24155.11 From 1316d74f85fade23ab3c42e5a87c94b70552ea9e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 08:43:00 +0000 Subject: [PATCH 04/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240305.18 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.28-servicing.24155.18 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6a947510e672..c4efded5e39e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -38,7 +38,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca9ce78f5007..83c899fa4d96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d848f4a8dc0d825bcfa6e26969ec977f87d6e6fe + 9b22b194b50b2a5b5d39980b13627258c957ba78 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 74e68fd989ef..b842182dff5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.28-servicing.24155.11 + 6.0.28-servicing.24155.18 6.0.28 - 6.0.28-servicing.24155.11 - 6.0.28-servicing.24155.11 - 6.0.28-servicing.24155.11 + 6.0.28-servicing.24155.18 + 6.0.28-servicing.24155.18 + 6.0.28-servicing.24155.18 6.0.28 6.0.28 6.0.28 6.0.28 - 6.0.28-servicing.24155.11 + 6.0.28-servicing.24155.18 From ae5e27e8bd24b7b4a55d0e01311eca4eda0479eb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 09:54:52 +0000 Subject: [PATCH 05/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20240306.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.128 -> To Version 6.0.129 --- 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 c4efded5e39e..34ec4546516b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83c899fa4d96..36136fa7ddab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b18087511c81450ede0a2111e52502dc79898ad7 + fb7a0861d02af9f75a9faeadcb482bb7005518aa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b18087511c81450ede0a2111e52502dc79898ad7 + fb7a0861d02af9f75a9faeadcb482bb7005518aa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b18087511c81450ede0a2111e52502dc79898ad7 + fb7a0861d02af9f75a9faeadcb482bb7005518aa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b18087511c81450ede0a2111e52502dc79898ad7 + fb7a0861d02af9f75a9faeadcb482bb7005518aa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b18087511c81450ede0a2111e52502dc79898ad7 + fb7a0861d02af9f75a9faeadcb482bb7005518aa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b18087511c81450ede0a2111e52502dc79898ad7 + fb7a0861d02af9f75a9faeadcb482bb7005518aa https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b18087511c81450ede0a2111e52502dc79898ad7 + fb7a0861d02af9f75a9faeadcb482bb7005518aa https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index b842182dff5f..9cd0093706ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ - 6.0.129-servicing.24155.9 + 6.0.129-servicing.24156.7 6.0.129 6.0.129 6.0.129 From 9e13bb7549e430ca588efd7f2d1306633393a067 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 21:34:35 +0000 Subject: [PATCH 06/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240306.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29 --- NuGet.config | 8 ++------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 34ec4546516b..640b75574ea8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,9 +19,7 @@ - - - + @@ -51,9 +49,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36136fa7ddab..d8a11082bf30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,21 +166,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + 0ebc3df85ff73e2524cbc776abb2898381feb189 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + 0ebc3df85ff73e2524cbc776abb2898381feb189 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + 0ebc3df85ff73e2524cbc776abb2898381feb189 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c4a33f22341aa4c3945a3f4ee13d9b3d3a873273 + 0ebc3df85ff73e2524cbc776abb2898381feb189 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 9cd0093706ab..ab26cf1d79f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ - 6.0.28-servicing.24120.3 + 6.0.29-servicing.24156.3 From 34420279153a025e4773874aea315c3bf40b88ea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 22:04:42 +0000 Subject: [PATCH 07/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240306.10 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24156.10 --- NuGet.config | 4 +-- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++------ 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 640b75574ea8..158516a48dff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d8a11082bf30..8447e895e699 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -186,78 +186,78 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 4bb3a1d8ec37eda521bbf94605c43b035d2718b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9b22b194b50b2a5b5d39980b13627258c957ba78 + c74e337b92a199b26d055a2651803b1bbee5ac38 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ab26cf1d79f2..3d7d7c596603 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.28-servicing.24155.18 - 6.0.28 - 6.0.28-servicing.24155.18 - 6.0.28-servicing.24155.18 - 6.0.28-servicing.24155.18 - 6.0.28 - 6.0.28 - 6.0.28 - 6.0.28 - 6.0.28-servicing.24155.18 + 6.0.29-servicing.24156.10 + 6.0.29 + 6.0.29-servicing.24156.10 + 6.0.29-servicing.24156.10 + 6.0.29-servicing.24156.10 + 6.0.29 + 6.0.29 + 6.0.29 + 6.0.29 + 6.0.29-servicing.24156.10 From 94ec8d19ba7a36ce5378aaa233d2ad89a56304e6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 23:06:25 +0000 Subject: [PATCH 08/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240306.13 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24156.13 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 158516a48dff..6fccda86d80e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8447e895e699..6daca32bfb63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c74e337b92a199b26d055a2651803b1bbee5ac38 + e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 3d7d7c596603..5d78aa7c5110 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.29-servicing.24156.10 + 6.0.29-servicing.24156.13 6.0.29 - 6.0.29-servicing.24156.10 - 6.0.29-servicing.24156.10 - 6.0.29-servicing.24156.10 + 6.0.29-servicing.24156.13 + 6.0.29-servicing.24156.13 + 6.0.29-servicing.24156.13 6.0.29 6.0.29 6.0.29 6.0.29 - 6.0.29-servicing.24156.10 + 6.0.29-servicing.24156.13 From bca7e36bcf4ff5dab3b8b996170e2b5212e087d4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 7 Mar 2024 02:20:32 +0000 Subject: [PATCH 09/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240228.9 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.28 --- 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 6fccda86d80e..c90fe281246e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6daca32bfb63..0f33f8f88d22 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,21 +166,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0ebc3df85ff73e2524cbc776abb2898381feb189 + 41cd74af2105cebbf00e67b09888325a09844688 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0ebc3df85ff73e2524cbc776abb2898381feb189 + 41cd74af2105cebbf00e67b09888325a09844688 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0ebc3df85ff73e2524cbc776abb2898381feb189 + 41cd74af2105cebbf00e67b09888325a09844688 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0ebc3df85ff73e2524cbc776abb2898381feb189 + 41cd74af2105cebbf00e67b09888325a09844688 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 5d78aa7c5110..ea6bcd81ee1b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ - 6.0.29-servicing.24156.3 + 6.0.28-servicing.24128.9 From 6982d954e96234a47942166aa41ba7534b0a7d97 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 7 Mar 2024 19:39:37 +0000 Subject: [PATCH 10/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240306.10 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29 --- 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 c90fe281246e..5492045a03d6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f33f8f88d22..13c8d1254866 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -166,21 +166,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 41cd74af2105cebbf00e67b09888325a09844688 + 9b28e832f46ab45042fa2360c267982ee923cae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 41cd74af2105cebbf00e67b09888325a09844688 + 9b28e832f46ab45042fa2360c267982ee923cae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 41cd74af2105cebbf00e67b09888325a09844688 + 9b28e832f46ab45042fa2360c267982ee923cae2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 41cd74af2105cebbf00e67b09888325a09844688 + 9b28e832f46ab45042fa2360c267982ee923cae2 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index ea6bcd81ee1b..90ef50212a56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ - 6.0.28-servicing.24128.9 + 6.0.29-servicing.24156.10 From 03b68993b7ddeaeed890ec49e02d6201ded11ccf Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 7 Mar 2024 20:26:44 +0000 Subject: [PATCH 11/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240307.10 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5492045a03d6..85e4c2f0de24 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13c8d1254866..28e30215b8e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b28e832f46ab45042fa2360c267982ee923cae2 + 5db928d98f562e9b970a03bb812168f37a0cfbf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b28e832f46ab45042fa2360c267982ee923cae2 + 5db928d98f562e9b970a03bb812168f37a0cfbf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b28e832f46ab45042fa2360c267982ee923cae2 + 5db928d98f562e9b970a03bb812168f37a0cfbf6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 9b28e832f46ab45042fa2360c267982ee923cae2 + 5db928d98f562e9b970a03bb812168f37a0cfbf6 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 90ef50212a56..60170f888e7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ - 6.0.29-servicing.24156.10 + 6.0.29-servicing.24157.10 From 58cbfd4c31cf7b2b51f4c93b404b0b0a6d7caaa5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 7 Mar 2024 22:11:13 +0000 Subject: [PATCH 12/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240307.17 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 85e4c2f0de24..7914cba86ef3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28e30215b8e6..f01c5dd6cacd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5db928d98f562e9b970a03bb812168f37a0cfbf6 + 0f4a6f93521ebb08158c055c1df7ddf3a0981ea5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5db928d98f562e9b970a03bb812168f37a0cfbf6 + 0f4a6f93521ebb08158c055c1df7ddf3a0981ea5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5db928d98f562e9b970a03bb812168f37a0cfbf6 + 0f4a6f93521ebb08158c055c1df7ddf3a0981ea5 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5db928d98f562e9b970a03bb812168f37a0cfbf6 + 0f4a6f93521ebb08158c055c1df7ddf3a0981ea5 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 60170f888e7d..10598210a275 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ - 6.0.29-servicing.24157.10 + 6.0.29-servicing.24157.17 From 1385b1d88a4f607088dc9b6d40d96bc8f9133dc6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 9 Mar 2024 00:24:56 +0000 Subject: [PATCH 13/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240308.11 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7914cba86ef3..e20370c02642 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f01c5dd6cacd..2397ce523e45 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0f4a6f93521ebb08158c055c1df7ddf3a0981ea5 + dd1f2eda53e21f2ad0dceb15cd6ba82f71f6b436 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0f4a6f93521ebb08158c055c1df7ddf3a0981ea5 + dd1f2eda53e21f2ad0dceb15cd6ba82f71f6b436 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0f4a6f93521ebb08158c055c1df7ddf3a0981ea5 + dd1f2eda53e21f2ad0dceb15cd6ba82f71f6b436 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0f4a6f93521ebb08158c055c1df7ddf3a0981ea5 + dd1f2eda53e21f2ad0dceb15cd6ba82f71f6b436 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index 10598210a275..bdf93c7fd1ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ - 6.0.29-servicing.24157.17 + 6.0.29-servicing.24158.11 From 697492998939efecf135b140d1b468af202ce461 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 00:10:05 +0000 Subject: [PATCH 14/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240311.15 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24161.15 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index e20370c02642..653ae2c77a04 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2397ce523e45..4f950615aad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e85dcbd082ea99d0f2b67ebc92118ab5d4874a09 + 90c7146376a3124c76cbd1e00b83d9acb4b5b587 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index bdf93c7fd1ee..cdab16effc15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.29-servicing.24156.13 + 6.0.29-servicing.24161.15 6.0.29 - 6.0.29-servicing.24156.13 - 6.0.29-servicing.24156.13 - 6.0.29-servicing.24156.13 + 6.0.29-servicing.24161.15 + 6.0.29-servicing.24161.15 + 6.0.29-servicing.24161.15 6.0.29 6.0.29 6.0.29 6.0.29 - 6.0.29-servicing.24156.13 + 6.0.29-servicing.24161.15 From 9f8b5dc69b389721c28ec113b31dc65e7eacf6ba Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 03:20:02 +0000 Subject: [PATCH 15/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240311.9 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 653ae2c77a04..370f57c5524a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4f950615aad9..ad6c805af1dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dd1f2eda53e21f2ad0dceb15cd6ba82f71f6b436 + 0c56eae8366647606b0fbb68fcf876663ee09edc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dd1f2eda53e21f2ad0dceb15cd6ba82f71f6b436 + 0c56eae8366647606b0fbb68fcf876663ee09edc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dd1f2eda53e21f2ad0dceb15cd6ba82f71f6b436 + 0c56eae8366647606b0fbb68fcf876663ee09edc https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dd1f2eda53e21f2ad0dceb15cd6ba82f71f6b436 + 0c56eae8366647606b0fbb68fcf876663ee09edc https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index cdab16effc15..ed8f49b51142 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ - 6.0.29-servicing.24158.11 + 6.0.29-servicing.24161.9 From d8cdca2cd8151aa6632baeb27282c17480942edd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 18:31:59 +0000 Subject: [PATCH 16/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240312.5 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.5 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 370f57c5524a..4e357752f29f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad6c805af1dc..c390feaf29d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90c7146376a3124c76cbd1e00b83d9acb4b5b587 + 58982bca304e45c7fe4928617d301e9b3f2419ce https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ed8f49b51142..d3ead8e7c3fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.29-servicing.24161.15 + 6.0.29-servicing.24162.5 6.0.29 - 6.0.29-servicing.24161.15 - 6.0.29-servicing.24161.15 - 6.0.29-servicing.24161.15 + 6.0.29-servicing.24162.5 + 6.0.29-servicing.24162.5 + 6.0.29-servicing.24162.5 6.0.29 6.0.29 6.0.29 6.0.29 - 6.0.29-servicing.24161.15 + 6.0.29-servicing.24162.5 From 588bbedf6fa683ec3568c939e5dde2eed10e53d6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 18:58:48 +0000 Subject: [PATCH 17/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20240312.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.128 -> To Version 6.0.129 --- 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 4e357752f29f..8cf22f8012b0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c390feaf29d6..5eb5fefe4e3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fb7a0861d02af9f75a9faeadcb482bb7005518aa + 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fb7a0861d02af9f75a9faeadcb482bb7005518aa + 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fb7a0861d02af9f75a9faeadcb482bb7005518aa + 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fb7a0861d02af9f75a9faeadcb482bb7005518aa + 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fb7a0861d02af9f75a9faeadcb482bb7005518aa + 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fb7a0861d02af9f75a9faeadcb482bb7005518aa + 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - fb7a0861d02af9f75a9faeadcb482bb7005518aa + 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index d3ead8e7c3fa..c5e404423e67 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ - 6.0.129-servicing.24156.7 + 6.0.129-servicing.24162.9 6.0.129 6.0.129 6.0.129 From 6cfbc4fd231feb8a7cb474dfca220da04f7314b5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 20:05:17 +0000 Subject: [PATCH 18/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20240312.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.28 -> To Version 6.0.29 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8cf22f8012b0..e23c5c7b4796 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eb5fefe4e3e..b65d05c8fc5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,19 +168,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0c56eae8366647606b0fbb68fcf876663ee09edc + d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0c56eae8366647606b0fbb68fcf876663ee09edc + d45b35a0a9e4371b0e0db674629a9732623013fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0c56eae8366647606b0fbb68fcf876663ee09edc + d45b35a0a9e4371b0e0db674629a9732623013fa https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0c56eae8366647606b0fbb68fcf876663ee09edc + d45b35a0a9e4371b0e0db674629a9732623013fa https://dev.azure.com/dnceng/internal/_git/dotnet-wpf diff --git a/eng/Versions.props b/eng/Versions.props index c5e404423e67..b4c14c4965f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ - 6.0.29-servicing.24161.9 + 6.0.29-servicing.24162.5 From 578d1c9eac0b95ca6bdf61d9aa676c304ea2d5f6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 22:57:25 +0000 Subject: [PATCH 19/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240312.12 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.12 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index e23c5c7b4796..ba345c86d08c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b65d05c8fc5a..06e38ec04625 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 58982bca304e45c7fe4928617d301e9b3f2419ce + 25304b89d47baf9a734ed2c21bd7154fd4605a4e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index b4c14c4965f0..a028da3f7e3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.29-servicing.24162.5 + 6.0.29-servicing.24162.12 6.0.29 - 6.0.29-servicing.24162.5 - 6.0.29-servicing.24162.5 - 6.0.29-servicing.24162.5 + 6.0.29-servicing.24162.12 + 6.0.29-servicing.24162.12 + 6.0.29-servicing.24162.12 6.0.29 6.0.29 6.0.29 6.0.29 - 6.0.29-servicing.24162.5 + 6.0.29-servicing.24162.12 From 9c0fa40d05cf1517242c00b8d06ce6a2f579143e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 23:49:52 +0000 Subject: [PATCH 20/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20240312.17 dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.28-servicing.24120.5 -> To Version 6.0.29-servicing.24162.17 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba345c86d08c..35cb35643b63 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06e38ec04625..b4dbfe21f638 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 25304b89d47baf9a734ed2c21bd7154fd4605a4e + dd340b191b388fd448494f70a126ce8db511bba4 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index a028da3f7e3b..82db4ab40881 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.29-servicing.24162.12 + 6.0.29-servicing.24162.17 6.0.29 - 6.0.29-servicing.24162.12 - 6.0.29-servicing.24162.12 - 6.0.29-servicing.24162.12 + 6.0.29-servicing.24162.17 + 6.0.29-servicing.24162.17 + 6.0.29-servicing.24162.17 6.0.29 6.0.29 6.0.29 6.0.29 - 6.0.29-servicing.24162.12 + 6.0.29-servicing.24162.17 From 4d030ec71be3c2d64f3922f2b9024bf2390ab44a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 13 Mar 2024 00:41:18 +0000 Subject: [PATCH 21/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20240312.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.128 -> To Version 6.0.129 --- 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 35cb35643b63..90cb840315ee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,7 +16,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4dbfe21f638..38b8ebe0ea0a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 + cef75e649457c61f8ef6205cef7b526ce0592104 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 + cef75e649457c61f8ef6205cef7b526ce0592104 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 + cef75e649457c61f8ef6205cef7b526ce0592104 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 + cef75e649457c61f8ef6205cef7b526ce0592104 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 + cef75e649457c61f8ef6205cef7b526ce0592104 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 + cef75e649457c61f8ef6205cef7b526ce0592104 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e10379e5a1d0375c0c48ff5dbb92ac8b23e4dd0 + cef75e649457c61f8ef6205cef7b526ce0592104 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 82db4ab40881..f701805eb48c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ - 6.0.129-servicing.24162.9 + 6.0.129-servicing.24162.12 6.0.129 6.0.129 6.0.129 From cca88161846c8804a6b63984d64137b0a1d2aea9 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 18 Mar 2024 10:31:01 -0700 Subject: [PATCH 22/52] Add nuget localization to the dependency flow --- NuGet.config | 18 ------------------ eng/Version.Details.xml | 8 ++++++-- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9bc5278cd409..df6b6279ba6e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,23 +6,14 @@ - - - - - - - - - @@ -43,19 +34,10 @@ - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b03722d226d8..7694ef03266e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -123,11 +123,15 @@ https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 7fe6b814c901490292f02d8ea12749505fbb959a + 451e9bc27184dc49d04e975122c9e7189d525872 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 7fe6b814c901490292f02d8ea12749505fbb959a + 451e9bc27184dc49d04e975122c9e7189d525872 + + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 451e9bc27184dc49d04e975122c9e7189d525872 https://github.com/microsoft/vstest diff --git a/eng/Versions.props b/eng/Versions.props index 6150a375aebf..1a36d8a7a13f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,7 +55,7 @@ 6.0.6-rc.4 $(NuGetBuildTasksPackageVersion) - 6.0.0 + 6.0.6-rc.4 $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksPackageVersion) From 3b69be441e0aad228998f85a9dc90a04929790c7 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 20:21:57 +0000 Subject: [PATCH 23/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build Microsoft.NET.HostModel , 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.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.28-servicing.24120.7 -> To Version 6.0.29-servicing.24164.14 --- NuGet.config | 8 ++------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 3 files changed, 23 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 90cb840315ee..11c569909255 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -41,9 +39,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 959a386489a8..c8c1eebaa41e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating cef75e649457c61f8ef6205cef7b526ce0592104 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 34a109148c7d8a2c8e6431e83e4bce5712dd8083 + 01f15d4879bd19d518e5bfe146af3b85ccf43076 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index cd2fceeb5979..26200f87f88b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,13 +41,13 @@ - 6.0.28 - 6.0.28-servicing.24120.7 - 6.0.28 + 6.0.29 + 6.0.29-servicing.24164.14 + 6.0.29 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 - 6.0.28 - 6.0.28-servicing.24120.7 + 6.0.29 + 6.0.29-servicing.24164.14 6.0.0-preview.7.21363.9 6.0.1 From de4bc12ecf1afa2adb9fc9e58edc4dee5c127c09 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 20:35:36 +0000 Subject: [PATCH 24/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.29-servicing.24162.17 -> To Version 6.0.29-servicing.24165.5 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 11c569909255..7a4be8a73ffe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8c1eebaa41e..d17aceb2b978 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd340b191b388fd448494f70a126ce8db511bba4 + dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 26200f87f88b..2bba60f8f2b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.29-servicing.24162.17 + 6.0.29-servicing.24165.5 6.0.29 - 6.0.29-servicing.24162.17 - 6.0.29-servicing.24162.17 - 6.0.29-servicing.24162.17 + 6.0.29-servicing.24165.5 + 6.0.29-servicing.24165.5 + 6.0.29-servicing.24165.5 6.0.29 6.0.29 6.0.29 6.0.29 - 6.0.29-servicing.24162.17 + 6.0.29-servicing.24165.5 From 2019b411dd9a2930af2a10b26af83e81baa07222 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 21:39:23 +0000 Subject: [PATCH 25/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.29 -> To Version 6.0.29 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.28-servicing.24120.2 -> To Version 6.0.29-servicing.24168.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7a4be8a73ffe..8cc60c8a95af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d17aceb2b978..ddaf39a7addc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d45b35a0a9e4371b0e0db674629a9732623013fa + 7c192f44ffe4f589b794fbdea808331efc8d8bde - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 4bb3a1d8ec37eda521bbf94605c43b035d2718b1 + 573c73a5486beb4de70c4b628df1825540ea1d83 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 2bba60f8f2b2..659bc6277edd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,11 +144,11 @@ - 6.0.28-servicing.24120.2 + 6.0.29-servicing.24168.9 - 6.0.29-servicing.24162.5 + 6.0.29-servicing.24169.12 From 5920d53b8bbb5e44b15494630ee59fb0dde60938 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 01:37:59 +0000 Subject: [PATCH 26/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build Microsoft.NET.HostModel , 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.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.29-servicing.24164.14 -> To Version 6.0.29-servicing.24169.13 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 22 +++++++++++----------- eng/Versions.props | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8cc60c8a95af..7a7eca1844bd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddaf39a7addc..d9c1d6443128 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 01f15d4879bd19d518e5bfe146af3b85ccf43076 + c95b68327d40062beb0c9d4cd08295a85d86bd27 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 659bc6277edd..941498c30be7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,12 +42,12 @@ 6.0.29 - 6.0.29-servicing.24164.14 + 6.0.29-servicing.24169.13 6.0.29 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.29 - 6.0.29-servicing.24164.14 + 6.0.29-servicing.24169.13 6.0.0-preview.7.21363.9 6.0.1 From f1451cc2ff4f410a1bed2c067c58b12923c44fea Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 03:39:09 +0000 Subject: [PATCH 27/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.Common.ProjectTemplates.6.0 , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Cli , Microsoft.TemplateEngine.Orchestrator.RunnableProjects , Microsoft.TemplateEngine.Utils , Microsoft.TemplateSearch.Common From Version 6.0.129 -> To Version 6.0.129 --- 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 7a7eca1844bd..9900e7ff16c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9c1d6443128..21ff41c93626 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - cef75e649457c61f8ef6205cef7b526ce0592104 + eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 941498c30be7..ce5e8176168e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ - 6.0.129-servicing.24162.12 + 6.0.129-servicing.24169.8 6.0.129 6.0.129 6.0.129 From 90724bc9e7f32f917bcd9dfe879037f0eb938fb6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 03:53:07 +0000 Subject: [PATCH 28/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build dotnet-dev-certs , 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.Analyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.Mvc.Razor.Extensions , Microsoft.AspNetCore.Razor.Internal.SourceGenerator.Transport , Microsoft.AspNetCore.Razor.Language , Microsoft.AspNetCore.TestHost , Microsoft.CodeAnalysis.Razor , Microsoft.Extensions.FileProviders.Embedded , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0 From Version 6.0.29-servicing.24165.5 -> To Version 6.0.29-servicing.24169.21 --- NuGet.config | 4 +-- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 10 +++---- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9900e7ff16c6..1a0b52238345 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21ff41c93626..498b4df199b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd8ede89bc8605fe8ff591e9f4af53a2c349fb06 + e0bcc9da178ac3c235551a85992064889c82b52e https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index ce5e8176168e..9ce49e9aad35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,16 +131,16 @@ - 6.0.29-servicing.24165.5 + 6.0.29-servicing.24169.21 6.0.29 - 6.0.29-servicing.24165.5 - 6.0.29-servicing.24165.5 - 6.0.29-servicing.24165.5 + 6.0.29-servicing.24169.21 + 6.0.29-servicing.24169.21 + 6.0.29-servicing.24169.21 6.0.29 6.0.29 6.0.29 6.0.29 - 6.0.29-servicing.24165.5 + 6.0.29-servicing.24169.21 From cafb3f2f94750c723e5beafd308362d3cf31889d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 05:57:01 +0000 Subject: [PATCH 29/52] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0 From Version 6.0.29 -> To Version 6.0.29 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.29-servicing.24168.9 -> To Version 6.0.29-servicing.24169.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a0b52238345..5832011af203 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 498b4df199b5..36ced57505e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c192f44ffe4f589b794fbdea808331efc8d8bde + 0692302e909ffbc02bca94378eab9213ba3f4455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 573c73a5486beb4de70c4b628df1825540ea1d83 + f3f959782e4e407301c19cd90dc0d1da329425bf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 9ce49e9aad35..c313ad86a47b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,11 +144,11 @@ - 6.0.29-servicing.24168.9 + 6.0.29-servicing.24169.12 - 6.0.29-servicing.24169.12 + 6.0.29-servicing.24169.26 From 1e23809f0f06f412276e6caaa012a8d7dddd1c73 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 21 Mar 2024 21:37:18 +0000 Subject: [PATCH 30/52] Merged PR 38433: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689 - **Build**: - **Date Produced**: March 21, 2024 7:40:21 PM UTC - **Commit**: 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.29 to 6.0.29][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.29 to 6.0.29][1] - **Microsoft.NETCore.Platforms**: [from 6.0.13 to 6.0.13][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.13 to 6.0.29-servicing.24171.5][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc95b68327d40062beb0c9d4cd08295a85d86bd27&targetVersion=GC189fbbd88d97dd6d65515ba2da05b62eab4e5039&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689) [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: - **Date Produced**: March 21, 2024 9:10:33 PM UTC - **Commit**: c83354d42e63d2bb07e6b24b7c67ef91e434f359 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8][2] - **dotnet-user-secrets**: [from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8][2] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8][2] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.29 to 6.0.29][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][2] - **Microsoft.AspNetCore.Authorization**: [from 6.0.29 to 6.0.29][2] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.29 to 6.0.29][2] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.29 to 6.0.29][2] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8][2] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8][2] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.29-servicing.24169.21 to 6.0.29-servicing.24171.8][2] - **Microsoft.AspNetCore.Mvc.R... --- NuGet.config | 8 ++--- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 14 ++++---- 3 files changed, 51 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5832011af203..fc5aad3b6152 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -34,12 +34,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36ced57505e4..9827efce0c9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -32,31 +32,31 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://github.com/dotnet/runtime @@ -64,7 +64,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c95b68327d40062beb0c9d4cd08295a85d86bd27 + 189fbbd88d97dd6d65515ba2da05b62eab4e5039 https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -188,76 +188,76 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e0bcc9da178ac3c235551a85992064889c82b52e + c83354d42e63d2bb07e6b24b7c67ef91e434f359 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c313ad86a47b..aefffe4664a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,12 +42,12 @@ 6.0.29 - 6.0.29-servicing.24169.13 + 6.0.29-servicing.24171.5 6.0.29 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 6.0.29 - 6.0.29-servicing.24169.13 + 6.0.29-servicing.24171.5 6.0.0-preview.7.21363.9 6.0.1 @@ -131,16 +131,16 @@ - 6.0.29-servicing.24169.21 + 6.0.29-servicing.24171.8 6.0.29 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 - 6.0.29-servicing.24169.21 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 + 6.0.29-servicing.24171.8 6.0.29 6.0.29 6.0.29 6.0.29 - 6.0.29-servicing.24169.21 + 6.0.29-servicing.24171.8 From 2b0455d3437ef2eb6fdf72a2e306d644b601860a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 00:56:27 +0000 Subject: [PATCH 31/52] Merged PR 38443: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: - **Date Produced**: March 21, 2024 10:00:27 PM UTC - **Commit**: f68b1f215211a807960d4d4094e3380307fbfc0f - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.129 to 6.0.129][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.129 to 6.0.129][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.129 to 6.0.129][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.129-servicing.24169.8 to 6.0.129-servicing.24171.8][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.129 to 6.0.129][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.129 to 6.0.129][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.129 to 6.0.129][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCeeb3cfb682dcc33df2c90a25677ce26d4a7d57c7&targetVersion=GCf68b1f215211a807960d4d4094e3380307fbfc0f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689) --- 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 fc5aad3b6152..5580590504dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,7 +14,7 @@ - + @@ -42,7 +42,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9827efce0c9b..9e94dd9c0324 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - eeb3cfb682dcc33df2c90a25677ce26d4a7d57c7 + f68b1f215211a807960d4d4094e3380307fbfc0f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index aefffe4664a5..fe6800bd468f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ - 6.0.129-servicing.24169.8 + 6.0.129-servicing.24171.8 6.0.129 6.0.129 6.0.129 From c5a811d50196cfc9525891c16b256ee4962b20e1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 22 Mar 2024 16:08:47 +0000 Subject: [PATCH 32/52] Merged PR 38478: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NET.Sdk.WindowsDesktop**: from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:258d4206-cc1e-4c20-39b6-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - **Subscription**: 258d4206-cc1e-4c20-39b6-08d960f4ca81 - **Build**: - **Date Produced**: March 22, 2024 3:43:32 PM UTC - **Commit**: 75c9b26383d5e6908e8b07d68d134f115c696324 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.29 to 6.0.29][1] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.29 to 6.0.29][1] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][1] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24169.26 to 6.0.29-servicing.24171.9][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.29-servicing.24169.12 to 6.0.29-servicing.24171.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC0692302e909ffbc02bca94378eab9213ba3f4455&targetVersion=GC75c9b26383d5e6908e8b07d68d134f115c696324&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCf3f959782e4e407301c19cd90dc0d1da329425bf&targetVersion=GC6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:258d4206-cc1e-4c20-39b6-08d960f4ca81) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5580590504dc..fe3a7ee8c91c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -45,7 +45,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e94dd9c0324..40a6fe22ba5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,23 +168,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 0692302e909ffbc02bca94378eab9213ba3f4455 + 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f3f959782e4e407301c19cd90dc0d1da329425bf + 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index fe6800bd468f..2bda028514ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,11 +144,11 @@ - 6.0.29-servicing.24169.12 + 6.0.29-servicing.24171.7 - 6.0.29-servicing.24169.26 + 6.0.29-servicing.24171.9 From 954d1ed19915b4a3559b2845d84a2ed1ae60f819 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 17:59:10 +0000 Subject: [PATCH 33/52] Update dependencies from https://github.com/dotnet/arcade build 20240404.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24176.9 -> To Version 6.0.0-beta.24204.4 --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../job/source-index-stage1.yml | 2 +- eng/common/templates-official/jobs/jobs.yml | 2 +- .../templates-official/post-build/post-build.yml | 8 ++++---- .../steps/component-governance.yml | 2 +- .../templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 11 files changed, 34 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 32fcd6a4cc72..4439a2e9cecb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,10 @@ + + - @@ -16,9 +17,13 @@ + + + + @@ -35,17 +40,22 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ebaf081f6032..4d47d94ac099 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -296,22 +296,22 @@ - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 - + https://github.com/dotnet/arcade - e438144bbffb29ed5d7c113dc4947b51650344dc + bd9b4590681e602535ed414e98a17e6ba121dca4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5c94169952e6..9e8ceb12b872 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ 4.0.0 5.0.0 6.0.4 - 6.0.0-beta.24176.9 + 6.0.0-beta.24204.4 3.1.0 6.0.0 4.3.0 @@ -166,7 +166,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.24176.9 + 6.0.0-beta.24204.4 4.8.2 6.0.0-beta.21376.2 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index e0e9a4bc5129..08df5637599d 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -43,7 +43,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows variables: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 96be5e6e115a..f5fa09f41511 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -50,7 +50,7 @@ jobs: demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 3d8b0b966cb7..e96ec3cbe0ed 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -7,7 +7,7 @@ parameters: binlogPath: artifacts/log/Debug/Build.binlog pool: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows condition: '' dependsOn: '' diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 669ccd48f7f0..c124aa995787 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -92,7 +92,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows runAsPublic: ${{ parameters.runAsPublic }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 96048b1ba5e4..fce0d0bf5cef 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -103,7 +103,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -143,7 +143,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -206,7 +206,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -258,7 +258,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Svc-Internal - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index babc2757d8d1..12527b80ea9c 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index babc2757d8d1..12527b80ea9c 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -3,7 +3,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index 447f89df4ba2..52b804505247 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24176.9", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24176.9" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4" } } From a79a54a0d6bbecc3a0eaab10c76cf46d3cd6e4f2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 16 Apr 2024 22:49:14 +0000 Subject: [PATCH 34/52] Merged PR 38987: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:499cebc0-3291-4ec8-3a4f-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 499cebc0-3291-4ec8-3a4f-08d961c5a689 - **Build**: 20240415.25 - **Date Produced**: April 16, 2024 9:04:59 PM UTC - **Commit**: 97d8f4cade971b93794a3805e7d72ee388f14c9b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.29 to 6.0.30][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.29 to 6.0.30][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC189fbbd88d97dd6d65515ba2da05b62eab4e5039&targetVersion=GC97d8f4cade971b93794a3805e7d72ee388f14c9b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:499cebc0-3291-4ec8-3a4f-08d961c5a689) --- NuGet.config | 20 ++------------------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 3 files changed, 21 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4439a2e9cecb..675ee4fc1a61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,11 +4,9 @@ - - - + @@ -16,14 +14,8 @@ - - - - - - @@ -40,23 +32,15 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d47d94ac099..19664f0bd5d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating f68b1f215211a807960d4d4094e3380307fbfc0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b https://github.com/dotnet/msbuild diff --git a/eng/Versions.props b/eng/Versions.props index 9e8ceb12b872..4126c6785fb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,13 +41,13 @@ - 6.0.29 - 6.0.29-servicing.24171.5 - 6.0.29 + 6.0.30 + 6.0.30-servicing.24215.25 + 6.0.30 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 6.0.0 - 6.0.29 - 6.0.29-servicing.24171.5 + 6.0.30 + 6.0.30-servicing.24215.25 6.0.0-preview.7.21363.9 6.0.1 From 5ab2294d9197b3c762958a83241e1c4d98d74bf8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Apr 2024 18:04:22 +0000 Subject: [PATCH 35/52] Merged PR 39000: [internal/release/6.0.1xx] Update dependencies from 3 repositories This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20240416.15 - **Date Produced**: April 16, 2024 11:22:09 PM UTC - **Commit**: ded0b713ad5db1c4cd83c8287624355038b864b4 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.129 to 6.0.130][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.129 to 6.0.130][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.129 to 6.0.130][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.129-servicing.24171.8 to 6.0.130-servicing.24216.15][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.129 to 6.0.130][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.129 to 6.0.130][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.129 to 6.0.130][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCf68b1f215211a807960d4d4094e3380307fbfc0f&targetVersion=GCded0b713ad5db1c4cd83c8287624355038b864b4&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689) [marker]: <> (Begin:ffa022ec-0654-4a20-3a4e-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: ffa022ec-0654-4a20-3a4e-08d961c5a689 - **Build**: 20240416.19 - **Date Produced**: April 16, 2024 11:39:24 PM UTC - **Commit**: 1d696053fcd6735aaac1902afdb0b92edbf43e71 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][2] - **dotnet-user-secrets**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][2] - **Microsoft.AspNetCore.Analyzers**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][2] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.29 to 6.0.30][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][2] - **Microsoft.AspNetCore.Authorization**: [from 6.0.29 to 6.0.30][2] - **Microsoft.AspNetCore.Components.Analyzers**: [from 6.0.29 to 6.0.30][2] - **Microsoft.AspNetCore.Components.Web**: [from 6.0.29 to 6.0.30][2] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][2] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][2] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19][2] - **Microsoft.AspNetCore.Mvc.Razor.Extensions**: [from 6.0.29 to 6.0.30][2] - **Microsoft.AspNetCore.R... --- NuGet.config | 6 ++ eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 34 +++++------ 3 files changed, 87 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index 675ee4fc1a61..b6e50f29553c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -14,8 +15,10 @@ + + @@ -32,6 +35,7 @@ + @@ -39,8 +43,10 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19664f0bd5d8..a182e36d8b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -113,13 +113,13 @@ https://github.com/dotnet/roslyn 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -170,98 +170,98 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc + dee47a1e2958aa9b97d3c5edf9433312cc5a4634 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 4126c6785fb4..793ca1d5c714 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,11 +110,11 @@ - 6.0.129-servicing.24171.8 - 6.0.129 - 6.0.129 - 6.0.129 - 6.0.129 + 6.0.130-servicing.24216.15 + 6.0.130 + 6.0.130 + 6.0.130 + 6.0.130 @@ -131,24 +131,24 @@ - 6.0.29-servicing.24171.8 - 6.0.29 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 - 6.0.29 - 6.0.29 - 6.0.29 - 6.0.29 - 6.0.29-servicing.24171.8 + 6.0.30-servicing.24216.19 + 6.0.30 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 + 6.0.30 + 6.0.30 + 6.0.30 + 6.0.30 + 6.0.30-servicing.24216.19 - 6.0.29-servicing.24171.7 + 6.0.30-servicing.24216.7 - 6.0.29-servicing.24171.9 + 6.0.30-servicing.24217.3 From 214a5b1a89eab20d08419f9a446807ed91e48f25 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 22 Apr 2024 19:11:15 +0000 Subject: [PATCH 36/52] Merged PR 39108: Updated restore-toolset.sh - skip toolset for sourcebuild Updated restore-toolset.sh - skip toolset for sourcebuild --- eng/restore-toolset.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/restore-toolset.sh b/eng/restore-toolset.sh index 50b0eb9f6f50..86e22284050b 100644 --- a/eng/restore-toolset.sh +++ b/eng/restore-toolset.sh @@ -7,7 +7,7 @@ function InitializeCustomSDKToolset { # The following frameworks and tools are used only for testing. # Do not attempt to install them in source build. - if [[ "${DotNetBuildFromSource:-}" == "true" ]]; then + if [[ $properties == *"ArcadeBuildFromSource=true"* ]]; then return fi From 0aff0db725f3979688ed1d6692f3507dc0e2daa2 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 29 Apr 2024 22:03:16 +0000 Subject: [PATCH 37/52] Merged PR 39287: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-templating This pull request updates the following dependencies [marker]: <> (Begin:b9edc696-13f4-406c-3a51-08d961c5a689) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-templating - **Subscription**: b9edc696-13f4-406c-3a51-08d961c5a689 - **Build**: 20240429.9 - **Date Produced**: April 29, 2024 9:29:03 PM UTC - **Commit**: f9d1cd96d58bf8e5fb569eaef4956089817c2842 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.130 to 6.0.130][1] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.130 to 6.0.130][1] - **Microsoft.TemplateEngine.Abstractions**: [from 6.0.130 to 6.0.130][1] - **Microsoft.TemplateEngine.Cli**: [from 6.0.130-servicing.24216.15 to 6.0.130-servicing.24229.9][1] - **Microsoft.TemplateEngine.Orchestrator.RunnableProjects**: [from 6.0.130 to 6.0.130][1] - **Microsoft.TemplateEngine.Utils**: [from 6.0.130 to 6.0.130][1] - **Microsoft.TemplateSearch.Common**: [from 6.0.130 to 6.0.130][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCded0b713ad5db1c4cd83c8287624355038b864b4&targetVersion=GCf9d1cd96d58bf8e5fb569eaef4956089817c2842&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:b9edc696-13f4-406c-3a51-08d961c5a689) --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index b6e50f29553c..075fedce93c7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,9 +5,13 @@ + + + + @@ -15,10 +19,12 @@ - + + + @@ -35,17 +41,23 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a182e36d8b95..2c5876207424 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 793ca1d5c714..23e90f079c18 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -110,7 +110,7 @@ - 6.0.130-servicing.24216.15 + 6.0.130-servicing.24229.9 6.0.130 6.0.130 6.0.130 From bba9797f1925009ce736abdeac9495bc8b243917 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 1 May 2024 14:43:22 -0700 Subject: [PATCH 38/52] Update branding to 6.0.131 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9e8ceb12b872..68513cae2688 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 6.0.130 + 6.0.131 servicing From 405bc53e1e0354a33801393d1261b6a9ef232571 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 May 2024 14:49:21 -0700 Subject: [PATCH 39/52] simplify the globaljson test logic --- .../GivenThatWeWantToBuildWithGlobalJson.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithGlobalJson.cs b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithGlobalJson.cs index 4d7a50a579a1..4137a965632f 100644 --- a/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithGlobalJson.cs +++ b/src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildWithGlobalJson.cs @@ -45,8 +45,9 @@ public void It_fails_build_on_failed_sdk_resolution(bool runningInVS) var result = buildCommand.Execute($"/p:BuildingInsideVisualStudio={runningInVS}", $"/bl:binlog{runningInVS}.binlog") .Should() .Fail(); - var warningString = "warning : Unable to locate the .NET SDK version"; - var errorString = "Unable to locate the .NET SDK. Check that it is installed, your PATH is configured for the correct architecture, and that the version specified in global.json (if any) matches the installed version."; if (runningInVS) + var warningString = "warning : Unable to locate the .NET SDK"; + var errorString = "Unable to locate the .NET SDK. Check that it is installed"; + if (runningInVS) { result.And .HaveStdOutContaining(warningString) From 5c6676877a8344b9c0c76d61298027f5182331ed Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 16 May 2024 17:37:43 -0700 Subject: [PATCH 40/52] Update branding to 6.0.424 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c92188367e59..49d1cbeafc78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 6.0.423 + 6.0.424 servicing true From 93a962f9243c58a241dfe44af0d2325f8eed35db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 May 2024 20:36:17 +0000 Subject: [PATCH 41/52] Update dependencies from https://github.com/dotnet/linker build 20240419.1 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24219.1 --- NuGet.config | 20 ++++++++------------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13cdff684cc2..167f31c0419c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,6 @@ - - - @@ -14,15 +11,16 @@ - - - + + + + @@ -44,21 +42,19 @@ + + - - - - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778d24581ee2..5b26f3822966 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -137,14 +137,14 @@ https://github.com/microsoft/vstest 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - 4be765525a1b45d28ab69a48f92e008b70a4e56e + f00f9ee49eb12fc1f3e18d474472503e7aa578fc - + https://github.com/dotnet/linker - 4be765525a1b45d28ab69a48f92e008b70a4e56e + f00f9ee49eb12fc1f3e18d474472503e7aa578fc https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 49d1cbeafc78..76f25438ba24 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,7 +79,7 @@ - 6.0.200-1.22553.1 + 6.0.200-1.24219.1 $(MicrosoftNETILLinkTasksPackageVersion) From b52d686c9536a7280f9a1fe69e427ed60790352a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 May 2024 23:22:48 +0000 Subject: [PATCH 42/52] Update dependencies from https://github.com/dotnet/linker build 20240517.3 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24267.3 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b26f3822966..70763d9fa329 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -137,14 +137,14 @@ https://github.com/microsoft/vstest 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - f00f9ee49eb12fc1f3e18d474472503e7aa578fc + 7c03be9a87ab76f688c7a2627dd318bbbff8897e - + https://github.com/dotnet/linker - f00f9ee49eb12fc1f3e18d474472503e7aa578fc + 7c03be9a87ab76f688c7a2627dd318bbbff8897e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 76f25438ba24..096f43013815 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,7 +79,7 @@ - 6.0.200-1.24219.1 + 6.0.200-1.24267.3 $(MicrosoftNETILLinkTasksPackageVersion) From 24c1e029ff88bfaeab4c669568d56491f8224db1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 May 2024 04:49:19 +0000 Subject: [PATCH 43/52] Update dependencies from https://github.com/dotnet/arcade build 20240516.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.24204.4 -> To Version 6.0.0-beta.24266.4 --- NuGet.config | 20 ------------------- eng/Version.Details.xml | 16 +++++++-------- eng/Versions.props | 4 ++-- .../job/source-index-stage1.yml | 6 +++--- .../templates-official/jobs/source-build.yml | 2 +- .../templates/job/source-index-stage1.yml | 6 +++--- eng/common/templates/jobs/source-build.yml | 2 +- global.json | 4 ++-- 8 files changed, 20 insertions(+), 40 deletions(-) diff --git a/NuGet.config b/NuGet.config index 13cdff684cc2..f7ac60470617 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,6 @@ - - - @@ -14,17 +11,10 @@ - - - - - - - @@ -44,22 +34,12 @@ - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 778d24581ee2..17aae6173035 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -295,22 +295,22 @@ - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 - + https://github.com/dotnet/arcade - bd9b4590681e602535ed414e98a17e6ba121dca4 + 2eab07c3d7b78219d10099b19fafeef2ecae1779 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 49d1cbeafc78..1a94cb87bae0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ 4.0.0 6.0.0 6.0.4 - 6.0.0-beta.24204.4 + 6.0.0-beta.24266.4 3.1.0 4.3.0 4.3.0 @@ -174,7 +174,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.24204.4 + 6.0.0-beta.24266.4 4.8.2 6.0.0-beta.22262.1 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index e96ec3cbe0ed..f04ad04c2b18 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20240320.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -32,10 +32,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 3.1.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 2159009dc8e1..b9a1f67b9a9a 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index d8990549e809..b710698eb4d4 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,6 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20210614.1 + sourceIndexPackageVersion: 1.0.1-20240320.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -30,10 +30,10 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core sdk 3.1 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 3.1.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 00aa98eb3bfd..7c240e654472 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -14,7 +14,7 @@ parameters: # This is the default platform provided by Arcade, intended for use by a managed-only repo. defaultManagedPlatform: name: 'Managed' - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7' # Defines the platforms on which to run build jobs. One job is created for each platform, and the # object in this array is sent to the job template as 'platform'. If no platforms are specified, diff --git a/global.json b/global.json index ae74ec9f49f3..3197482b3cd3 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24204.4", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24204.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24266.4" } } From 5fa6e8c5f40a8fee019934458d14b8337cf001ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 May 2024 23:55:18 +0000 Subject: [PATCH 44/52] Update dependencies from https://github.com/dotnet/linker build 20240520.5 Microsoft.NET.ILLink.Analyzers , Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.22553.1 -> To Version 6.0.200-1.24270.5 --- NuGet.config | 16 ---------------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 5 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 167f31c0419c..f7ac60470617 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,16 +13,8 @@ - - - - - - - - @@ -42,20 +34,12 @@ - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd7e2d246b04..13df27db4aa8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -137,14 +137,14 @@ https://github.com/microsoft/vstest 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - 7c03be9a87ab76f688c7a2627dd318bbbff8897e + e66cbcaa36aa719936a46160198c9012c6e174e4 - + https://github.com/dotnet/linker - 7c03be9a87ab76f688c7a2627dd318bbbff8897e + e66cbcaa36aa719936a46160198c9012c6e174e4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index df99be1d56ba..edeb794e6a12 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,7 +79,7 @@ - 6.0.200-1.24267.3 + 6.0.200-1.24270.5 $(MicrosoftNETILLinkTasksPackageVersion) From 509017208168cf4a07c7f74484bf1099a529fa8c Mon Sep 17 00:00:00 2001 From: Damon Tivel Date: Wed, 12 Jun 2024 15:56:03 -0700 Subject: [PATCH 45/52] 2024-06 CTL --- .../redist/trustedroots/codesignctl.pem | 48 +++++++++++++++++++ .../redist/trustedroots/timestampctl.pem | 48 +++++++++++++++++++ .../GivenCodeSigningCtlFile.cs | 2 + .../GivenTimestampingCtlFile.cs | 2 +- 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/src/Layout/redist/trustedroots/codesignctl.pem b/src/Layout/redist/trustedroots/codesignctl.pem index 11978a9a649f..021bd8997f77 100644 --- a/src/Layout/redist/trustedroots/codesignctl.pem +++ b/src/Layout/redist/trustedroots/codesignctl.pem @@ -8620,3 +8620,51 @@ e0G4FBVWdtOW4xWFZAIwJOT2+L0Tbjq3P9y/zXjfJoBXEq9oZ0//8iuxoqGZtMOT G456y3y/FI7r6rj+4QNf -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFeDCCA2CgAwIBAgIQSyw7AQGLrSq8jHtbPu2QVzANBgkqhkiG9w0BAQwFADBW +MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQD +EyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25pbmcgUm9vdCBSNDYwHhcNMjEwMzIy +MDAwMDAwWhcNNDYwMzIxMjM1OTU5WjBWMQswCQYDVQQGEwJHQjEYMBYGA1UEChMP +U2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQDEyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNp +Z25pbmcgUm9vdCBSNDYwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCN +55QSIgQkdC7/FiMCkoq2rjaFrEfUI5ErPtx94jGgUW+shJHjUoq14pbe0IdjJImK +/+8Skzt9u7aKvb0Ffyeba2XTpQxpsbxJOZrxbW6q5KCDJ9qaDStQ6Utbs7hkNqR+ +Sj2pcaths3OzPAsM79szV+W+NDfjlxtd/R8SPYIDdub7P2bSlDFp+m2zNKzBenjc +klDyZMeqLQSrw2rq4C+np9xu1+j/2iGrQL+57g2extmeme/G3h+pDHazJyCh1rr9 +gOcB0u/rgimVcI3/uxXP/tEPNqIuTzKQdEZrRzUTdwUzT2MuuC3hv2WnBGsY2HH6 +zAjybYmZELGt2z4s5KoYsMYHAXVn3m3pY2MeNn9pib6qRT5uWl+PoVvLnTCGMOgD +s0DGDQ84zWeoU4j6uDBl+m/H5x2xg3RpPqzEaDux5mczmrYI4IAFSEDu9oJkRqj1 +c7AGlfJsZZ+/VVscnFcax3hGfHCqlBuCF6yH6bbJDoEcQNYWFyn8XJwYK+pF9e+9 +1WdPKF4F7pBMeufG9ND8+s0+MkYTIDaKBOq3qgdGnA2TOglmmVhcKaO5DKYwODzQ +RjY1fJy67sPV+Qp2+n4FG0DKkjXp1XrRtX8ArqmQqsV/AZwQsRb8zG4Y3G9i/qZQ +p7h7uJ0VP/4gDHXIIloTlRmQAOka1cKG8eOO7F/05QIDAQABo0IwQDAdBgNVHQ4E +FgQUMuuSmv81lkgvKEBCcCA2kVwXheYwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEwEB +/wQFMAMBAf8wDQYJKoZIhvcNAQEMBQADggIBAHZlwuPXIkrXHYle/2lexhQCTXOm +zc0oyrA36r+nySGqql/av/aDbNCA0QpcAKTL88w5D55BcYjVPOiKe4wXI/fKNHSR +bAauUD8AWbImPDwXg1cDPi3RGj3UzwdUskMLUnKoiPXEF/Jv0Vil0WjkPZgIGO42 +9EhImvpUcPCI1HAWMEJJ0Nk/dUtFcdiuorthDoiFUFe5uhErNikfjyBynlyeidGC +2kWNapnahHFrM6UQu3nwl/Z0gaA/V8eGjDCMDjiVrgHGHqvcqB9vL9f/dh6uF3Nt +5bl1s2EGqJUzwk5vsjfylb6FVBK5yL1iQnb3Kvz1NzEDJlf+0ebb8BYCcoOMCLOE +rKnkB/ihiMQTWlBHVEKm7dBBNCyYsT6iNKEMXb2s9395p79tDFYyhRtLl7jhrOSk +PHHxo+FOY9b0Rrr1CwjhYzztolkvCtQsayOinqFN7tESzRgzUO1Bbst/PUFgC2ML +ePV170MVtzYLEK/cXBipmNk22R3YhLMGioLjexskp0LO7g8+VlwyfexL3lYrOzu6 ++XpY0FG2bNb2WKJSJHpEhqEcYD9J0/z6+YQcBcI0v+Lm8RkqmS9WVzWctfUHw0Yv +3jg9GQ37o/HfE57nqXJYMa+96trX1m13MzOO9Kz9wb9Jh9JwBWd0Bqb2eEAtFgSR +Dx/TFsS4ehcNJMmy +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIICKDCCAa+gAwIBAgIQUCSbou+Opr9sLB8aY4XUwzAKBggqhkjOPQQDAzBWMQsw +CQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMS0wKwYDVQQDEyRT +ZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25pbmcgUm9vdCBFNDYwHhcNMjEwMzIyMDAw +MDAwWhcNNDYwMzIxMjM1OTU5WjBWMQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2Vj +dGlnbyBMaW1pdGVkMS0wKwYDVQQDEyRTZWN0aWdvIFB1YmxpYyBDb2RlIFNpZ25p +bmcgUm9vdCBFNDYwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQIMoEDH487om+BR4zl +e7m6wWmyW0nAKLkUWG8kM85Qm3PZO8FoOZx6Yc5c0iJHRKuAhanllayqrmZYhlan +uIODzLTRDqlR+EtnOX+MubY5aDSPGUq6jiHrQrisVp0J3AejQjBAMB0GA1UdDgQW +BBTPfSygkHqYHd22XoXC4NoVcdLlXjAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/ +BAUwAwEB/zAKBggqhkjOPQQDAwNnADBkAjACd++zAerlV83j8HflRwwwlLmgchbs +aGX/4g44dv/oG8KfzCVTRg6sZHMobtK0IqYCMGk5W6+oBFyZMtOebrSwXs8lGjll +/zHz43Zy8DMXO+iiqzSEwWGneZ6KupkGGqfVKw== +-----END CERTIFICATE----- + diff --git a/src/Layout/redist/trustedroots/timestampctl.pem b/src/Layout/redist/trustedroots/timestampctl.pem index 592079fa33ae..e11dc73a8817 100644 --- a/src/Layout/redist/trustedroots/timestampctl.pem +++ b/src/Layout/redist/trustedroots/timestampctl.pem @@ -9257,3 +9257,51 @@ sEn9loiN7TPb5cHvtvLTRX9Dvr82zadlqpFiHzd/7Uvv7nMXbi8LgNW1asp98aib oTM3VxKKcl+Yqg== -----END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIICNjCCAb2gAwIBAgIUNdzqqPFud6Xd/BatNpw0vRVFzikwCgYIKoZIzj0EAwMw +WzELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBCLlYu +MSowKAYDVQQDDCFRdW9WYWRpcyBTaWduaW5nIEVDQyBQMzg0IFJvb3QgRzQwHhcN +MjMwMzE2MTUzNjAyWhcNNDgwMzA5MTUzNjAxWjBbMQswCQYDVQQGEwJOTDEgMB4G +A1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xKjAoBgNVBAMMIVF1b1ZhZGlz +IFNpZ25pbmcgRUNDIFAzODQgUm9vdCBHNDB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BFI7CA12eXWd/JJ/J6R9xlocD5E82+Q5+IKq2PzmYohXxrVz2z72REWsGaRBYykL +liyHxKYC012KoqjnXjbs38WhRVVKDFRRkBCcHpoM+PM0sJSy54NIx1jKetHHJGgF +LKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUWRZsDiAtkUp02ppPs/4p +UbnpynwwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMBZ8eADXpJ2W +4XVLDPFJMoABShYkMQVq5PHCRA1/t5l5Lgkw15p6O0DmoSYM500L/QIwRmBoIwwu +shW7GPd4iqd4bGvn1U+4UL+binQ0f4vyuAw62hoABxh7IH+mdNN+g6gT +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIFhjCCA26gAwIBAgIUDx0XQGkARJQ7rWtetIcEV1mwgI0wDQYJKoZIhvcNAQEM +BQAwWzELMAkGA1UEBhMCTkwxIDAeBgNVBAoMF1F1b1ZhZGlzIFRydXN0bGluayBC +LlYuMSowKAYDVQQDDCFRdW9WYWRpcyBTaWduaW5nIFJTQSA0MDk2IFJvb3QgRzQw +HhcNMjMwMzE2MTUzMjQ4WhcNNDgwMzA5MTUzMjQ3WjBbMQswCQYDVQQGEwJOTDEg +MB4GA1UECgwXUXVvVmFkaXMgVHJ1c3RsaW5rIEIuVi4xKjAoBgNVBAMMIVF1b1Zh +ZGlzIFNpZ25pbmcgUlNBIDQwOTYgUm9vdCBHNDCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBANCMA/gAIDZZWuEcZP0bo8ss5R5zIRDr5DYOLLh2vyg6HsEK +lEXzWuk7wBrF/Od8OMzpHCy3eWGse+BO9i63oTIVG5Usix1Q9qWzsBtj8kbCw1ah +ydO8E87y24Yapmjr/e+jY6++44IZ/dcSBK5vmJsUr6j353+z1npzUQNo5JeB01o8 +M73Gwf3kfkkc4xQNj8FluJcrYVr88zQ27Gcpe9JMkCrSpkKpxsgByVy/XDcx/gZZ +V+5urRyeovFq3IjllYTV1h4BnVAW4y9xraGRIKayq/4IKAI2L0OYjDucphkEmrWx +fP6wDX+kMCPCbw8jAWv/2fOFgq0Fq2xAp4FQbQF/xgTcDsm5zq9p8QOsw8wV4B7q ++2N+NGtSU/CYTPydg13Dik8/k71zWkWhuQ9S8LChI4MKh+lsKaLEN574U5UABwyo +OSDDRurBPRQZrEtzebgE7lwMo3WWWrVuAp5e8rtyLNrxaSVcIDjqRydWbNLF+BB2 +3iKUaZ3tV6RspDUpmsp9Gl9VRErEVJ+/O5kS0M1oMyK9LB3GGTOkW4SGhEMJQiW5 +4pcs8ZQHrF6QjAEib6Ur9DcEB6vI10xQh/I+Qb8mKiyjZpHO/h5i5sbppaG+mMPv +5GbN/dvvii+WTHuuM/g6zvyF+GOvyfLA/bRmez3zYyO9W29RPWnDQFTw1q43AgMB +AAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFFNw9E+5WtshFimqEnp6 +WQvW/EXtMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQwFAAOCAgEABdc9SCeg +Xz5mkfFh+wZoILbKSVY9qoP3Hp4WLAFpeQZiLSOoxvNLVIX4ENWYrM+wzVb+S32X +VA9kvl3QK/QJirECmvyyfMprJvKkzYF0ZjNUo0fWUGwJzja4lQjeExGte0dcsQYL +vCkqRRnt0v019E5kVDVkXgNBUipl06AULYmUAjJ9xAukbzZcIfr7XuGtpWRZzIGP +XA/R55Bn/KkJtWW7ALvB74auDpnnPT6PkJXTdgIlUOqJvtISRy0bLjv3r01ZkZvZ +aAEzmMswZpCSiFJCX0evKp4BvOBrc/e63FZC4WfU7pqtAS43PzA9h/gdcWug6I9g +R0tl50viFBfXmgYbyLcxeEJKDmHnfnWDwMENqAmsvLNroHNwdALkSdipcyA/pnYA +aR/8fXg5dYPlpuVy4F6mQhyQ4R4aASXG6NxsR7O+1Y6Q4FL4oE2IHV5kkwkUXJad +UHqicmqUZTynAe2cj+d28fmV4066TjbYiSfTRH/Ji6gJnpG9ySiYRCCHtMecjsfZ +Y+wj87Hgonlo4ek+S05aqdOPaUX5v1K6KrchPNN2GE6Tdz5OO2v2ACWyinbBn12X +dnnmQphmiOAQhu+wodWXUMTpoURWz+57cSnrKAvNbTz6DPvb1mU5UwNTfSQn09h4 +h31GcJwT1UuEv1xp188BqF4OvBPFXkjrhyE= +-----END CERTIFICATE----- + diff --git a/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs b/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs index 9ea955edd61f..f02b38fa2f3d 100644 --- a/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs +++ b/src/Tests/trustedroots.Tests/GivenCodeSigningCtlFile.cs @@ -27,11 +27,13 @@ public GivenCodeSigningCtlFile() [InlineData("45140b3247eb9cc8c5b4f0d7b53091f73292089e6e5a63e2749dd3aca9198eda")] // CN=Go Daddy Root Certificate Authority - G2, O="GoDaddy.com, Inc.", L=Scottsdale, S=Arizona, C=US [InlineData("4b03f45807ad70f21bfc2cae71c9fde4604c064cf5ffb686bae5dbaad7fdd34c")] // CN=thawte Primary Root CA - G3, OU="(c) 2008 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US [InlineData("52f0e1c4e58ec629291b60317f074671b85d7ea80d5b07273463534b32b40234")] // CN=COMODO RSA Certification Authority, O=COMODO CA Limited, L=Salford, S=Greater Manchester, C=GB + [InlineData("5367f20c7ade0e2bca790915056d086b720c33c1fa2a2661acf787e3292e1270")] // CN=Microsoft Identity Verification Root Certificate Authority 2020, O=Microsoft Corporation, C=US [InlineData("552f7bdcf1a7af9e6ce672017f4f12abf77240c78e761ac203d1d9d20ac89988")] // CN=DigiCert Trusted Root G4, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL [InlineData("7353b6d6c2d6da4247773f3f07d075decb5134212bead0928ef1f46115260941")] // CN=DigiCert CS RSA4096 Root G5, O="DigiCert, Inc.", C=US [InlineData("7431e5f4c3c1ce4690774f0b61e05440883ba9a01ed00ba6abd7806ed3b118cf")] // CN=DigiCert High Assurance EV Root CA, OU=www.digicert.com, O=DigiCert Inc, C=US [InlineData("7b9d553e1c92cb6e8803e137f4f287d4363757f5d44b37d52f9fca22fb97df86")] // CN=GlobalSign Code Signing Root R45, O=GlobalSign nv-sa, C=BE + [InlineData("7e76260ae69a55d3f060b0fd18b2a8c01443c87b60791030c9fa0b0585101a38")] // CN=Sectigo Public Code Signing Root R46, O=Sectigo Limited, C=GB [InlineData("85666a562ee0be5ce925c1d8890a6f76a87ec16d4d7d5f29ea7419cf20123b69")] // CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, S=Texas, C=US [InlineData("85a0dd7dd720adb7ff05f83d542b209dc7ff4528f7d677b18389fea5e5c49e86")] // CN=QuoVadis Root CA 2, O=QuoVadis Limited, C=BM [InlineData("8d722f81a9c113c0791df136a2966db26c950a971db46b4199f4ea54b78bfb9f")] // CN=thawte Primary Root CA, OU="(c) 2006 thawte, Inc. - For authorized use only", OU=Certification Services Division, O="thawte, Inc.", C=US diff --git a/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs b/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs index bfdcd41fe0f7..9627566b9b23 100644 --- a/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs +++ b/src/Tests/trustedroots.Tests/GivenTimestampingCtlFile.cs @@ -29,10 +29,10 @@ public GivenTimestampingCtlFile() [InlineData("5c58468d55f58e497e743982d2b50010b6d165374acf83a7d4a32db768c4408e")] // CN=Certum Trusted Network CA, OU=Certum Certification Authority, O=Unizeto Technologies S.A., C=PL [InlineData("6dc47172e01cbcb0bf62580d895fe2b8ac9ad4f873801e0c10b9c837d21eb177")] // CN=Entrust.net Certification Authority (2048), OU=(c) 1999 Entrust.net Limited, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), O=Entrust.net [InlineData("6fff78e400a70c11011cd85977c459fb5af96a3df0540820d0f4b8607875e58f")] // CN=UTN-USERFirst-Object, OU=http://www.usertrust.com, O=The USERTRUST Network, L=Salt Lake City, S=UT, C=US + [InlineData("85666a562ee0be5ce925c1d8890a6f76a87ec16d4d7d5f29ea7419cf20123b69")] // CN=SSL.com Root Certification Authority RSA, O=SSL Corporation, L=Houston, S=Texas, C=US [InlineData("8a866fd1b276b57e578e921c65828a2bed58e9f2f288054134b7f1f4bfc9cc74")] // CN=QuoVadis Root CA 1 G3, O=QuoVadis Limited, C=BM [InlineData("a45ede3bbbf09c8ae15c72efc07268d693a21c996fd51e67ca079460fd6d8873")] // CN=QuoVadis Root Certification Authority, OU=Root Certification Authority, O=QuoVadis Limited, C=BM [InlineData("cbb522d7b7f127ad6a0113865bdf1cd4102e7d0759af635a7cf4720dc963c53b")] // CN=GlobalSign, O=GlobalSign, OU=GlobalSign Root CA - R3 - [InlineData("d7a7a0fb5d7e2731d771e9484ebcdef71d5f0c3e0a2948782bc83ee0ea699ef4")] // CN=AAA Certificate Services, O=Comodo CA Limited, L=Salford, S=Greater Manchester, C=GB [InlineData("e793c9b02fd8aa13e21c31228accb08119643b749c898964b1746d46c3d4cbd2")] // CN=USERTrust RSA Certification Authority, O=The USERTRUST Network, L=Jersey City, S=New Jersey, C=US public void File_contains_certificates_used_in_NuGet_org_package_signatures(string expectedFingerprint) { From a1950ff926193999ff64cdfbbd8848579ccb5a83 Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Tue, 2 Jul 2024 09:14:50 -0700 Subject: [PATCH 46/52] Update arcade --- eng/Version.Details.xml | 16 +++---- eng/Versions.props | 4 +- .../templates-official/job/source-build.yml | 8 ++++ .../job/source-index-stage1.yml | 35 ++++++++++----- .../templates-official/jobs/source-build.yml | 8 ++++ .../post-build/common-variables.yml | 1 - .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ eng/common/templates/job/source-build.yml | 8 ++++ .../templates/job/source-index-stage1.yml | 35 ++++++++++----- eng/common/templates/jobs/source-build.yml | 8 ++++ .../templates/post-build/common-variables.yml | 1 - .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../templates/steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ global.json | 4 +- 17 files changed, 292 insertions(+), 34 deletions(-) create mode 100644 eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 eng/common/templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates/steps/get-delegation-sas.yml create mode 100644 eng/common/templates/steps/get-federated-access-token.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13df27db4aa8..5d2b428f872f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -295,22 +295,22 @@ - + https://github.com/dotnet/arcade - 2eab07c3d7b78219d10099b19fafeef2ecae1779 + 1844d819e6f33f1106083c5066ea01e0310eefa3 - + https://github.com/dotnet/arcade - 2eab07c3d7b78219d10099b19fafeef2ecae1779 + 1844d819e6f33f1106083c5066ea01e0310eefa3 - + https://github.com/dotnet/arcade - 2eab07c3d7b78219d10099b19fafeef2ecae1779 + 1844d819e6f33f1106083c5066ea01e0310eefa3 - + https://github.com/dotnet/arcade - 2eab07c3d7b78219d10099b19fafeef2ecae1779 + 1844d819e6f33f1106083c5066ea01e0310eefa3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index edeb794e6a12..5bc57b77976d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -30,7 +30,7 @@ 4.0.0 6.0.0 6.0.4 - 6.0.0-beta.24266.4 + 6.0.0-beta.24326.2 3.1.0 4.3.0 4.3.0 @@ -174,7 +174,7 @@ 4.19.2 4.19.0 - 6.0.0-beta.24266.4 + 6.0.0-beta.24326.2 4.8.2 6.0.0-beta.22262.1 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f5fa09f41511..a6f7efa77685 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -59,6 +65,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index f04ad04c2b18..f6f0c15bfba4 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20240320.1 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -17,14 +18,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables pool: ${{ parameters.pool }} steps: @@ -40,8 +41,8 @@ jobs: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -53,7 +54,21 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" + + - script: | + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index b9a1f67b9a9a..9f60019cb01d 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates-official/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index fae340f4d20d..5404cc7ecbef 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -2,7 +2,6 @@ variables: - group: AzureDevOps-Artifact-Feeds-Pats - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - - group: DotNet-MSRC-Storage - group: Publish-Build-Assets # Whether the build is internal or not diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..93a8394a666b --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates-official/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..e3786cef6dfd --- /dev/null +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index b6137f44ada1..8009ccb954ac 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -58,6 +64,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b710698eb4d4..47f36e98bc16 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20240320.1 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -15,14 +16,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables pool: ${{ parameters.pool }} steps: @@ -38,8 +39,8 @@ jobs: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -51,7 +52,21 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" + + - script: | + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 7c240e654472..e3fbd9f38e10 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index fae340f4d20d..5404cc7ecbef 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -2,7 +2,6 @@ variables: - group: AzureDevOps-Artifact-Feeds-Pats - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - - group: DotNet-MSRC-Storage - group: Publish-Build-Assets # Whether the build is internal or not diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..54dc9416c519 --- /dev/null +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..c8c49cc0e8f0 --- /dev/null +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index 3197482b3cd3..6165e830f82c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24266.4", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24266.4" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24326.2", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24326.2" } } From 9ffffc7e31cc524234aeda3a3c2cce093b2a0cfb Mon Sep 17 00:00:00 2001 From: "Matt Mitchell (.NET)" Date: Tue, 2 Jul 2024 09:09:50 -0700 Subject: [PATCH 47/52] Use delegation SAS for internal builds --- .vsts-ci-richnav.yml | 8 +------- .vsts-ci.yml | 4 +--- .vsts-pr.yml | 10 +--------- eng/build-pr.yml | 2 ++ eng/build.yml | 1 + 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.vsts-ci-richnav.yml b/.vsts-ci-richnav.yml index e8ead69477c1..9bb3670e775a 100644 --- a/.vsts-ci-richnav.yml +++ b/.vsts-ci-richnav.yml @@ -10,12 +10,6 @@ pr: none variables: - name: teamName value: Roslyn-Project-System - - name: _DotNetPublishToBlobFeed - value: false - - name: _DotNetArtifactsCategory - value: .NETCore - - name: _DotNetValidationArtifactsCategory - value: .NETCore - name: _PublishToAzure value: false - name: PostBuildSign @@ -52,6 +46,7 @@ stages: - _SignArgs: '' - _InternalRuntimeDownloadArgs: '' steps: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - powershell: eng\common\build.ps1 -restore -ci @@ -67,7 +62,6 @@ stages: displayName: Build env: BuildConfig: $(_BuildConfig) - BlobFeedUrl: $(PB_PublishBlobFeedUrl) PublishType: $(_PublishType) TestFullMSBuild: 'true' SYSTEM_ACCESSTOKEN: $(System.AccessToken) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 9f308344fe08..3a7042c04dfe 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -22,11 +22,8 @@ variables: - name: _InternalRuntimeDownloadArgs value: '' - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - name: _DotNetPublishToBlobFeed - value: true - name: Codeql.Enabled value: true - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) @@ -104,6 +101,7 @@ extends: value: '' - template: /eng/common/templates-official/job/source-build.yml@self parameters: + enableInternalSources: true platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 8d05ec85b648..d76ef4451bdd 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -17,25 +17,16 @@ pr: variables: - name: teamName value: Roslyn-Project-System - - name: _DotNetPublishToBlobFeed - value: false - name: _CIBuild value: -restore -build -sign -pack -ci - - name: _DotNetArtifactsCategory - value: .NETCore - - name: _DotNetValidationArtifactsCategory - value: .NETCore - name: PostBuildSign value: true - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: _InternalRuntimeDownloadArgs value: '' - ${{ if ne(variables['System.TeamProject'], 'public') }}: - - name: _DotNetPublishToBlobFeed - value: true - name: Codeql.Enabled value: true - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) @@ -85,6 +76,7 @@ stages: _Test: '' - template: /eng/common/templates/job/source-build.yml parameters: + enableInternalSources: true platform: name: 'Managed' container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-3e800f1-20190501005343' diff --git a/eng/build-pr.yml b/eng/build-pr.yml index 5c7c26178f10..8907f6d9b090 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -64,6 +64,8 @@ jobs: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 $(_CIBuild) diff --git a/eng/build.yml b/eng/build.yml index 0ab5eb624767..c1af433219cc 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -75,6 +75,7 @@ jobs: arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - powershell: eng\common\build.ps1 $(_CIBuild) From 74ed3d72928804cc5f12d1b0a5e55b5f0033ef88 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Jul 2024 10:45:15 -0700 Subject: [PATCH 48/52] Update branding to 6.0.425 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index edeb794e6a12..0dbbf1c14e4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ - 6.0.424 + 6.0.425 servicing true From 7a77e990591a9df724a18ef16f2f1b8292059da4 Mon Sep 17 00:00:00 2001 From: Farhad Alizada Date: Thu, 20 Jun 2024 17:12:55 +0200 Subject: [PATCH 49/52] Onboard new inter-branch merge flow [Workflow] --- .github/workflows/inter-branch-merge-flow.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/workflows/inter-branch-merge-flow.yml diff --git a/.github/workflows/inter-branch-merge-flow.yml b/.github/workflows/inter-branch-merge-flow.yml new file mode 100644 index 000000000000..20246c14fc58 --- /dev/null +++ b/.github/workflows/inter-branch-merge-flow.yml @@ -0,0 +1,13 @@ +name: Inter-branch merge workflow +on: + push: + branches: + - release/** + +permissions: + contents: write + pull-requests: write + +jobs: + Merge: + uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@main \ No newline at end of file From 4fa176d38f0779d2219c215f8a85115d020de997 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Jul 2024 12:34:51 +0000 Subject: [PATCH 50/52] Update dependencies from https://github.com/dotnet/razor build 20240705.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24326.2 -> To Version 7.0.0-preview.24355.1 --- 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 19602a05c4e0..868287a412ec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -285,18 +285,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://github.com/dotnet/razor - 6f2caf542643b6c72369e41172572015d8f48311 + 459fb2aa78c5e16dfc1eb25f078ead54d3a88fb5 - + https://github.com/dotnet/razor - 6f2caf542643b6c72369e41172572015d8f48311 + 459fb2aa78c5e16dfc1eb25f078ead54d3a88fb5 - + https://github.com/dotnet/razor - 6f2caf542643b6c72369e41172572015d8f48311 + 459fb2aa78c5e16dfc1eb25f078ead54d3a88fb5 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index 26a183dab0cf..fed58f328585 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,9 +176,9 @@ - 7.0.0-preview.24326.2 - 7.0.0-preview.24326.2 - 7.0.0-preview.24326.2 + 7.0.0-preview.24355.1 + 7.0.0-preview.24355.1 + 7.0.0-preview.24355.1 From 6046bbe7d3cd87ac5c488f62658397d443a2f28c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Jul 2024 12:33:56 +0000 Subject: [PATCH 51/52] Update dependencies from https://github.com/dotnet/razor build 20240705.1 Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24326.2 -> To Version 7.0.0-preview.24355.1 From a7eaffbf99c63d90864d756acd6131a93c3ff3dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jul 2024 12:58:58 +0000 Subject: [PATCH 52/52] Update dependencies from https://github.com/dotnet/arcade build 20240709.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24352.1 -> To Version 8.0.0-beta.24359.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../job/publish-build-assets.yml | 9 ++++++--- .../templates/job/publish-build-assets.yml | 9 ++++++--- global.json | 4 ++-- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 868287a412ec..ba4fe89c2d7b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -483,22 +483,22 @@ - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index fed58f328585..8ae4aed92fc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24352.1 + 8.0.0-beta.24359.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -210,7 +210,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24352.1 + 8.0.0-beta.24359.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index d01739c12857..ba3e7df81587 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -140,11 +140,14 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -WaitPublishingFinish true diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 9fd69fa7c9b7..57a41f0a3e13 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -136,11 +136,14 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -WaitPublishingFinish true diff --git a/global.json b/global.json index ddd87ad0324e..fea7d13eed93 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24352.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24352.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24359.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24359.3" } }