From e97d5631e2d4d2b6c33875ba3bda1e7394a75a0c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 19:39:30 +0000 Subject: [PATCH 1/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop build 20241017.2 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.35 -> To Version 6.0.36 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop From Version 6.0.35-servicing.24462.14 -> To Version 6.0.36-servicing.24516.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1f803bc95e09..6d933afbf313 100644 --- a/NuGet.config +++ b/NuGet.config @@ -25,10 +25,7 @@ - - - - + @@ -63,10 +60,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6be88401650..7bca083dd94f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -174,25 +174,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 70ae3df4a6f3c92fb6b315afc405edd10ff38579 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - fc5b097885ceb7463eb7163477356a39a359846f + 320a638db589cc9b24e3e5217d7ca34df840104a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c9e44425226553e639116ff82698cfd2808f7769 + a7dff252f2a6b0ff48ffe946a20584f61282aa13 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index a0a96534e111..d81b3510f736 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,11 +145,11 @@ - 6.0.35-servicing.24462.14 + 6.0.36-servicing.24516.3 - 6.0.35-servicing.24463.5 + 6.0.36-servicing.24517.2 From b9b9c69fe48dea6d202c6873d474e820c2853a19 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 22:35:31 +0000 Subject: [PATCH 2/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore build 20241016.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.35-servicing.24462.14 -> To Version 6.0.36-servicing.24516.4 --- NuGet.config | 10 ++---- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++------ 3 files changed, 52 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6d933afbf313..005c1a7726f2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,7 @@ - - - - + @@ -42,10 +39,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7bca083dd94f..791fd453ad73 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 - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -194,78 +194,78 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf a7dff252f2a6b0ff48ffe946a20584f61282aa13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 827b96040e62e5aa47d829bfa61c000d315d4f2e + 64ea4108e7dcf1ca575f8dd2028363b0b1ef6ebc https://github.com/aspnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index d81b3510f736..aafbbd24b523 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -132,16 +132,16 @@ - 6.0.35-servicing.24462.14 - 6.0.35 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 - 6.0.35-servicing.24462.14 - 6.0.35 - 6.0.35 - 6.0.35 - 6.0.35 - 6.0.35-servicing.24462.14 + 6.0.36-servicing.24516.4 + 6.0.36 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 + 6.0.36-servicing.24516.4 + 6.0.36 + 6.0.36 + 6.0.36 + 6.0.36 + 6.0.36-servicing.24516.4 From 5aae23203b776cf0042a9efa59caf402fc977784 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 22:35:58 +0000 Subject: [PATCH 3/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20241014.21 Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , System.Reflection.MetadataLoadContext , System.Security.Cryptography.Pkcs , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.6.0 , VS.Redist.Common.NetCore.TargetingPack.x64.6.0 From Version 6.0.1 -> To Version 6.0.2 --- NuGet.config | 6 ++--- eng/Version.Details.xml | 50 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++-------- 3 files changed, 36 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 005c1a7726f2..75a09bc5aef6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,7 @@ - - + @@ -44,8 +43,7 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 791fd453ad73..b78ac11bf51c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -30,41 +30,41 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - b357f86ce3bce7c232ea242074b17bebdc50b543 + f1dd57165bfd91875761329ac3a8b17f6606ad18 https://github.com/dotnet/msbuild @@ -162,9 +162,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c76ac565499f3e7c657126d46c00b67a0d74832c - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + f1dd57165bfd91875761329ac3a8b17f6606ad18 https://github.com/dotnet/runtime @@ -294,9 +294,9 @@ 10d0f7e94aa45889155c312f51cfc01bf326b853 - - https://github.com/dotnet/runtime - e37fab9fc9f7bce120a7165491ed392a73f8ab51 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + f1dd57165bfd91875761329ac3a8b17f6606ad18 @@ -317,9 +317,9 @@ https://github.com/dotnet/arcade bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + f1dd57165bfd91875761329ac3a8b17f6606ad18 https://github.com/dotnet/xliff-tasks diff --git a/eng/Versions.props b/eng/Versions.props index aafbbd24b523..2fb9e112b952 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ $(NewtonsoftJsonPackageVersion) 4.0.0 5.0.0 - 6.0.4 + 6.0.5 6.0.0-beta.24508.2 3.1.0 6.0.0 @@ -34,20 +34,20 @@ 4.3.0 4.0.5 5.0.2 - 6.0.0 + 6.0.1 1.0.0-preview5.1.22263.1 4.6.0 2.0.0-beta1.21473.1 - 6.0.35 - 6.0.35-servicing.24459.18 - 6.0.35 + 6.0.36 + 6.0.36-servicing.24514.21 + 6.0.36 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) - 6.0.1 - 6.0.35 - 6.0.35-servicing.24459.18 + 6.0.2 + 6.0.36 + 6.0.36-servicing.24514.21 6.0.0-preview.7.21363.9 6.0.1 6.0.1 @@ -83,7 +83,7 @@ 6.0.0 - 6.0.0 + 6.0.1 5.0.0-preview.7.20364.11 6.0.0 From 7c426d218d712f8ca6903d912a198daf45d25e32 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 22:36:25 +0000 Subject: [PATCH 4/4] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-templating build 20241015.6 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.135 -> To Version 6.0.135 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 75a09bc5aef6..328a0a2e6ad7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,10 +15,7 @@ - - - - + @@ -46,10 +43,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b78ac11bf51c..e5ef8936eab9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,34 +1,34 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1e5db134e25b38b223858e7dd497f9f8a9312f4e + 9dc082ffb55d5b9c5b3bc8d34dc90a56fa88593f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2fb9e112b952..8e619b60e7ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -111,7 +111,7 @@ - 6.0.135-servicing.24466.4 + 6.0.135-servicing.24515.6 6.0.135 6.0.135 6.0.135