From d262b547e5426241583be787d1a8a599ce6e4a9c Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Mon, 4 Nov 2024 16:26:09 -0800 Subject: [PATCH 1/9] Create Subdirectory for Temp Deps.Json File. Please contact me for further information regarding this change. --- .../CommandResolution/ProjectToolsCommandResolver.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs index 5cef06aac0bb..df194aee92a3 100644 --- a/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs +++ b/src/Cli/dotnet/CommandFactory/CommandResolution/ProjectToolsCommandResolver.cs @@ -337,7 +337,7 @@ internal void GenerateDepsJsonFile( LocalizableStrings.GeneratingDepsJson, depsPath)); - var tempDepsFile = Path.GetTempFileName(); + var tempDepsFile = Path.Combine(PathUtilities.CreateTempSubdirectory(), Path.GetRandomFileName()); var args = new List(); From aaaba35c60c58e388637d347d6836853efcf792d Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 4 Dec 2024 00:36:41 +0000 Subject: [PATCH 2/9] Merged PR 45636: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-runtime 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.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.11 to 8.0.12 (parent: Microsoft.NETCore.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: dd95552e-72fb-4363-9b59-08dbd5a5c3e7 - **Build**: 20241203.5 - **Date Produced**: December 3, 2024 11:28:49 PM UTC - **Commit**: 89ef51c5d8f5239345127a1e282e11036e590c8b - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.NET.HostModel**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1] - **Microsoft.NET.ILLink.Tasks**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.11 to 8.0.12][1] - **Microsoft.NETCore.Platforms**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1] - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1] - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.11-servicing.24517.7 to 8.0.12-servicing.24603.5][1] - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.11 to 8.0.12][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5&targetVersion=GC89ef51c5d8f5239345127a1e282e11036e590c8b&_a=files [2]: https://github.com/dotnet/emsdk/compare/f6237140b3...c458a7647c [DependencyUpdate]: <> (End) [marker]: <> (End:dd95552e-72fb-4363-9b59-08dbd5a5c3e7) --- NuGet.config | 3 +++ eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8a7b728112d4..39308e49c28c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,7 @@ + @@ -24,6 +25,7 @@ + @@ -67,6 +69,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4264b816e973..9d853eaa109f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -14,46 +14,46 @@ 7e0acf900fbe1081a0cf8981b0139aba830b3318 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff https://github.com/dotnet/msbuild @@ -200,9 +200,9 @@ https://github.com/microsoft/vstest aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bdb8f07c54d1..551ea952c125 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,18 +49,18 @@ - 8.0.11 - 8.0.11-servicing.24517.7 - 8.0.11 + 8.0.12 + 8.0.12-servicing.24603.5 + 8.0.12 $(MicrosoftNETCoreAppRuntimewinx64PackageVersion) 8.0.2 - 8.0.11 - 8.0.11-servicing.24517.7 + 8.0.12 + 8.0.12-servicing.24603.5 8.0.0 8.0.1 8.0.2 8.0.1 - 8.0.11 + 8.0.12 8.0.0 8.0.0 8.0.11 @@ -225,7 +225,7 @@ - 8.0.11 + 8.0.12 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From d27975b5ef47a37a4ca3990f1a25b996feae3755 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 4 Dec 2024 05:20:14 +0000 Subject: [PATCH 3/9] Merged PR 45648: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore This pull request updates the following dependencies [marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 5ae73aca-14b4-4570-17b0-08dbd53e3897 - **Build**: 20241203.9 - **Date Produced**: December 4, 2024 3:01:09 AM UTC - **Commit**: 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **dotnet-user-jwts**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **dotnet-user-secrets**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.11 to 8.0.12][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.12][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.11 to 8.0.12][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.11 to 8.0.12][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.11 to 8.0.12][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.11 to 8.0.12][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.11 to 8.0.12][1] - **Microsoft.JSInterop**: [from 8.0.11 to 8.0.12][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.11-servicing.24521.16 to 8.0.12-servicing.24603.9][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC47576478939fdd59b4400ad135f47938af486ab3&targetVersion=GC6b7b74f519fd8876bdcd2939a45e3fdab2b3513f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5ae73aca-14b4-4570-17b0-08dbd53e3897) --- NuGet.config | 2 ++ eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 16 ++++----- 3 files changed, 46 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 39308e49c28c..3a9ab426f754 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + @@ -55,6 +56,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d853eaa109f..7c6ab00ce03d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -248,50 +248,50 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 42a83a56d421ac71312453e53dbacc3d2ae6d432 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f https://github.com/dotnet/razor @@ -306,21 +306,21 @@ https://github.com/dotnet/razor 0d10fb38d28484fc4189a5441d258d60c3cf2ca3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f https://github.com/dotnet/xdt @@ -437,9 +437,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 551ea952c125..1d8b944b38eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,7 +63,7 @@ 8.0.12 8.0.0 8.0.0 - 8.0.11 + 8.0.12 8.0.0 8.0.0 8.0.0 @@ -165,13 +165,13 @@ - 8.0.11 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11 + 8.0.12 + 8.0.12-servicing.24603.9 + 8.0.12-servicing.24603.9 + 8.0.12-servicing.24603.9 + 8.0.12-servicing.24603.9 + 8.0.12-servicing.24603.9 + 8.0.12 From f7cd007b9d25fd00e34a9e31da5e9b6b47de2ca2 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 4 Dec 2024 17:36:26 +0000 Subject: [PATCH 4/9] Merged PR 45652: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-aspnetcore, dnceng/internal/dotnet-windowsdesktop This pull request updates the following dependencies [marker]: <> (Begin:5ae73aca-14b4-4570-17b0-08dbd53e3897) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - **Subscription**: 5ae73aca-14b4-4570-17b0-08dbd53e3897 - **Build**: 20241203.12 - **Date Produced**: December 4, 2024 7:28:32 AM UTC - **Commit**: 31d685b2d9a86ca1243014d175a3da813f78e428 - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **dotnet-dev-certs**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **dotnet-user-jwts**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **dotnet-user-secrets**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **Microsoft.AspNetCore.Analyzers**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.12 to 8.0.12][1] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.12 to 8.0.12][1] - **Microsoft.AspNetCore.Authorization**: [from 8.0.12 to 8.0.12][1] - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **Microsoft.AspNetCore.Components.Web**: [from 8.0.12 to 8.0.12][1] - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] - **Microsoft.AspNetCore.TestHost**: [from 8.0.12 to 8.0.12][1] - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.12 to 8.0.12][1] - **Microsoft.Extensions.ObjectPool**: [from 8.0.12 to 8.0.12][1] - **Microsoft.JSInterop**: [from 8.0.12 to 8.0.12][1] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.12-servicing.24603.9 to 8.0.12-servicing.24603.12][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC6b7b74f519fd8876bdcd2939a45e3fdab2b3513f&targetVersion=GC31d685b2d9a86ca1243014d175a3da813f78e428&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5ae73aca-14b4-4570-17b0-08dbd53e3897) [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 8.0.11-servicing.24521.7 to 8.0.12-servicing.24603.5 (parent: Microsoft.Windows... --- NuGet.config | 6 ++-- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 12 +++---- 3 files changed, 48 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a9ab426f754..76221a981af5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,7 @@ - + @@ -32,6 +32,7 @@ + @@ -56,7 +57,7 @@ - + @@ -74,6 +75,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c6ab00ce03d..c8f43e0a244a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,13 +111,13 @@ https://github.com/dotnet/roslyn 4ff64493649bd045ced204661958393dc5575e96 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted @@ -228,70 +228,70 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42a83a56d421ac71312453e53dbacc3d2ae6d432 + 6a2a510ae56ff16665d95b96a0920e2fd45e1d2b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://github.com/dotnet/razor @@ -308,19 +308,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://github.com/dotnet/xdt @@ -439,7 +439,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6b7b74f519fd8876bdcd2939a45e3fdab2b3513f + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1d8b944b38eb..cce63cff76d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,11 +166,11 @@ 8.0.12 - 8.0.12-servicing.24603.9 - 8.0.12-servicing.24603.9 - 8.0.12-servicing.24603.9 - 8.0.12-servicing.24603.9 - 8.0.12-servicing.24603.9 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 8.0.12 @@ -181,7 +181,7 @@ - 8.0.11-servicing.24521.7 + 8.0.12-servicing.24603.5 From e4f75d4c0509a125b0c5f933b8da749a9fe3083f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Jan 2025 03:51:54 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/dotnet/msbuild build 20250116.3 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.8.15-preview-24613-11 -> To Version 17.8.18-preview-25066-03 --- NuGet.config | 19 ++++++++++++++++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97f57f595d5d..e4e533b1ea7c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,9 @@ + + + @@ -19,20 +22,27 @@ + + + - + + + + + @@ -57,6 +67,9 @@ + + + @@ -72,9 +85,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34285d9be1c7..72bea52a38b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -55,17 +55,17 @@ https://github.com/dotnet/emsdk c458a7647c04e323c238f381eb176af24254b3ff - + https://github.com/dotnet/msbuild - e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef + 31744dfcae98daa4dcc011c6ebf6d404b93fcf5c - + https://github.com/dotnet/msbuild - e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef + 31744dfcae98daa4dcc011c6ebf6d404b93fcf5c - + https://github.com/dotnet/msbuild - e2abee08172c2efeae8bb2db8d292cbd9c1aa1ef + 31744dfcae98daa4dcc011c6ebf6d404b93fcf5c diff --git a/eng/Versions.props b/eng/Versions.props index 022b502ff51a..8b1ee6b9d2ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -121,7 +121,7 @@ - 17.8.15 + 17.8.18 $(MicrosoftBuildPackageVersion) + + + @@ -19,6 +22,9 @@ + + + @@ -27,12 +33,16 @@ + + + + @@ -57,6 +67,9 @@ + + + @@ -72,9 +85,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34285d9be1c7..b3db0f8d5149 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 022b502ff51a..fa131aca1a99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25060.1 + 8.0.0-beta.25064.11 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25060.1 + 8.0.0-beta.25064.11 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 20106ebd00aa..d785ea18f069 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.110", + "dotnet": "8.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25064.11" } } From 7636d5ad5ba1a060ea7a2f334eb3283686f55054 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Jan 2025 07:07:32 +0000 Subject: [PATCH 7/9] Update dependencies from https://github.com/dotnet/templating build 20250115.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.113-servicing.25062.5 -> To Version 8.0.113-servicing.25065.1 --- NuGet.config | 19 ++++++++++++++++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 24 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 97f57f595d5d..509e4a9bd001 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,9 @@ + + + @@ -19,6 +22,9 @@ + + + @@ -27,12 +33,16 @@ + - + + + + @@ -57,6 +67,9 @@ + + + @@ -72,9 +85,13 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 34285d9be1c7..9b184ebe4c8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 3dc94e390f9d515149fe99e64bf5daa8133aff4d + 4d0f12a0d6a2cfd586d8308021be21c61ef9c52f - + https://github.com/dotnet/templating - 3dc94e390f9d515149fe99e64bf5daa8133aff4d + 4d0f12a0d6a2cfd586d8308021be21c61ef9c52f - + https://github.com/dotnet/templating - 3dc94e390f9d515149fe99e64bf5daa8133aff4d + 4d0f12a0d6a2cfd586d8308021be21c61ef9c52f diff --git a/eng/Versions.props b/eng/Versions.props index 022b502ff51a..2b24a4c9afb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.113-servicing.25062.5 + 8.0.113-servicing.25065.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 605bc4d9de4702636a7227ad5f0b7534b452d15e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Jan 2025 05:01:54 +0000 Subject: [PATCH 8/9] Update dependencies from https://github.com/dotnet/arcade build 20250116.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25064.11 -> To Version 8.0.0-beta.25066.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 754169a3044f..b93ee049e67b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9ad4977a8231..19b91a625601 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25064.11 + 8.0.0-beta.25066.6 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25064.11 + 8.0.0-beta.25066.6 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 73828dd30d31..4f0546dce120 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 60352ede194e..a00577ed17aa 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2 - $defaultXCopyMSBuildVersion = '17.8.1-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index d785ea18f069..8b18dee78510 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25064.11" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6" } } From 55168de68e3071a5217001a70902b5e1599ca773 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Jan 2025 06:55:32 +0000 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/templating build 20250116.8 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.113-servicing.25062.5 -> To Version 8.0.113-servicing.25066.8 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index 509e4a9bd001..c334ee4b4e40 100644 --- a/NuGet.config +++ b/NuGet.config @@ -36,7 +36,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b184ebe4c8a..997cd06556d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 4d0f12a0d6a2cfd586d8308021be21c61ef9c52f + 335a66efa4126495303c20598f1d9537d5d6897c - + https://github.com/dotnet/templating - 4d0f12a0d6a2cfd586d8308021be21c61ef9c52f + 335a66efa4126495303c20598f1d9537d5d6897c - + https://github.com/dotnet/templating - 4d0f12a0d6a2cfd586d8308021be21c61ef9c52f + 335a66efa4126495303c20598f1d9537d5d6897c diff --git a/eng/Versions.props b/eng/Versions.props index 2b24a4c9afb9..65820b370a78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.113-servicing.25065.1 + 8.0.113-servicing.25066.8 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion)