From cd0d7b4ad47e5f848054c738b2d1f8a69796baa0 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 16 Aug 2024 17:06:57 +0000 Subject: [PATCH 01/26] Merged PR 41531: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240816.4 - **Date Produced**: August 16, 2024 4:11:44 PM UTC - **Commit**: 85d7e1ee6931838809c8c32856b69a131552793a - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.426-servicing.24415.29 to 6.0.426-servicing.24416.4][17] - **Microsoft.NET.Sdk**: [from 6.0.426-servicing.24415.29 to 6.0.426-servicing.24416.4][17] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][18] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][18] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][18] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][18] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.33-servicing.24366.4 to 6.0.34-servicing.24415.3][19] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][18] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6][20] [17]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC691dfd4e7210727bb4c4385606495ec22d1ec727&targetVersion=GC85d7e1ee6931838809c8c32856b69a131552793a&_a=files [18]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&targetVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&_a=files [19]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6a984c48f3489b60f25deb72ede6e5051bb130d4&targetVersion=GC43d5519b7b6f2093342515c04b054e88df71729e&_a=files [20]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&targetVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) [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.WindowsDesktop.App.Ref**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7 (parent: Microsoft.NET.Sdk... --- NuGet.config | 33 ++++---------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++--------- 3 files changed, 78 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d7ecd6e6201..ae2eee4205d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,31 +7,22 @@ - + - - - - + - + - - - - + - - - - + @@ -52,22 +43,16 @@ - + - + - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3296ed9a4f9..35b4924f0fe2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - db4e5a36567b85765753af097e878d894a3552c9 + 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 6c636980f730a30c3f5352cff80ce035ae53f016 + 4493500184d43f2d0c60001d557433e40de1663c @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f0f9de5692adf1c0576de062f93c6ab7b176433f + c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8413a0dffce5dd2f6d53d6156e25f3bf649da60b + 8258476be31dcbbb6c69693eeafda17db361f28f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8413a0dffce5dd2f6d53d6156e25f3bf649da60b + 8258476be31dcbbb6c69693eeafda17db361f28f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8413a0dffce5dd2f6d53d6156e25f3bf649da60b + 8258476be31dcbbb6c69693eeafda17db361f28f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad + 85d7e1ee6931838809c8c32856b69a131552793a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7f9bab3b70e32ae000f8b6bc20e3a9d6bd4502ad + 85d7e1ee6931838809c8c32856b69a131552793a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6a984c48f3489b60f25deb72ede6e5051bb130d4 + 43d5519b7b6f2093342515c04b054e88df71729e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b660c1e83039451abe9d9190a7aabe87c03fd7ae + 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 https://github.com/dotnet/fsharp @@ -135,9 +135,9 @@ 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - e66cbcaa36aa719936a46160198c9012c6e174e4 + 55d70c3aad879b95a3620d64c0a2c07e27afd80d linker @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 849e1a63a8319f9578b9e5f02da592d24d4aa2df + ec74ec8f24328a3e33feda7cc4d5064ef4565220 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index fc8859391888..23ab4ec656de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.33-servicing.24366.4 + 6.0.34-servicing.24415.3 - 6.0.33-servicing.24366.5 + 6.0.34-servicing.24415.6 @@ -43,20 +43,20 @@ - 6.0.33 - 6.0.33 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 - 6.0.33-servicing.24379.5 + 6.0.34 + 6.0.34 + 6.0.34-servicing.24415.2 + 6.0.34-servicing.24415.2 + 6.0.34-servicing.24415.2 + 6.0.34-servicing.24415.2 0.2.0 - 6.0.425-servicing.24379.11 - 6.0.425-servicing.24379.11 + 6.0.426-servicing.24416.4 + 6.0.426-servicing.24416.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,20 +67,20 @@ - 6.0.33-servicing.24366.10 - 6.0.33-servicing.24366.10 - 6.0.33 - 6.0.33 - 6.0.33 - 6.0.33 + 6.0.34-servicing.24412.10 + 6.0.34-servicing.24412.10 + 6.0.34 + 6.0.34 + 6.0.34 + 6.0.34 2.1.0 - 6.0.33-servicing.24366.6 - 6.0.33-servicing.24366.6 - 6.0.33 - 6.0.33 + 6.0.34-servicing.24415.7 + 6.0.34-servicing.24415.7 + 6.0.34 + 6.0.34 @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.33 + 6.0.34 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 09a14fe195e075be9c7f21923b08af7de8257bb6 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Sat, 17 Aug 2024 15:30:15 +0000 Subject: [PATCH 02/26] Merged PR 41822: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 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.WindowsDesktop.App.Ref**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.8-servicing.24366.8 to 8.0.9-servicing.24416.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.8-servicing.24366.8 to 8.0.9-servicing.24416.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.8-servicing.24366.12 to 8.0.9-servicing.24415.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.8-servicing.24366.12 to 8.0.9-servicing.24415.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.8-servicing.24366.12 to 8.0.9-servicing.24415.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.8-servicing.24366.6 to 8.0.9-servicing.24416.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.8-servicing.24366.7 to 8.0.9-servicing.24416.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Mi... --- NuGet.config | 65 ++++------------------- eng/Version.Details.xml | 112 ++++++++++++++++++++-------------------- eng/Versions.props | 50 +++++++++--------- 3 files changed, 90 insertions(+), 137 deletions(-) diff --git a/NuGet.config b/NuGet.config index 320f2d560da3..843d3846601e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,50 +7,22 @@ - - - - - - - - - - + - - + - + - - - - - - - - - - + - - - - - - - - - - + @@ -70,34 +42,15 @@ - - + - + - - - - - - - - - - + - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 31f7dc78945e..2a01c4ff6980 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ea3de9bc7ffabcdcb090eee475eae763e42dd89 + b405dfbea175100cf15ade51220fc38ea27bf82f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ea3de9bc7ffabcdcb090eee475eae763e42dd89 + b405dfbea175100cf15ade51220fc38ea27bf82f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ea3de9bc7ffabcdcb090eee475eae763e42dd89 + b405dfbea175100cf15ade51220fc38ea27bf82f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ea3de9bc7ffabcdcb090eee475eae763e42dd89 + b405dfbea175100cf15ade51220fc38ea27bf82f https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd164556d31c13b09986f597f49a83bf836c165d + f1f8971ac89d8ea8b4a4f0971dd307e0c318fae7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 883fc207bb50622d4458ff09ae6a62548783826a + f0d6934ff6cfe796b114fbc4cce13fb2ce79668f https://github.com/dotnet/fsharp @@ -146,13 +146,13 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://github.com/dotnet/roslyn - 2975b0a592ac27549e1b9d0e786243f9cb569316 + 302f7876e6784ee3689fb28bb3480759b6c31658 @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - e92f92efe5854b6fe013787830b59166cb9b4ed9 + 885abbe904afd5987f463378522b82a2cc011cac https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - e92f92efe5854b6fe013787830b59166cb9b4ed9 + 885abbe904afd5987f463378522b82a2cc011cac diff --git a/eng/Versions.props b/eng/Versions.props index 84b5baa43510..cd2e0de489b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.8-servicing.24366.6 + 8.0.9-servicing.24416.1 - 8.0.8-servicing.24366.7 + 8.0.9-servicing.24416.4 @@ -65,52 +65,52 @@ - 8.0.8 - 8.0.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 + 8.0.9 + 8.0.9 + 8.0.9-servicing.24416.3 + 8.0.9-servicing.24416.3 + 8.0.9-servicing.24416.3 + 8.0.9-servicing.24416.3 + 8.0.9-servicing.24416.3 0.2.0 - 8.0.108 - 8.0.108-servicing.24369.10 - 8.0.108-servicing.24369.10 + 8.0.109 + 8.0.109-servicing.24416.18 + 8.0.109-servicing.24416.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.24362.3 + 4.8.0-7.24378.1 - 8.0.8-servicing.24366.12 + 8.0.9-servicing.24415.9 - 8.0.8-servicing.24366.12 - 8.0.8-servicing.24366.12 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 + 8.0.9-servicing.24415.9 + 8.0.9-servicing.24415.9 + 8.0.9 + 8.0.9 + 8.0.9 + 8.0.9 2.1.0 8.0.1 6.0.1 - 8.0.8-servicing.24366.8 - 8.0.8-servicing.24366.8 - 8.0.8 - 8.0.8 + 8.0.9-servicing.24416.2 + 8.0.9-servicing.24416.2 + 8.0.9 + 8.0.9 @@ -204,7 +204,7 @@ 14.0.8478 17.0.8478 - 8.0.8 + 8.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 0a32d15c4ae683fee27359d9f15454875c795bf0 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Mon, 19 Aug 2024 17:40:06 +0000 Subject: [PATCH 03/26] Merged PR 41862: Update MsftToSbSdkFiles.diff Fixes https://github.com/dotnet/source-build/issues/4563 Update MsftToSbSdkFiles.diff Coordinated in Servicing channel - this change has approval to go in. ---- #### AI description (iteration 1) #### PR Classification Code cleanup #### PR Summary This pull request updates the baseline diff file by removing an unnecessary entry. - `src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff`: Removed the entry for `Microsoft.NET.Build.Containers.deps.json`. --- .../assets/baselines/MsftToSbSdkFiles.diff | 1 - 1 file changed, 1 deletion(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff index 4c2d7775b7c0..da35c468b7d6 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdkFiles.diff @@ -201,7 +201,6 @@ index ------------ -./sdk/x.y.z/Containers/tasks/net472/Microsoft.Extensions.Options.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.Extensions.Primitives.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.IO.Redist.dll --./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.deps.json -./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.dll -./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.Build.Containers.dll.config -./sdk/x.y.z/Containers/tasks/net472/Microsoft.NET.StringTools.dll From d4465ef2e845f5af8e8e5d6485e53a25fd0fe55d Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 20 Aug 2024 16:35:24 +0000 Subject: [PATCH 04/26] Merged PR 41823: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk 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.WindowsDesktop.App.Ref**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.34 to 6.0.34 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240819.21 - **Date Produced**: August 19, 2024 6:47:13 PM UTC - **Commit**: b426ce913f1dadfb36ef0340fac54c062e773ab8 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.426-servicing.24417.8 to 6.0.426-servicing.24419.21][6] - **Microsoft.NET.Sdk**: [from 6.0.426-servicing.24417.8 to 6.0.426-servicing.24419.21][6] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][7] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][7] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24415.7 to 6.0.34-servicing.24419.1][7] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][7] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.34-servicing.24415.3 to 6.0.34-servicing.24417.1][8] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][7] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.34-servicing.24415.6 to 6.0.34-servicing.24417.2][9] [6]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC082c978531eff9587a55d1132f86e122f18a3415&targetVersion=GC... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index ae2eee4205d3..33602d176896 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,13 +16,13 @@ - + - + - + @@ -43,16 +43,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35b4924f0fe2..a33131766464 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4e044058aadccd22bc0dc7ecb27ca7f5ab270584 + 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4493500184d43f2d0c60001d557433e40de1663c + 98588b0f0d72383aca8722755d838ae1d542ce62 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c1e97e207e71a0005d34a2098cbdfeecfd3b5ca6 + e19ee616d4c5538bc5adb2335d85e0c7f9d30000 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8258476be31dcbbb6c69693eeafda17db361f28f + 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8258476be31dcbbb6c69693eeafda17db361f28f + 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 8258476be31dcbbb6c69693eeafda17db361f28f + 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d7e1ee6931838809c8c32856b69a131552793a + b426ce913f1dadfb36ef0340fac54c062e773ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 85d7e1ee6931838809c8c32856b69a131552793a + b426ce913f1dadfb36ef0340fac54c062e773ab8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 43d5519b7b6f2093342515c04b054e88df71729e + a625f79930686c2e7598d0cb0a6ba715ef176e4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5429ff1d84d93927157f54d620a0ad9ebf1f10b9 + 0716b4331761db24b6c5f2f52e8bcd32b6bd065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 23ab4ec656de..d09d91045288 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.34-servicing.24415.3 + 6.0.34-servicing.24417.1 - 6.0.34-servicing.24415.6 + 6.0.34-servicing.24417.2 @@ -45,18 +45,18 @@ 6.0.34 6.0.34 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 - 6.0.34-servicing.24415.2 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 + 6.0.34-servicing.24417.1 0.2.0 - 6.0.426-servicing.24416.4 - 6.0.426-servicing.24416.4 + 6.0.426-servicing.24419.21 + 6.0.426-servicing.24419.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,8 +67,8 @@ - 6.0.34-servicing.24412.10 - 6.0.34-servicing.24412.10 + 6.0.34-servicing.24416.23 + 6.0.34-servicing.24416.23 6.0.34 6.0.34 6.0.34 @@ -77,8 +77,8 @@ - 6.0.34-servicing.24415.7 - 6.0.34-servicing.24415.7 + 6.0.34-servicing.24419.1 + 6.0.34-servicing.24419.1 6.0.34 6.0.34 From 597f5ad4f2d1fea17f95abce5a8023f2dbeb232e Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 21 Aug 2024 18:44:11 +0000 Subject: [PATCH 05/26] Merged PR 41921: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20240820.10 - **Date Produced**: August 20, 2024 5:51:01 PM UTC - **Commit**: f863cc8f81bb49634de55c498714f67c976d9cd8 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.109 to 8.0.109][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.109-servicing.24416.18 to 8.0.109-servicing.24420.10][1] - **Microsoft.NET.Sdk**: [from 8.0.109-servicing.24416.18 to 8.0.109-servicing.24420.10][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.109-servicing.24416.18 to 8.0.109-servicing.24420.10][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb405dfbea175100cf15ade51220fc38ea27bf82f&targetVersion=GCf863cc8f81bb49634de55c498714f67c976d9cd8&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 843d3846601e..c47c0b90d584 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad4873044b40..4000c02639e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b405dfbea175100cf15ade51220fc38ea27bf82f + f863cc8f81bb49634de55c498714f67c976d9cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b405dfbea175100cf15ade51220fc38ea27bf82f + f863cc8f81bb49634de55c498714f67c976d9cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b405dfbea175100cf15ade51220fc38ea27bf82f + f863cc8f81bb49634de55c498714f67c976d9cd8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b405dfbea175100cf15ade51220fc38ea27bf82f + f863cc8f81bb49634de55c498714f67c976d9cd8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index cd2e0de489b2..2b4d698a0d87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.109 - 8.0.109-servicing.24416.18 - 8.0.109-servicing.24416.18 + 8.0.109-servicing.24420.10 + 8.0.109-servicing.24420.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3cdeb446c4684e09cd3b83fa77d79da9c7b0c961 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Sep 2024 17:58:01 +0000 Subject: [PATCH 06/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240910.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.426-servicing.24419.21 -> To Version 6.0.427-servicing.24460.7 Dependency coherency updates Microsoft.NET.ILLink.Tasks From Version 6.0.200-1.24366.1 -> To Version 6.0.200-1.24429.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 29 +++++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 37 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 33602d176896..5dde9b6a0451 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,38 @@ + + + + + + + + + + + + + + + + + @@ -43,15 +60,27 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a33131766464..73eadebc53b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b426ce913f1dadfb36ef0340fac54c062e773ab8 + 21112780fde3871bb97039661760c8290473704c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b426ce913f1dadfb36ef0340fac54c062e773ab8 + 21112780fde3871bb97039661760c8290473704c @@ -135,9 +135,9 @@ 6e76d580fcc69954441344175bd1b0ab2e432026 - + https://github.com/dotnet/linker - 55d70c3aad879b95a3620d64c0a2c07e27afd80d + 0991fcde3933eecc12f53472a3347a94e2d1fdd5 linker diff --git a/eng/Versions.props b/eng/Versions.props index 52b02b7741d7..8a307c2bda31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.426-servicing.24419.21 - 6.0.426-servicing.24419.21 + 6.0.427-servicing.24460.7 + 6.0.427-servicing.24460.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1ff85d943009d7257cb009cb41651647ab55ce07 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 22:00:22 +0000 Subject: [PATCH 07/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240911.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24460.7 -> To Version 6.0.427-servicing.24461.12 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.400 From Version 6.0.34 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- NuGet.config | 19 ++++--------- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++++----------- 3 files changed, 50 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5dde9b6a0451..cca5ec03b9af 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,16 @@ - - + - - - - - - + - - + @@ -60,12 +53,10 @@ - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 73eadebc53b2..5a3cbe442553 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 7132545b5ef9cfe30512311811ee420b1f208971 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98588b0f0d72383aca8722755d838ae1d542ce62 + b357f86ce3bce7c232ea242074b17bebdc50b543 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e19ee616d4c5538bc5adb2335d85e0c7f9d30000 + 4413239935644e4c528bd400fed7ae65a2667e4c https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21112780fde3871bb97039661760c8290473704c + 0cdd72c79635078b4c89451ced59c95d71a365f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21112780fde3871bb97039661760c8290473704c + 0cdd72c79635078b4c89451ced59c95d71a365f4 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - ec74ec8f24328a3e33feda7cc4d5064ef4565220 + c68eace1f3c11ab25cdf30a425ab3792773bb2cc https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 8a307c2bda31..00c437791ebd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,20 +43,20 @@ - 6.0.34 - 6.0.34 - 6.0.34-servicing.24417.1 - 6.0.34-servicing.24417.1 - 6.0.34-servicing.24417.1 - 6.0.34-servicing.24417.1 + 6.0.35 + 6.0.35 + 6.0.35-servicing.24454.6 + 6.0.35-servicing.24454.6 + 6.0.35-servicing.24454.6 + 6.0.35-servicing.24454.6 0.2.0 - 6.0.427-servicing.24460.7 - 6.0.427-servicing.24460.7 + 6.0.427-servicing.24461.12 + 6.0.427-servicing.24461.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,12 +67,12 @@ - 6.0.34-servicing.24416.23 - 6.0.34-servicing.24416.23 - 6.0.34 - 6.0.34 - 6.0.34 - 6.0.34 + 6.0.35-servicing.24459.18 + 6.0.35-servicing.24459.18 + 6.0.35 + 6.0.35 + 6.0.35 + 6.0.35 2.1.0 @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.34 + 6.0.35 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 892ed04039983ef4c4250cdde10d44d6e0bd8165 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 19:40:49 +0000 Subject: [PATCH 08/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240912.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24461.12 -> To Version 6.0.427-servicing.24462.20 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index cca5ec03b9af..8f0e27311c16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a3cbe442553..ce7e444edfec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 4413239935644e4c528bd400fed7ae65a2667e4c + 1ad4097713d52a22315021099f2a185ae68abbe1 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0cdd72c79635078b4c89451ced59c95d71a365f4 + 853c4ee667f78b855aaf1ae621fc4980e327a49f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0cdd72c79635078b4c89451ced59c95d71a365f4 + 853c4ee667f78b855aaf1ae621fc4980e327a49f diff --git a/eng/Versions.props b/eng/Versions.props index 00c437791ebd..84857a44f610 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.35 6.0.35 - 6.0.35-servicing.24454.6 - 6.0.35-servicing.24454.6 - 6.0.35-servicing.24454.6 - 6.0.35-servicing.24454.6 + 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.3 0.2.0 - 6.0.427-servicing.24461.12 - 6.0.427-servicing.24461.12 + 6.0.427-servicing.24462.20 + 6.0.427-servicing.24462.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 20eb419ec5d2a564f498581d1cd74b3c7794ec94 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 22:20:26 +0000 Subject: [PATCH 09/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240912.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24462.20 -> To Version 6.0.427-servicing.24462.29 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.34 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 36 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8f0e27311c16..b4ed24fd02ef 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,12 +27,7 @@ - - - - - - + @@ -67,12 +62,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce7e444edfec..aea95c3eb630 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7132545b5ef9cfe30512311811ee420b1f208971 + 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 853c4ee667f78b855aaf1ae621fc4980e327a49f + 29da8759f075a17329e174c53e59e85180928aa9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 853c4ee667f78b855aaf1ae621fc4980e327a49f + 29da8759f075a17329e174c53e59e85180928aa9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a625f79930686c2e7598d0cb0a6ba715ef176e4e + 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 0716b4331761db24b6c5f2f52e8bcd32b6bd065b + 869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 84857a44f610..e8658e33c094 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.34-servicing.24417.1 + 6.0.35-servicing.24461.4 - 6.0.34-servicing.24417.2 + 6.0.35-servicing.24462.2 @@ -55,8 +55,8 @@ - 6.0.427-servicing.24462.20 - 6.0.427-servicing.24462.20 + 6.0.427-servicing.24462.29 + 6.0.427-servicing.24462.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.34-servicing.24419.1 - 6.0.34-servicing.24419.1 - 6.0.34 - 6.0.34 + 6.0.35-servicing.24462.8 + 6.0.35-servicing.24462.8 + 6.0.35 + 6.0.35 From e9225b048a935a3eeb0bcc5dd97528e93cebc902 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Sep 2024 19:47:19 +0000 Subject: [PATCH 10/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.13 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24462.29 -> To Version 6.0.427-servicing.24463.13 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index b4ed24fd02ef..fbd09b9bde74 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -48,7 +48,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aea95c3eb630..4d93b9a2fcc5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1ad4097713d52a22315021099f2a185ae68abbe1 + 827b96040e62e5aa47d829bfa61c000d315d4f2e https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29da8759f075a17329e174c53e59e85180928aa9 + c3caa83afc23db553d477d695fb257e0f97ff857 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29da8759f075a17329e174c53e59e85180928aa9 + c3caa83afc23db553d477d695fb257e0f97ff857 diff --git a/eng/Versions.props b/eng/Versions.props index e8658e33c094..444fe7c70ecc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.35 6.0.35 - 6.0.35-servicing.24462.3 - 6.0.35-servicing.24462.3 - 6.0.35-servicing.24462.3 - 6.0.35-servicing.24462.3 + 6.0.35-servicing.24462.14 + 6.0.35-servicing.24462.14 + 6.0.35-servicing.24462.14 + 6.0.35-servicing.24462.14 0.2.0 - 6.0.427-servicing.24462.29 - 6.0.427-servicing.24462.29 + 6.0.427-servicing.24463.13 + 6.0.427-servicing.24463.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e5402277759a1aca8f081c1f218cd927f4bb906 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 14 Sep 2024 00:21:13 +0000 Subject: [PATCH 11/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.31 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24463.13 -> To Version 6.0.427-servicing.24463.31 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.35 -> To Version 6.0.35 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbd09b9bde74..c93c9eb7ebee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d93b9a2fcc5..54a3c91b7ce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 01c5bea2efd5066bc98ceea7b7b42d2ca09bfce3 + fc5b097885ceb7463eb7163477356a39a359846f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c3caa83afc23db553d477d695fb257e0f97ff857 + 9e198e0619cedfde17a7e493e4d1f8a9d089269d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c3caa83afc23db553d477d695fb257e0f97ff857 + 9e198e0619cedfde17a7e493e4d1f8a9d089269d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b + 9b5f402943986a66dfca2b6f4312cfca19d75c17 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 869af990f3f1053ba2ab097b5cc9e41f0eb8e4fe + c9e44425226553e639116ff82698cfd2808f7769 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 444fe7c70ecc..ee64ca2a8a30 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.35-servicing.24461.4 + 6.0.35-servicing.24462.9 - 6.0.35-servicing.24462.2 + 6.0.35-servicing.24462.14 @@ -55,8 +55,8 @@ - 6.0.427-servicing.24463.13 - 6.0.427-servicing.24463.13 + 6.0.427-servicing.24463.31 + 6.0.427-servicing.24463.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,8 +77,8 @@ - 6.0.35-servicing.24462.8 - 6.0.35-servicing.24462.8 + 6.0.35-servicing.24463.5 + 6.0.35-servicing.24463.5 6.0.35 6.0.35 From 4ad9f08c6370e2736b2564722348b45a126ea3ce Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Sep 2024 17:15:06 +0000 Subject: [PATCH 12/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.109 -> To Version 8.0.110 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.9 -> To Version 8.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++---- eng/Version.Details.xml | 110 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++--------- 3 files changed, 88 insertions(+), 88 deletions(-) diff --git a/NuGet.config b/NuGet.config index c47c0b90d584..58d756e28bce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,22 @@ - + - + - + - + - + @@ -42,15 +42,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4000c02639e4..b6d59c2b525f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ef9b9449afda303871855df529a3ea2ac7a9bbd + f91fa389d641f923c7be948ad9e8a670b845311d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ef9b9449afda303871855df529a3ea2ac7a9bbd + f91fa389d641f923c7be948ad9e8a670b845311d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ef9b9449afda303871855df529a3ea2ac7a9bbd + f91fa389d641f923c7be948ad9e8a670b845311d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ef9b9449afda303871855df529a3ea2ac7a9bbd + f91fa389d641f923c7be948ad9e8a670b845311d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + a8108c906081c3c0198f250fb210c1dd275b2f01 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f863cc8f81bb49634de55c498714f67c976d9cd8 + b9415b447bffba9084f45c688066ac200c08db41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f863cc8f81bb49634de55c498714f67c976d9cd8 + b9415b447bffba9084f45c688066ac200c08db41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f863cc8f81bb49634de55c498714f67c976d9cd8 + b9415b447bffba9084f45c688066ac200c08db41 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f863cc8f81bb49634de55c498714f67c976d9cd8 + b9415b447bffba9084f45c688066ac200c08db41 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1f8971ac89d8ea8b4a4f0971dd307e0c318fae7 + bfc7e266f9967da8a398f67dac77b84a1210a42d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f0d6934ff6cfe796b114fbc4cce13fb2ce79668f + f97763771ad77bb288371e1c102d411a0fbc45c2 https://github.com/dotnet/fsharp @@ -146,13 +146,13 @@ aa59400b11e1aeee2e8af48928dbd48748a8bef9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://github.com/dotnet/roslyn - 302f7876e6784ee3689fb28bb3480759b6c31658 + d8282e36f9e389ee9eaad96b5aba66b83b9a37fd @@ -175,16 +175,16 @@ https://github.com/dotnet/emsdk - 885abbe904afd5987f463378522b82a2cc011cac + d6672570f0fde2a4a3c7e65d60cec9f8406b039c https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - 885abbe904afd5987f463378522b82a2cc011cac + d6672570f0fde2a4a3c7e65d60cec9f8406b039c diff --git a/eng/Versions.props b/eng/Versions.props index d0261cc3c1b3..5eb93e3ef26d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.9-servicing.24416.1 + 8.0.10-servicing.24462.7 - 8.0.9-servicing.24416.4 + 8.0.10-servicing.24462.8 @@ -65,52 +65,52 @@ - 8.0.9 - 8.0.9 - 8.0.9-servicing.24416.3 - 8.0.9-servicing.24416.3 - 8.0.9-servicing.24416.3 - 8.0.9-servicing.24416.3 - 8.0.9-servicing.24416.3 + 8.0.10 + 8.0.10 + 8.0.10-servicing.24462.15 + 8.0.10-servicing.24462.15 + 8.0.10-servicing.24462.15 + 8.0.10-servicing.24462.15 + 8.0.10-servicing.24462.15 0.2.0 - 8.0.109 - 8.0.109-servicing.24420.10 - 8.0.109-servicing.24420.10 + 8.0.110 + 8.0.110-servicing.24466.4 + 8.0.110-servicing.24466.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.24378.1 + 4.8.0-7.24423.6 - 8.0.9-servicing.24415.9 + 8.0.10-servicing.24461.12 - 8.0.9-servicing.24415.9 - 8.0.9-servicing.24415.9 - 8.0.9 - 8.0.9 - 8.0.9 - 8.0.9 + 8.0.10-servicing.24461.12 + 8.0.10-servicing.24461.12 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 2.1.0 8.0.1 6.0.1 - 8.0.9-servicing.24416.2 - 8.0.9-servicing.24416.2 - 8.0.9 - 8.0.9 + 8.0.10-servicing.24462.13 + 8.0.10-servicing.24462.13 + 8.0.10 + 8.0.10 From bb1f0dd63eb5d25dfe0630881e74fa3e599a4f09 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Sep 2024 18:26:33 +0000 Subject: [PATCH 13/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.110 -> To Version 8.0.110 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.10 -> To Version 8.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 58d756e28bce..6f4337cb5dbc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b6d59c2b525f..ca656c2e3352 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9415b447bffba9084f45c688066ac200c08db41 + f3d2fa744f14930eb9abb8385b7b4eeddd2764fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9415b447bffba9084f45c688066ac200c08db41 + f3d2fa744f14930eb9abb8385b7b4eeddd2764fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9415b447bffba9084f45c688066ac200c08db41 + f3d2fa744f14930eb9abb8385b7b4eeddd2764fd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b9415b447bffba9084f45c688066ac200c08db41 + f3d2fa744f14930eb9abb8385b7b4eeddd2764fd https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5eb93e3ef26d..8367c471c26c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.10 8.0.10 - 8.0.10-servicing.24462.15 - 8.0.10-servicing.24462.15 - 8.0.10-servicing.24462.15 - 8.0.10-servicing.24462.15 - 8.0.10-servicing.24462.15 + 8.0.10-servicing.24463.9 + 8.0.10-servicing.24463.9 + 8.0.10-servicing.24463.9 + 8.0.10-servicing.24463.9 + 8.0.10-servicing.24463.9 0.2.0 @@ -79,8 +79,8 @@ 8.0.110 - 8.0.110-servicing.24466.4 - 8.0.110-servicing.24466.4 + 8.0.110-servicing.24466.8 + 8.0.110-servicing.24466.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a8f27c87cafca4f33c1fb66f3fc88e5748e5df47 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Sep 2024 23:08:56 +0000 Subject: [PATCH 14/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.22 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.427-servicing.24463.31 -> To Version 6.0.427-servicing.24466.22 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.425 -> To Version 6.0.427 (parent: Microsoft.NET.Sdk --- NuGet.config | 14 ++------------ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index c93c9eb7ebee..2dc7a26febb8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,12 +19,7 @@ - - - - - - + @@ -54,12 +49,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9cafb1334d80..effcb7359e8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 + 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 + 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1a1d03fbcbcf9d373c1f0c87c20506b5de300388 + 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9e198e0619cedfde17a7e493e4d1f8a9d089269d + 0f7bfed6fab981db8d6b859311a1a98e2b5cd684 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9e198e0619cedfde17a7e493e4d1f8a9d089269d + 0f7bfed6fab981db8d6b859311a1a98e2b5cd684 diff --git a/eng/Versions.props b/eng/Versions.props index 0f2d5f0e28ad..ea32b04dbad1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.425 + 6.0.427 @@ -55,8 +55,8 @@ - 6.0.427-servicing.24463.31 - 6.0.427-servicing.24463.31 + 6.0.427-servicing.24466.22 + 6.0.427-servicing.24466.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.425 + 6.0.427 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From a1f02d0f13761398974f84e3c767b42df908c17e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 17 Sep 2024 21:28:57 +0000 Subject: [PATCH 15/26] Merged PR 42944: [internal/release/8.0.1xx] Updated NuGet.config - add feed for event log Updated NuGet.config - add feed for event log ---- #### AI description (iteration 1) #### PR Classification Configuration update to add a new NuGet feed. #### PR Summary This pull request updates the `NuGet.config` file to add a new package source for event log purposes. - `NuGet.config`: Added a new feed `darc-int-dotnet-runtime-7dc1560` to the list of package sources. --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 6f4337cb5dbc..fa18f630b47a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,6 +17,7 @@ + @@ -46,6 +47,7 @@ + From 6d9dfff6bd69964d88617655640d506f783a4f4e Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 17 Sep 2024 22:56:34 +0000 Subject: [PATCH 16/26] Merged PR 42943: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk 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.WindowsDesktop.App.Ref**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.35-servicing.24462.8 to 6.0.35-servicing.24463.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.425 to 6.0.427 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.425-rtm.24417.1 to 6.0.427-rtm.24466.3 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.425 to 6.0.427 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.35-servicing.24461.4 to 6.0.35-servicing.24462.9 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.35 to 6.0.35 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.35-servicing.24462.2 to 6.0.35-servicing.24462.14 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240913.28 - **Date Produced**: September 13, 2024 11:01:11 PM UTC - **Commit**: 1ce03150206eb3a054fd686a1c43da9b34f3314a - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24466.22 to 6.0.427-servicing.24463.28][1] - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24466.22 to 6.0.427-servicing.24463.28][1] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.35 to 6.0.35][2] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.35-servicing.24463.5 to 6.0.35-servicing.24462.8][2] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.35-servicing.24463.5 to 6.0.35-servicing.24462.8][2] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.427 to 6.0.425][3] - **Microsoft.TemplateEngine.Cli**: [from 6.0.427-rtm.24466.3 to 6.0.425-rtm.24417.1][3] - **Microsoft.DotNet.Common.Projec... --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index effcb7359e8e..1ffbe5ba0f38 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f7bfed6fab981db8d6b859311a1a98e2b5cd684 + aa8718535dd4d26e91e431cbd3a9034b07de9a5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0f7bfed6fab981db8d6b859311a1a98e2b5cd684 + aa8718535dd4d26e91e431cbd3a9034b07de9a5d diff --git a/eng/Versions.props b/eng/Versions.props index ea32b04dbad1..381af1ab9642 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.427-servicing.24466.22 - 6.0.427-servicing.24466.22 + 6.0.427-servicing.24467.29 + 6.0.427-servicing.24467.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4ce784df29740abdfadaddb9f5beb0756b43566d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 17 Sep 2024 23:31:25 +0000 Subject: [PATCH 17/26] Merged PR 42967: Use the august release of the web templates - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Use the august release of the web templates ---- #### AI description (iteration 1) #### PR Classification Update to use the latest release of web templates. #### PR Summary This pull request updates the project to use the August release of the web templates. - Changes in `/eng/Versions.props` to adjust the `AspNetCoreTemplateFeature60` version calculation. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 46afc0379cdd..763f89d663af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ true true true - $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(VersionFeature60), 2)) $(VersionFeature60) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 1747095b6c7db8caba1a76a5e947092290ad53d3 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 17 Sep 2024 23:33:15 +0000 Subject: [PATCH 18/26] Merged PR 42956: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20240917.27 - **Date Produced**: September 17, 2024 10:10:36 PM UTC - **Commit**: 4c39715004ce10463ca599a45aaa47f8416b5215 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.110 to 8.0.110][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.110-servicing.24466.8 to 8.0.110-servicing.24467.27][1] - **Microsoft.NET.Sdk**: [from 8.0.110-servicing.24466.8 to 8.0.110-servicing.24467.27][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.110-servicing.24466.8 to 8.0.110-servicing.24467.27][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCf3d2fa744f14930eb9abb8385b7b4eeddd2764fd&targetVersion=GC4c39715004ce10463ca599a45aaa47f8416b5215&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) --- NuGet.config | 6 ++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index fa18f630b47a..477e22c73f9c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,10 +17,9 @@ - - + @@ -47,9 +46,8 @@ - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77ea2e0a3b23..df8daa292c69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3d2fa744f14930eb9abb8385b7b4eeddd2764fd + 4c39715004ce10463ca599a45aaa47f8416b5215 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3d2fa744f14930eb9abb8385b7b4eeddd2764fd + 4c39715004ce10463ca599a45aaa47f8416b5215 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3d2fa744f14930eb9abb8385b7b4eeddd2764fd + 4c39715004ce10463ca599a45aaa47f8416b5215 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3d2fa744f14930eb9abb8385b7b4eeddd2764fd + 4c39715004ce10463ca599a45aaa47f8416b5215 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 763f89d663af..a54cc860ec31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.110 - 8.0.110-servicing.24466.8 - 8.0.110-servicing.24466.8 + 8.0.110-servicing.24467.27 + 8.0.110-servicing.24467.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8f0c6f14cc5041ade4fc3e6838f52f64c75773df Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 18 Sep 2024 23:07:12 +0000 Subject: [PATCH 19/26] Merged PR 43016: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 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.WindowsDesktop.App.Ref**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.10-servicing.24462.13 to 8.0.10-servicing.24468.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.10-servicing.24462.13 to 8.0.10-servicing.24468.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.10-servicing.24462.7 to 8.0.10-servicing.24468.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.10-servicing.24462.8 to 8.0.10-servicing.24468.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.10... --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++-------- 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 477e22c73f9c..9c541376c002 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,19 @@ - + - + - + - + @@ -42,15 +42,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df8daa292c69..45c3f47b37ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f91fa389d641f923c7be948ad9e8a670b845311d + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f91fa389d641f923c7be948ad9e8a670b845311d + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f91fa389d641f923c7be948ad9e8a670b845311d + f655eecd22b6810f2989d8ec783f5798a709ab06 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f91fa389d641f923c7be948ad9e8a670b845311d + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c39715004ce10463ca599a45aaa47f8416b5215 + db993d275a12f1daa73db230ebb7cc70485cd770 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c39715004ce10463ca599a45aaa47f8416b5215 + db993d275a12f1daa73db230ebb7cc70485cd770 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c39715004ce10463ca599a45aaa47f8416b5215 + db993d275a12f1daa73db230ebb7cc70485cd770 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4c39715004ce10463ca599a45aaa47f8416b5215 + db993d275a12f1daa73db230ebb7cc70485cd770 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bfc7e266f9967da8a398f67dac77b84a1210a42d + e4efded416f8216935683d9a12e2eb45df78a728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f97763771ad77bb288371e1c102d411a0fbc45c2 + e84ed744bb7989299c544f715056d05e220c7e00 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index a54cc860ec31..93c914f623ab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.10-servicing.24462.7 + 8.0.10-servicing.24468.3 - 8.0.10-servicing.24462.8 + 8.0.10-servicing.24468.10 @@ -67,11 +67,11 @@ 8.0.10 8.0.10 - 8.0.10-servicing.24463.9 - 8.0.10-servicing.24463.9 - 8.0.10-servicing.24463.9 - 8.0.10-servicing.24463.9 - 8.0.10-servicing.24463.9 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 0.2.0 @@ -79,8 +79,8 @@ 8.0.110 - 8.0.110-servicing.24467.27 - 8.0.110-servicing.24467.27 + 8.0.110-servicing.24468.30 + 8.0.110-servicing.24468.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.10-servicing.24461.12 + 8.0.10-servicing.24466.10 - 8.0.10-servicing.24461.12 - 8.0.10-servicing.24461.12 + 8.0.10-servicing.24466.10 + 8.0.10-servicing.24466.10 8.0.10 8.0.10 8.0.10 @@ -107,8 +107,8 @@ - 8.0.10-servicing.24462.13 - 8.0.10-servicing.24462.13 + 8.0.10-servicing.24468.5 + 8.0.10-servicing.24468.5 8.0.10 8.0.10 From 93fddcf4f606055cb6ff9753b8971e5f57a5d31d Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 19 Sep 2024 17:45:09 +0000 Subject: [PATCH 20/26] Merged PR 43030: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240918.28 - **Date Produced**: September 19, 2024 6:33:29 AM UTC - **Commit**: d404f562916f5be62c6661e4f7033f26859ce939 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.427-servicing.24467.29 to 6.0.427-servicing.24468.28][1] - **Microsoft.NET.Sdk**: [from 6.0.427-servicing.24467.29 to 6.0.427-servicing.24468.28][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCaa8718535dd4d26e91e431cbd3a9034b07de9a5d&targetVersion=GCd404f562916f5be62c6661e4f7033f26859ce939&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ffbe5ba0f38..7750db5c9b79 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 7de8a2867cf734967eef78d8e82902f3e84650b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aa8718535dd4d26e91e431cbd3a9034b07de9a5d + d404f562916f5be62c6661e4f7033f26859ce939 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aa8718535dd4d26e91e431cbd3a9034b07de9a5d + d404f562916f5be62c6661e4f7033f26859ce939 diff --git a/eng/Versions.props b/eng/Versions.props index 381af1ab9642..b23814f82b55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.427-servicing.24467.29 - 6.0.427-servicing.24467.29 + 6.0.427-servicing.24468.28 + 6.0.427-servicing.24468.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe5161d5cb8bc09c2e0e17fbd48ea3b36373bbbb Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 19 Sep 2024 21:12:40 +0000 Subject: [PATCH 21/26] Merged PR 43040: [internal/release/8.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk 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.Compilers.Toolset**: from 4.8.0-7.24423.6 to 4.8.0-7.24468.9 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be - **Build**: 20240919.18 - **Date Produced**: September 19, 2024 8:01:49 PM UTC - **Commit**: d90806d013db39755cda355f42015d6a248456f5 - **Branch**: refs/heads/internal/release/8.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.110 to 8.0.110][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.110-servicing.24468.30 to 8.0.110-servicing.24469.18][1] - **Microsoft.NET.Sdk**: [from 8.0.110-servicing.24468.30 to 8.0.110-servicing.24469.18][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.110-servicing.24468.30 to 8.0.110-servicing.24469.18][1] - **Microsoft.Net.Compilers.Toolset**: [from 4.8.0-7.24423.6 to 4.8.0-7.24468.9][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCdb993d275a12f1daa73db230ebb7cc70485cd770&targetVersion=GCd90806d013db39755cda355f42015d6a248456f5&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn/branches?baseVersion=GCd8282e36f9e389ee9eaad96b5aba66b83b9a37fd&targetVersion=GCdef88648f7e78a44bf300acd0a4e2009c44a6b39&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:5d2948e4-7f4b-4c9a-54a4-08dbd5a5c4be) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9c541376c002..3751b64eecb1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45c3f47b37ce..a468cf867b2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db993d275a12f1daa73db230ebb7cc70485cd770 + d90806d013db39755cda355f42015d6a248456f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db993d275a12f1daa73db230ebb7cc70485cd770 + d90806d013db39755cda355f42015d6a248456f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db993d275a12f1daa73db230ebb7cc70485cd770 + d90806d013db39755cda355f42015d6a248456f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - db993d275a12f1daa73db230ebb7cc70485cd770 + d90806d013db39755cda355f42015d6a248456f5 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - - https://github.com/dotnet/roslyn - d8282e36f9e389ee9eaad96b5aba66b83b9a37fd + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + def88648f7e78a44bf300acd0a4e2009c44a6b39 diff --git a/eng/Versions.props b/eng/Versions.props index 93c914f623ab..c6c66c604122 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.110 - 8.0.110-servicing.24468.30 - 8.0.110-servicing.24468.30 + 8.0.110-servicing.24469.18 + 8.0.110-servicing.24469.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-7.24423.6 + 4.8.0-7.24468.9 From e95e057c0586c1b35a67fb5fa34949678e7cf6b3 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Fri, 20 Sep 2024 12:37:19 +0000 Subject: [PATCH 22/26] Merged PR 43043: [internal/release/8.0.1xx] Updated SourceBuildPrebuiltBaseline.xml - add System.Reflection.Metadata 8.0.0 Updated SourceBuildPrebuiltBaseline.xml - add - System.Reflection.Metadata 8.0.0 ---- #### AI description (iteration 1) #### PR Classification Configuration update. #### PR Summary This pull request updates the `SourceBuildPrebuiltBaseline.xml` to include a new usage pattern for `System.Reflection.Metadata` version 8.0.0. - `eng/SourceBuildPrebuiltBaseline.xml`: Added `System.Reflection.Metadata/*8.0.0*` to the ignore patterns. --- eng/SourceBuildPrebuiltBaseline.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index ee09742d35f2..ce8144c86e3d 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -13,5 +13,7 @@ + + From 87a66bb3d1cd008e190519ec85fd3c14c8c7f667 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 24 Sep 2024 19:11:56 +0000 Subject: [PATCH 23/26] Merged PR 43122: flow emsdk directly - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. flow emsdk directly ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates the Emscripten workload manifest and adds new package sources to the configuration. - `NuGet.config`: Added new package sources for `dotnet-aspnetcore`, `dotnet-sdk`, and `dotnet-windowsdesktop`. - `eng/Version.Details.xml`: Updated the Emscripten workload manifest version and its associated SHA. - `eng/Versions.props`: Updated the Emscripten workload manifest version to `8.0.10`. --- NuGet.config | 14 +++++++++++++- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3751b64eecb1..f45e5e1e0533 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,12 @@ - + + + @@ -20,9 +22,13 @@ + + + + @@ -42,14 +48,20 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a468cf867b2c..309c2bbba081 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -173,18 +173,18 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - d6672570f0fde2a4a3c7e65d60cec9f8406b039c + 91b783edc518e9ea0c0e883016b02261893389db https://dev.azure.com/dnceng/internal/_git/dotnet-aspire 48e42f59d64d84b404e904996a9ed61f2a17a569 - + https://github.com/dotnet/emsdk - d6672570f0fde2a4a3c7e65d60cec9f8406b039c + 91b783edc518e9ea0c0e883016b02261893389db diff --git a/eng/Versions.props b/eng/Versions.props index c6c66c604122..a7d78342f32f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,7 +204,7 @@ 14.0.8478 17.0.8478 - 8.0.9 + 8.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 70a13cdc26ed3beed06461e8c889d997dac26055 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 12:18:47 +0000 Subject: [PATCH 24/26] Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 +- global.json | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de3de285a3d9..f129691721cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -219,18 +219,18 @@ - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 0caad9ed3e5c..c365fdacfd31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24504.2 + 8.0.0-beta.24508.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index eb188cfda415..a2dedaa5297a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -892,7 +892,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 8320b3ded24a..4f310b2c43ab 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.108", + "dotnet": "8.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24504.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24508.1" } } From aeb4f233420bb7ce61ece91d1a532799521e58e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 17:53:15 +0000 Subject: [PATCH 25/26] Update dependencies from https://github.com/dotnet/arcade build 20241008.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.24463.1 -> To Version 6.0.0-beta.24508.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 924d40876a29..17230bd820ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 51df77c8fcd7893066f14eab382ef95c5faed6cf + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - 51df77c8fcd7893066f14eab382ef95c5faed6cf + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 - + https://github.com/dotnet/arcade - 51df77c8fcd7893066f14eab382ef95c5faed6cf + bb06ac242cf3faf5cef64127bdd11c3a4f060c06 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 33cb2376abe4..97f276600d5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.24463.1 + 6.0.0-beta.24508.2 diff --git a/global.json b/global.json index 147e4f245934..1d40609063bd 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.133", + "dotnet": "6.0.135", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24463.1", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24463.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24508.2", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.24508.2" } } From fdfe4f696195d0d57e09854296605c943fa57858 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 19:07:41 +0000 Subject: [PATCH 26/26] Update dependencies from https://github.com/dotnet/source-build-externals build 20241010.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24379.1 -> To Version 8.0.0-alpha.1.24510.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de3de285a3d9..edf749e8a1f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,9 +198,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - fb970eccb0a9cae3092464e29cbabda0d4115049 + d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595