From ece5b130b11aad66e541d467f4af22bb1c3dd46d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 21:00:03 +0000 Subject: [PATCH 1/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.306 -> To Version 7.0.307 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.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.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 +++---- eng/Version.Details.xml | 114 ++++++++++++++++++++-------------------- eng/Versions.props | 52 +++++++++--------- 3 files changed, 93 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4179b671545e..590969229d80 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,23 +7,22 @@ - + + - - - + + + - - - + @@ -45,14 +44,15 @@ + + + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2ef5add6be1..3d182f16eb33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - e346a9e945fd8fb247ca06c129c68458b0713cd8 + f3874631f8761a385650af9a44d3254f8839e6e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 + a6dbb800a47735bde43187350fd3aff4071c7f9c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b506e2cb7b6c0fe787305f8cfdee046b7b3f9a53 + 5a4c82ec57fadddef9ce841d608de5c7c8c74446 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca303b9203db3e66ef52f8c570c9bf6b77ede7d2 + edfb43097f83ff132006d8dc427d7d33c2ddcfd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - dd121ee97234c7490f6111cf0c7bfa9235923f81 + 05b68f8296b45fa76b27abcb8e5666e73a4873b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d41bd7da4139331ef02657deb7944df43b8a181c + 5461ffc0ad318e6e60746a1440c67866d74b507e https://github.com/dotnet/fsharp @@ -133,7 +133,7 @@ 5b37dd5fea143baefbef2bd83836188af0815a30 - + https://github.com/microsoft/vstest e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb @@ -144,18 +144,18 @@ linker - + https://github.com/dotnet/roslyn - c3cc1d0ceeab1a65da0217e403851a1e8a30086a + 5db000294db8cc634e7d8fc004844338c9747dbc - + https://github.com/dotnet/msbuild - c70978d4d2178cc5c53d3e1946d187a2ddc41931 + 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa - + https://github.com/dotnet/msbuild - c70978d4d2178cc5c53d3e1946d187a2ddc41931 + 2679cf5a9cbd13e6833ca8a59553716f3f2f2afa @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index e4e12c4f4246..20f64b72a2cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.9-servicing.23321.6 + 7.0.10-servicing.23363.13 - 7.0.9-servicing.23321.9 + 7.0.10-servicing.23364.1 @@ -56,29 +56,29 @@ - 7.0.9 - 7.0.9 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 - 7.0.9-servicing.23321.10 + 7.0.10 + 7.0.10 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 + 7.0.10-servicing.23364.39 0.2.0 - 7.0.306 - 7.0.306-servicing.23321.40 - 7.0.306-servicing.23321.40 + 7.0.307 + 7.0.307-servicing.23367.12 + 7.0.307-servicing.23367.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.6.0-3.23210.15 + 4.6.0-3.23329.3 @@ -86,20 +86,20 @@ - 7.0.9-servicing.23320.18 - 7.0.9-servicing.23320.18 - 7.0.9 - 7.0.9 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23363.12 + 7.0.10-servicing.23363.12 + 7.0.10 + 7.0.10 + 7.0.10 + 7.0.10 2.1.0 - 7.0.9-servicing.23321.11 - 7.0.9-servicing.23321.11 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23364.4 + 7.0.10-servicing.23364.4 + 7.0.10 + 7.0.10 @@ -197,7 +197,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.3-release-20230616-01 + 17.6.3 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.9 - 7.0.9 + 7.0.10 + 7.0.10 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 6c0c0d063da21edc33c12ea623f05b525d45f244 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 17 Jul 2023 14:03:39 -0700 Subject: [PATCH 2/3] Remove applied source build patch --- ...explicit-System.Text.Json-dependency.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 74e217fbe550..000000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:02:20 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/sdk/pull/33618 ---- - src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -index 065f750f72..13d2c1ed99 100644 ---- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -+++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -@@ -23,6 +23,13 @@ - - - -+ -+ -+ -+ - - - From 2fd6547cc123bda1d7b4b99a5d2a7b4e675c3f35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 21:10:50 +0000 Subject: [PATCH 3/3] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.306 -> To Version 7.0.307 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.7.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.7.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.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.9 -> To Version 7.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index 590969229d80..754b226fd228 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,10 +19,10 @@ - + - + @@ -49,10 +49,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3d182f16eb33..13a1aa1be53e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f3874631f8761a385650af9a44d3254f8839e6e9 + 996ed6b07099f377a6b05581860a1f66a30aca00 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - edfb43097f83ff132006d8dc427d7d33c2ddcfd3 + 93655ee31e403d6dccf43195ebd7334dbedbffd9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 05b68f8296b45fa76b27abcb8e5666e73a4873b7 + 1f1ac283c5d3bb3302111f8aef567a3541863c49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5461ffc0ad318e6e60746a1440c67866d74b507e + 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 20f64b72a2cd..c197a2a4c560 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23363.13 + 7.0.10-servicing.23364.5 - 7.0.10-servicing.23364.1 + 7.0.10-servicing.23364.4 @@ -70,8 +70,8 @@ 7.0.307 - 7.0.307-servicing.23367.12 - 7.0.307-servicing.23367.12 + 7.0.307-servicing.23367.21 + 7.0.307-servicing.23367.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.10-servicing.23364.4 - 7.0.10-servicing.23364.4 + 7.0.10-servicing.23367.2 + 7.0.10-servicing.23367.2 7.0.10 7.0.10