From 24b3f328fc7a6d44c7c334392af8afc2df3f856a Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Fri, 16 Aug 2024 16:35:28 +0000 Subject: [PATCH 01/12] Merged PR 41519: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240816.3 - **Date Produced**: August 16, 2024 4:11:37 PM UTC - **Commit**: a9e1ba5cadc1a36be59c59dbb991e6475c91f347 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.134-servicing.24415.30 to 6.0.134-servicing.24416.3][12] - **Microsoft.NET.Sdk**: [from 6.0.134-servicing.24415.30 to 6.0.134-servicing.24416.3][12] - **Microsoft.WindowsDesktop.App.Ref**: [from 6.0.34 to 6.0.34][13] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][13] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: [from 6.0.34-servicing.24413.2 to 6.0.34-servicing.24415.7][13] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][13] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.33-servicing.24366.4 to 6.0.34-servicing.24415.3][14] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 6.0.34 to 6.0.34][13] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.33-servicing.24366.5 to 6.0.34-servicing.24415.6][15] [12]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC545b7dde3f8761587e5dae23dcda07a185ef5d3e&targetVersion=GCa9e1ba5cadc1a36be59c59dbb991e6475c91f347&_a=files [13]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC526b783fc75e702512a29ede591c4335dce62d6f&targetVersion=GC4e044058aadccd22bc0dc7ecb27ca7f5ab270584&_a=files [14]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6a984c48f3489b60f25deb72ede6e5051bb130d4&targetVersion=GC43d5519b7b6f2093342515c04b054e88df71729e&_a=files [15]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb660c1e83039451abe9d9190a7aabe87c03fd7ae&targetVersion=GC5429ff1d84d93927157f54d620a0ad9ebf1f10b9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) [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: Microso... --- NuGet.config | 33 ++++----------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 42 +++++++++---------- 3 files changed, 76 insertions(+), 91 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f91d1c22..f04c70a95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,31 +7,22 @@ - + - - - - + - + - - - - + - - - - + @@ -52,23 +43,17 @@ - + - + - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index df9d76345..0390e975d 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 - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 2fdb78d36dc993a532bd80ee2682a2b534497413 + 15b9e7637e51dc8495f899ebaadd7d2a76095967 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 902d4b651242b37d952aedd9ef8b17b9ed766d09 + a9e1ba5cadc1a36be59c59dbb991e6475c91f347 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 902d4b651242b37d952aedd9ef8b17b9ed766d09 + a9e1ba5cadc1a36be59c59dbb991e6475c91f347 - + 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 @@ -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 4a792cc04..792836b6d 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.133-servicing.24379.12 - 6.0.133-servicing.24379.12 + 6.0.134-servicing.24416.3 + 6.0.134-servicing.24416.3 $(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.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.33 + 6.0.34 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From cac85ca15abad335e262ea8357e404c8f0e78443 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Mon, 19 Aug 2024 17:40:26 +0000 Subject: [PATCH 02/12] Merged PR 41861: Update MsftToSbSdk.diff Fixes https://github.com/dotnet/source-build/issues/4565 Update MsftToSbSdk.diff Coordinated in Servicing channel - got approval for this to go in. ---- #### AI description (iteration 1) #### PR Classification Code cleanup and update of baseline diff file. #### PR Summary This pull request updates the `MsftToSbSdk.diff` file to reflect recent changes in the SDK and package references. - `MsftToSbSdk.diff`: Removed several references to `.dll` and `.xml` files under `Microsoft.AspNetCore.App.Ref` and `Microsoft.NETCore.App.Host.portable-rid`. - `MsftToSbSdk.diff`: Added new references under `Microsoft.NETCore.App.Host.banana-rid`. - `MsftToSbSdk.diff`: Adjusted entries for `System.Formats.Asn1.dll` and `System.Security.AccessControl.dll` in the `FSharp` and `System` directories. --- .../assets/baselines/MsftToSbSdk.diff | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 6d3d215c4..6dfa7ec1c 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,20 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -42,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ @@ -220,7 +203,7 @@ index ------------ -./sdk/x.y.z/FSharp/System.CodeDom.dll -./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll -./sdk/x.y.z/FSharp/System.Drawing.Common.dll -+./sdk/x.y.z/FSharp/System.Formats.Asn1.dll + ./sdk/x.y.z/FSharp/System.Formats.Asn1.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll +./sdk/x.y.z/FSharp/System.Security.AccessControl.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll @@ -436,7 +419,7 @@ index ------------ +./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll -./sdk/x.y.z/System.Drawing.Common.dll -+./sdk/x.y.z/System.Formats.Asn1.dll + ./sdk/x.y.z/System.Formats.Asn1.dll ./sdk/x.y.z/System.Resources.Extensions.dll +./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll +./sdk/x.y.z/System.Security.AccessControl.dll From 78a9d66cc130a9249628d2abcc190ccd987b05c7 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 20 Aug 2024 16:35:24 +0000 Subject: [PATCH 03/12] Merged PR 41824: [internal/release/6.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 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:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240819.22 - **Date Produced**: August 19, 2024 6:47:18 PM UTC - **Commit**: be7da2b93dad324ef6399a8f8049a064430ac3be - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.134-servicing.24417.7 to 6.0.134-servicing.24419.22][6] - **Microsoft.NET.Sdk**: [from 6.0.134-servicing.24417.7 to 6.0.134-servicing.24419.22][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=GC436bce461faaa2dbf929d7b4055fc3568bb41173&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 f04c70a95..ec9d5a504 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,13 +16,13 @@ - + - + - + @@ -43,17 +43,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0390e975d..1910c7046 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 - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 15b9e7637e51dc8495f899ebaadd7d2a76095967 + b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a9e1ba5cadc1a36be59c59dbb991e6475c91f347 + be7da2b93dad324ef6399a8f8049a064430ac3be - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a9e1ba5cadc1a36be59c59dbb991e6475c91f347 + be7da2b93dad324ef6399a8f8049a064430ac3be - + 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 792836b6d..b6d8288e4 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.134-servicing.24416.3 - 6.0.134-servicing.24416.3 + 6.0.134-servicing.24419.22 + 6.0.134-servicing.24419.22 $(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 284ef404474ff351cae374fe4554575a69fc8fc1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 10 Sep 2024 17:57:18 +0000 Subject: [PATCH 04/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240910.6 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.134-servicing.24419.22 -> To Version 6.0.135-servicing.24460.6 Dependency coherency updates Microsoft.Build From Version 17.0.3 -> To Version 17.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 31 ++++++++++++++++++++++++++++++- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 39 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index ec9d5a504..be30365db 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,38 @@ + + + + + + - + + + + + + + + + + + + @@ -43,16 +60,28 @@ + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1910c7046..7da7220b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - be7da2b93dad324ef6399a8f8049a064430ac3be + 6e8de6c1f8a4e7f411709ebe03154a1a721b95ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - be7da2b93dad324ef6399a8f8049a064430ac3be + 6e8de6c1f8a4e7f411709ebe03154a1a721b95ee @@ -146,9 +146,9 @@ 487283bcd8d66693091f2800dcf1c8ae37cccdee - + https://github.com/dotnet/msbuild - d679d209277a156cdc0963c993585ffa5744dc5f + 85d71072f8fa22cc761d6b65954da263364bee4d diff --git a/eng/Versions.props b/eng/Versions.props index dd3846f17..b07905da9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.134-servicing.24419.22 - 6.0.134-servicing.24419.22 + 6.0.135-servicing.24460.6 + 6.0.135-servicing.24460.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -97,7 +97,7 @@ - 17.0.3 + 17.0.4 $(MicrosoftNETCoreAppRuntimePackageVersion) From e007159fd5d7ff6b283df82f409fd41e030bb5fc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 22:06:11 +0000 Subject: [PATCH 05/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240911.11 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24460.6 -> To Version 6.0.135-servicing.24461.11 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.100 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 be30365db..a01fc0c56 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,16 @@ - - + - - - - - - + - - + @@ -60,14 +53,12 @@ - - + - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7da7220b8..f42fe65e9 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 b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e8de6c1f8a4e7f411709ebe03154a1a721b95ee + 715cbd3538e523200b3f06ff794f5c76ff14b52c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e8de6c1f8a4e7f411709ebe03154a1a721b95ee + 715cbd3538e523200b3f06ff794f5c76ff14b52c @@ -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 b07905da9..36532d586 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.135-servicing.24460.6 - 6.0.135-servicing.24460.6 + 6.0.135-servicing.24461.11 + 6.0.135-servicing.24461.11 $(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.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.34 + 6.0.35 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 2577b17e0a743556bac3eae5df0841090578d790 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 22:16:09 +0000 Subject: [PATCH 06/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240912.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24461.11 -> To Version 6.0.135-servicing.24462.28 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,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,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 | 18 ++++---------- eng/Version.Details.xml | 52 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++++---------- 3 files changed, 42 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index a01fc0c56..9d32c6e60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -27,12 +27,7 @@ - - - - - - + @@ -53,7 +48,7 @@ - + @@ -68,12 +63,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f42fe65e9..72f12ad95 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 @@ -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,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 715cbd3538e523200b3f06ff794f5c76ff14b52c + b534695f6db2baff61acfb1c6bdebe610784dc40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 715cbd3538e523200b3f06ff794f5c76ff14b52c + b534695f6db2baff61acfb1c6bdebe610784dc40 - + 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 36532d586..527d46f2f 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 @@ -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.135-servicing.24461.11 - 6.0.135-servicing.24461.11 + 6.0.135-servicing.24462.28 + 6.0.135-servicing.24462.28 $(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 d5fe7a45f6e0e9d6de5a1a690f3d5d74a8a173bc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Sep 2024 19:45:34 +0000 Subject: [PATCH 07/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24462.28 -> To Version 6.0.135-servicing.24463.12 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 9d32c6e60..dcb61cec0 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 72f12ad95..94a835d0b 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 b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b534695f6db2baff61acfb1c6bdebe610784dc40 + fdf329d6a9732c1c30d644cfa98e0ed05351c08b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b534695f6db2baff61acfb1c6bdebe610784dc40 + fdf329d6a9732c1c30d644cfa98e0ed05351c08b diff --git a/eng/Versions.props b/eng/Versions.props index 527d46f2f..e4908ff43 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.135-servicing.24462.28 - 6.0.135-servicing.24462.28 + 6.0.135-servicing.24463.12 + 6.0.135-servicing.24463.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2a6e0c0c9573ee9974ebe9baa571573b381aa31 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Fri, 13 Sep 2024 21:40:06 +0000 Subject: [PATCH 08/12] Merged PR 42834: Update MsftToSbSdk.diff Fixes https://github.com/dotnet/source-build/issues/4604 Update MsftToSbSdk.diff ---- #### AI description (iteration 1) #### PR Classification Code cleanup to update the `MsftToSbSdk.diff` file. #### PR Summary This pull request updates the `MsftToSbSdk.diff` file to clean up and correct the list of SDK files. - `src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff`: Removed redundant entries and corrected the placement of `System.Text.Json.dll` and `System.Windows.Extensions.dll`. --- .../assets/baselines/MsftToSbSdk.diff | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff index 6dfa7ec1c..ec9a45ef5 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -102,10 +102,9 @@ index ------------ +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Runtime.CompilerServices.Unsafe.dll +./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/ @@ ------------ @@ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.MSBuild.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/Microsoft.CodeAnalysis.Workspaces.resources.dll @@ -428,10 +427,10 @@ index ------------ ./sdk/x.y.z/System.Security.Cryptography.Xml.dll -./sdk/x.y.z/System.Security.Permissions.dll ./sdk/x.y.z/System.ServiceProcess.ServiceController.dll --./sdk/x.y.z/System.Windows.Extensions.dll +./sdk/x.y.z/System.Text.Encoding.CodePages.dll +./sdk/x.y.z/System.Text.Encodings.Web.dll -+./sdk/x.y.z/System.Text.Json.dll + ./sdk/x.y.z/System.Text.Json.dll +-./sdk/x.y.z/System.Windows.Extensions.dll +./sdk/x.y.z/testhost.deps.json +./sdk/x.y.z/testhost.dll +./sdk/x.y.z/testhost.dll.config From 8639fd16a3eef1f32938b454af7bb1618d1d41fa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Sep 2024 23:21:25 +0000 Subject: [PATCH 09/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24463.12 -> To Version 6.0.135-servicing.24463.29 --- 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 94a835d0b..15d54221c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fdf329d6a9732c1c30d644cfa98e0ed05351c08b + e96b946ceaed31f6c4b70216f9570bf2f9800614 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fdf329d6a9732c1c30d644cfa98e0ed05351c08b + e96b946ceaed31f6c4b70216f9570bf2f9800614 diff --git a/eng/Versions.props b/eng/Versions.props index e4908ff43..98247251b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.135-servicing.24463.12 - 6.0.135-servicing.24463.12 + 6.0.135-servicing.24463.29 + 6.0.135-servicing.24463.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9680aa26588aa8cb345ffb9e703c47a5e34c9bf1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 14 Sep 2024 01:52:11 +0000 Subject: [PATCH 10/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24463.29 -> To Version 6.0.135-servicing.24463.32 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 dcb61cec0..152bf9648 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + @@ -63,7 +63,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15d54221c..52573e0eb 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 b66746dd945089102c4932375063d67616bea606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e96b946ceaed31f6c4b70216f9570bf2f9800614 + 040861c1545b11ae75ad0a86c40af20239913b49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e96b946ceaed31f6c4b70216f9570bf2f9800614 + 040861c1545b11ae75ad0a86c40af20239913b49 - + 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 98247251b..9f15fc9ce 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.135-servicing.24463.29 - 6.0.135-servicing.24463.29 + 6.0.135-servicing.24463.32 + 6.0.135-servicing.24463.32 $(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 407eb0f84e180dcad74021726c3d1c89a5338dd3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Sep 2024 22:02:32 +0000 Subject: [PATCH 11/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.15 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24463.32 -> To Version 6.0.135-servicing.24466.15 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.133 -> To Version 6.0.135 (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 152bf9648..9470a2b9a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,12 +19,7 @@ - - - - - - + @@ -55,12 +50,7 @@ - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddc195bf7..802f4b96f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b66746dd945089102c4932375063d67616bea606 + 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 040861c1545b11ae75ad0a86c40af20239913b49 + 01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 040861c1545b11ae75ad0a86c40af20239913b49 + 01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105 diff --git a/eng/Versions.props b/eng/Versions.props index 43e4f0a1c..b24c9b414 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.133 + 6.0.135 @@ -55,8 +55,8 @@ - 6.0.135-servicing.24463.32 - 6.0.135-servicing.24463.32 + 6.0.135-servicing.24466.15 + 6.0.135-servicing.24466.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.133 + 6.0.135 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From 817d9ca990ad43d08b5ad995db5921f6354a1a73 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 17 Sep 2024 00:38:23 +0000 Subject: [PATCH 12/12] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.135-servicing.24466.15 -> To Version 6.0.135-servicing.24466.24 --- 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 802f4b96f..fe34771e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1e5db134e25b38b223858e7dd497f9f8a9312f4e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105 + 954f381d16c2d44b573890786ca2d071c217a433 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 01eda4dbc7ddd567ef7c4dbedf11fa206d8e7105 + 954f381d16c2d44b573890786ca2d071c217a433 diff --git a/eng/Versions.props b/eng/Versions.props index b24c9b414..394ee243d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.135-servicing.24466.15 - 6.0.135-servicing.24466.15 + 6.0.135-servicing.24466.24 + 6.0.135-servicing.24466.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)