From 3949e52fddb829602dde50b151c0bf23dad4c0cc Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 23 Jun 2023 17:44:47 +0000 Subject: [PATCH 01/26] Merged PR 32214: .NET Source-Build 7.0.108 June 2023 OOB Updates update global.json and Versions.props for .NET SDK 7.0.108 From 506a4709e3ca5d32a68b37e2eefd818758a3e4e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 19:29:58 +0000 Subject: [PATCH 02/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.109 -> To Version 7.0.110 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,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 | 18 ++++---- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 83 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cb159ba1..ad68f544b 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 9fb3411c5..b47273165 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 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 + 5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 + 5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 + 5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2b3241fd09fe88b953a4fca6b8e79fa7e993c488 + 5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3 - + 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 @@ -163,13 +163,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 a83b35744..8772a865a 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,22 +56,22 @@ - 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.109 - 7.0.109-servicing.23322.18 - 7.0.109-servicing.23322.18 + 7.0.110 + 7.0.110-servicing.23367.11 + 7.0.110-servicing.23367.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,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 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.9 - 7.0.9 + 7.0.10 + 7.0.10 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 32fa432c6f99c91cac86be5a18672ad02157bac4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 17 Jul 2023 13:30:05 -0700 Subject: [PATCH 03/26] 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 74e217fbe..000000000 --- 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 debaabc7c8450ff74a47214c6a5214c666c6ec04 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 21:06:50 +0000 Subject: [PATCH 04/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.110 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.10 -> 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 ad68f544b..fc3d06124 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 b47273165..7f105b121 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 - 5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3 + 82f22c431bb683309ba75d749d920ae8ffb06c02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3 + 82f22c431bb683309ba75d749d920ae8ffb06c02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3 + 82f22c431bb683309ba75d749d920ae8ffb06c02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5894fb6b8bf36d3e36b2a9c68ce660bdb4541bb3 + 82f22c431bb683309ba75d749d920ae8ffb06c02 - + 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 8772a865a..05ceab0e0 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.110 - 7.0.110-servicing.23367.11 - 7.0.110-servicing.23367.11 + 7.0.110-servicing.23367.22 + 7.0.110-servicing.23367.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,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 From ba920f88aceb29ba2178e33e51cbe5c6963e2a4a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 18 Jul 2023 19:05:47 +0000 Subject: [PATCH 05/26] Merged PR 32725: Revert "Update SB SDK diff baseline (#16973)" Reverts the changes that were made in https://github.com/dotnet/installer/pull/16973. This change is only relevant in the internal repo. --- .../assets/baselines/MsftToSbSdk.diff | 101 +----------------- 1 file changed, 5 insertions(+), 96 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 4d662a3c3..bd443698c 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,23 +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.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -+./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.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -125,35 +109,6 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./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.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-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/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -169,26 +124,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ + ./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 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -200,10 +150,6 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -259,21 +205,11 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll -+./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.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.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll - ./sdk/x.y.z/FSharp/System.Security.Permissions.dll -+./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll - ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll - ./sdk/x.y.z/FSharp/tr/ - ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -329,13 +265,6 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll - ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache - ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -360,16 +289,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -387,28 +306,18 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll -+./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.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.Reflection.Metadata.dll - ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll - ./sdk/x.y.z/System.Resources.Extensions.dll - ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./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.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.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From cdfa6bad98831f759d3afd947f3de673579af434 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 10 Aug 2023 19:58:12 +0000 Subject: [PATCH 06/26] Merged PR 33071: Update 7.0 SDK diff Update MSFT to SB SDK diff baseline --- .../assets/baselines/MsftToSbSdk.diff | 101 +++++++++++++++++- 1 file changed, 96 insertions(+), 5 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 bd443698c..4d662a3c3 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,7 +14,23 @@ 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.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml ++./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.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -109,6 +125,35 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ +@@ ------------ @@ + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll + ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./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.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-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/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -124,21 +169,26 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ - ./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 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ --./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ + ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -150,6 +200,10 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll ++./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -205,11 +259,21 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll ++./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.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.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll + ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll + ./sdk/x.y.z/FSharp/System.Security.Permissions.dll ++./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll + ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll + ./sdk/x.y.z/FSharp/tr/ + ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -265,6 +329,13 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll ++./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll + ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache + ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -289,6 +360,16 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll +@@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll ++./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -306,18 +387,28 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ + ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll ++./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.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.Reflection.Metadata.dll + ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll + ./sdk/x.y.z/System.Resources.Extensions.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./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.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.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From c6505a010cfe757ffb4b6cb8d2791e6ca5b0ea1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:30:42 +0000 Subject: [PATCH 07/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.308 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.ILLink.Tasks,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.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 45 ++++------------- eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 85 insertions(+), 112 deletions(-) diff --git a/NuGet.config b/NuGet.config index b885835bc..c074bb5a9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,34 +10,19 @@ - - - - + - - - - + - - - - + - - - - + - - - - + @@ -59,27 +44,15 @@ - - - - + - - - - + - - - - + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d206477b..8910b7ae7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 2bfaf348a33275034b7a9d186a5803f78b512ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 2e82d9d2458c751ea103d1487b2695d62612fc2d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + 1a043efd50b1f70f42a00ddd5987b94d1d279c5a https://github.com/dotnet/fsharp @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7db5fcb8c..1da481900 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.11-servicing.23415.5 - 7.0.10-servicing.23364.4 + 7.0.11-servicing.23415.5 @@ -56,22 +56,22 @@ - 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 + 7.0.11 + 7.0.11 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 0.2.0 - 7.0.307 - 7.0.307-servicing.23367.21 - 7.0.307-servicing.23367.21 + 7.0.308 + 7.0.308-servicing.23416.25 + 7.0.308-servicing.23416.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.17 + 7.0.11-servicing.23415.17 + 7.0.11 + 7.0.11 + 7.0.11 + 7.0.11 2.1.0 - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.7 + 7.0.11-servicing.23415.7 + 7.0.11 + 7.0.11 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 7e71db02945cb85e974dcf9b2eb25e9929438883 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:14:47 +0000 Subject: [PATCH 08/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.308 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.ILLink.Tasks,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.10 -> To Version 7.0.11 (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 c074bb5a9..fe55a3a6e 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 8910b7ae7..647c5821c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 2bfaf348a33275034b7a9d186a5803f78b512ad1 + c9f28c6a29182e54d1c292d1cff9778315cee51c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1bf50404dde4760c0ee8198026d4c33f5af8e7a6 + f228b17d671d0196fa19fb77fdf57ca5d7b9871b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 2e82d9d2458c751ea103d1487b2695d62612fc2d + 639189647d647da4008fa57fd63b1d415c84b487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 1a043efd50b1f70f42a00ddd5987b94d1d279c5a + 8037dc673134da614f02f4b84f6a9a61e047ae60 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1da481900..f17bca02c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23415.5 + 7.0.11-servicing.23416.5 - 7.0.11-servicing.23415.5 + 7.0.11-servicing.23416.7 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23416.25 - 7.0.308-servicing.23416.25 + 7.0.308-servicing.23416.55 + 7.0.308-servicing.23416.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23415.7 - 7.0.11-servicing.23415.7 + 7.0.11-servicing.23416.8 + 7.0.11-servicing.23416.8 7.0.11 7.0.11 From 1d2de9a0d7509be3068c77af3253279f49bdbd9d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:27:45 +0000 Subject: [PATCH 09/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.54 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.111 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,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.10 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 29 ++++-------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 94 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bc601a50..feca935bf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ - - - - + - - - - + + + - - - - + @@ -51,19 +44,15 @@ - - - - + + + - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41f0b6154..fd0c58a2e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + de7841221e4ad56750e452db8ac4eab459b2ab23 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 29b232880d00408f61601fd63a87d54784dde835 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + 142937b396f99e3331d8b9fa3c529e6169a7405f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + 142937b396f99e3331d8b9fa3c529e6169a7405f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + 142937b396f99e3331d8b9fa3c529e6169a7405f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + 142937b396f99e3331d8b9fa3c529e6169a7405f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 639189647d647da4008fa57fd63b1d415c84b487 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + 8037dc673134da614f02f4b84f6a9a61e047ae60 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + fcd8602188cfe2f73c73f5ae57e33c0654ce9858 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index f9f9cd5e4..cc9d7ddb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.11-servicing.23416.5 - 7.0.10-servicing.23364.4 + 7.0.11-servicing.23416.7 @@ -56,22 +56,22 @@ - 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 + 7.0.11 + 7.0.11 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 + 7.0.11-servicing.23416.1 0.2.0 - 7.0.110 - 7.0.110-servicing.23367.22 - 7.0.110-servicing.23367.22 + 7.0.111 + 7.0.111-servicing.23416.54 + 7.0.111-servicing.23416.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.10-servicing.23363.12 - 7.0.10-servicing.23363.12 - 7.0.10 - 7.0.10 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23415.17 + 7.0.11-servicing.23415.17 + 7.0.11 + 7.0.11 + 7.0.11 + 7.0.11 2.1.0 - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.11-servicing.23416.8 + 7.0.11-servicing.23416.8 + 7.0.11 + 7.0.11 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From cc1db914339b4012194a7de08ab967d094e6f19b Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 17 Aug 2023 18:59:59 +0000 Subject: [PATCH 10/26] Merged PR 33235: Update 7.0 source-build SDK diff baseline --- .../assets/baselines/MsftToSbSdk.diff | 101 +----------------- 1 file changed, 5 insertions(+), 96 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 4d662a3c3..bd443698c 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,23 +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.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -+./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.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Threading.RateLimiting.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -125,35 +109,6 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/ ./sdk/x.y.z/DotnetTools/dotnet-format/tr/dotnet-format.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-format/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.JsonWebTokens.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Logging.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/Microsoft.IdentityModel.Tokens.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.IdentityModel.Tokens.Jwt.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-jwts/x.y.z/tools/netx.y/any/System.Text.Json.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/ -@@ ------------ @@ - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.FileSystemGlobbing.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Microsoft.Extensions.Primitives.dll - ./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/Newtonsoft.Json.dll -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-user-secrets/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./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.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-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/Microsoft.CodeAnalysis.CSharp.Features.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/Microsoft.CodeAnalysis.CSharp.Workspaces.dll @@ -169,26 +124,21 @@ index ------------ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/middleware/Microsoft.AspNetCore.Watch.BrowserRefresh.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/pl/ @@ ------------ @@ + ./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 ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/ru/System.CommandLine.resources.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/unix/lib/netx.y/System.Drawing.Common.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/ -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/browser/lib/netx.y/System.Text.Encodings.Web.dll - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ - ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/ +-./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Drawing.Common.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Collections.Immutable.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.CommandLine.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.AttributedModel.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Composition.Convention.dll @@ -200,10 +150,6 @@ index ------------ -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Security.Permissions.dll -./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Windows.Extensions.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Reflection.Metadata.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encoding.CodePages.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Encodings.Web.dll -+./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/System.Text.Json.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/ ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/dotnet-watch.resources.dll ./sdk/x.y.z/DotnetTools/dotnet-watch/x.y.z/tools/netx.y/any/tr/Microsoft.CodeAnalysis.CSharp.Features.resources.dll @@ -259,21 +205,11 @@ index ------------ -./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/FSharp/runtimes/win/lib/netx.y/System.Windows.Extensions.dll ./sdk/x.y.z/FSharp/System.CodeDom.dll -+./sdk/x.y.z/FSharp/System.Collections.Immutable.dll ./sdk/x.y.z/FSharp/System.Configuration.ConfigurationManager.dll +./sdk/x.y.z/FSharp/System.Diagnostics.EventLog.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.Reflection.Metadata.dll ./sdk/x.y.z/FSharp/System.Resources.Extensions.dll ./sdk/x.y.z/FSharp/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.ProtectedData.dll - ./sdk/x.y.z/FSharp/System.Security.Cryptography.Xml.dll - ./sdk/x.y.z/FSharp/System.Security.Permissions.dll -+./sdk/x.y.z/FSharp/System.Threading.Tasks.Dataflow.dll - ./sdk/x.y.z/FSharp/System.Windows.Extensions.dll - ./sdk/x.y.z/FSharp/tr/ - ./sdk/x.y.z/FSharp/tr/FSharp.Build.resources.dll @@ ------------ @@ ./sdk/x.y.z/Microsoft.Build.NuGetSdkResolver.dll ./sdk/x.y.z/Microsoft.Build.Tasks.Core.dll @@ -329,13 +265,6 @@ index ------------ ./sdk/x.y.z/runtimes/win/lib/netx.y/Microsoft.Win32.SystemEvents.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Diagnostics.EventLog.Messages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Drawing.Common.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.Pkcs.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.ServiceProcess.ServiceController.dll -+./sdk/x.y.z/runtimes/win/lib/netx.y/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/runtimes/win/lib/netx.y/System.Windows.Extensions.dll - ./sdk/x.y.z/SDKPrecomputedAssemblyReferences.cache - ./sdk/x.y.z/SdkResolvers/ @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Buffers.dll ./sdk/x.y.z/Sdks/Microsoft.NET.ILLink.Tasks/tools/net472/System.Collections.Immutable.dll @@ -360,16 +289,6 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Reflection.Metadata.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tasks/net472/System.Text.Encodings.Web.dll -@@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.deps.json - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/rzc.runtimeconfig.json -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Collections.Immutable.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Reflection.Metadata.dll -+./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Razor/tools/System.Text.Encoding.CodePages.dll - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web.ProjectSystem/Sdk/Sdk.props @@ ------------ @@ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/net472/Microsoft.NET.Sdk.Web.Tasks.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk.Web/tools/netx.y/ @@ -387,28 +306,18 @@ index ------------ ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Runtime.CompilerServices.Unsafe.dll ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/net472/System.Text.Encodings.Web.dll @@ ------------ @@ - ./sdk/x.y.z/Sdks/Microsoft.NET.Sdk/tools/netx.y/zh-Hant/Microsoft.NET.Build.Tasks.resources.dll ./sdk/x.y.z/Sdks/NuGet.Build.Tasks.Pack/ ./sdk/x.y.z/System.CodeDom.dll -+./sdk/x.y.z/System.Collections.Immutable.dll ./sdk/x.y.z/System.CommandLine.dll -./sdk/x.y.z/System.ComponentModel.Composition.dll ./sdk/x.y.z/System.Configuration.ConfigurationManager.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.Reflection.Metadata.dll - ./sdk/x.y.z/System.Reflection.MetadataLoadContext.dll - ./sdk/x.y.z/System.Resources.Extensions.dll - ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll @@ ------------ @@ ./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.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.Threading.Tasks.Dataflow.dll ./sdk/x.y.z/System.Windows.Extensions.dll -./sdk/x.y.z/testhost-1.0.runtimeconfig.json -./sdk/x.y.z/testhost-1.1.runtimeconfig.json From 359b356988e6d67aa830aea6adbaacaa26cde2e9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 17 Aug 2023 13:16:03 -0700 Subject: [PATCH 11/26] Remove inapplicable sourcebuild patch for format --- ...explicit-System.Text.Json-dependency.patch | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index ced7ca579..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:46:46 +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/format/pull/1887 ---- - Directory.Packages.props | 1 + - eng/Version.Details.xml | 4 ++++ - eng/Versions.props | 2 ++ - src/dotnet-format.csproj | 6 ++++++ - 4 files changed, 13 insertions(+) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c22..c9f86593 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -36,5 +36,6 @@ - - - -+ - - -\ No newline at end of file -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index cdfa5f5e..86f02b44 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -13,6 +13,10 @@ - https://github.com/dotnet/command-line-api - c776cd4e906b669b9cce1017fee7d0ba9845d163 - -+ -+ https://github.com/dotnet/runtime -+ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 27582078..bccaf176 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -20,6 +20,8 @@ - - 2.0.0-beta4.22504.1 - 0.4.0-alpha.22504.1 -+ -+ 6.0.8 - - -+ - - - From 1207a83f41885e65c9fec82fb179c39ca41d9d52 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 18:00:49 +0000 Subject: [PATCH 12/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe55a3a6e..d32aa5b64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 647c5821c..27f427750 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f228b17d671d0196fa19fb77fdf57ca5d7b9871b + ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f diff --git a/eng/Versions.props b/eng/Versions.props index f17bca02c..36faaa323 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23416.55 - 7.0.308-servicing.23416.55 + 7.0.308-servicing.23422.7 + 7.0.308-servicing.23422.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.11-servicing.23415.17 - 7.0.11-servicing.23415.17 + 7.0.11-servicing.23418.12 + 7.0.11-servicing.23418.12 7.0.11 7.0.11 7.0.11 From 0bd4ef5d84ee2da1b57f8a70e58447db4de99029 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 18:01:58 +0000 Subject: [PATCH 13/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates 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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index feca935bf..a42e9c884 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,10 +16,10 @@ - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd0c58a2e..881e10e99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop c9f28c6a29182e54d1c292d1cff9778315cee51c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - de7841221e4ad56750e452db8ac4eab459b2ab23 + 41b7214ace077c230589720cf3460073d1bbd948 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 142937b396f99e3331d8b9fa3c529e6169a7405f + 2fad12db2d9c657ef65e907a86bd5238abb95c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 142937b396f99e3331d8b9fa3c529e6169a7405f + 2fad12db2d9c657ef65e907a86bd5238abb95c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 142937b396f99e3331d8b9fa3c529e6169a7405f + 2fad12db2d9c657ef65e907a86bd5238abb95c56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 142937b396f99e3331d8b9fa3c529e6169a7405f + 2fad12db2d9c657ef65e907a86bd5238abb95c56 diff --git a/eng/Versions.props b/eng/Versions.props index cc9d7ddb2..cd708b8c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.111 - 7.0.111-servicing.23416.54 - 7.0.111-servicing.23416.54 + 7.0.111-servicing.23422.9 + 7.0.111-servicing.23422.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.11-servicing.23415.17 - 7.0.11-servicing.23415.17 + 7.0.11-servicing.23418.12 + 7.0.11-servicing.23418.12 7.0.11 7.0.11 7.0.11 From da8de81b20802be3fd79d6db6acc08fa0d0a240c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 19:04:45 +0000 Subject: [PATCH 14/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 --- 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 a42e9c884..9fcf793ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 881e10e99..3482698e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fad12db2d9c657ef65e907a86bd5238abb95c56 + 1aede6f6299c7d77853a33e4e317b96bbd1fca81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fad12db2d9c657ef65e907a86bd5238abb95c56 + 1aede6f6299c7d77853a33e4e317b96bbd1fca81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fad12db2d9c657ef65e907a86bd5238abb95c56 + 1aede6f6299c7d77853a33e4e317b96bbd1fca81 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2fad12db2d9c657ef65e907a86bd5238abb95c56 + 1aede6f6299c7d77853a33e4e317b96bbd1fca81 diff --git a/eng/Versions.props b/eng/Versions.props index cd708b8c1..597efa244 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.111 - 7.0.111-servicing.23422.9 - 7.0.111-servicing.23422.9 + 7.0.111-servicing.23422.12 + 7.0.111-servicing.23422.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9b21f27366b6e40d953d1b8d9a3a6fa18513e371 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 22:21:17 +0000 Subject: [PATCH 15/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fcf793ad..65273e3fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3482698e4..fdfcfcb33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aede6f6299c7d77853a33e4e317b96bbd1fca81 + 587a47261def4391c5fded60fd79ea3414c4a9af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aede6f6299c7d77853a33e4e317b96bbd1fca81 + 587a47261def4391c5fded60fd79ea3414c4a9af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aede6f6299c7d77853a33e4e317b96bbd1fca81 + 587a47261def4391c5fded60fd79ea3414c4a9af - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aede6f6299c7d77853a33e4e317b96bbd1fca81 + 587a47261def4391c5fded60fd79ea3414c4a9af - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 639189647d647da4008fa57fd63b1d415c84b487 + 81760b1e789d848e1c44733615cf2939159603a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8037dc673134da614f02f4b84f6a9a61e047ae60 + aea83fde388f1f90c7068116c2653b12e31bac40 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 597efa244..f80c644bb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23416.5 + 7.0.11-servicing.23422.3 - 7.0.11-servicing.23416.7 + 7.0.11-servicing.23422.2 @@ -58,11 +58,11 @@ 7.0.11 7.0.11 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 0.2.0 @@ -70,8 +70,8 @@ 7.0.111 - 7.0.111-servicing.23422.12 - 7.0.111-servicing.23422.12 + 7.0.111-servicing.23422.24 + 7.0.111-servicing.23422.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.11-servicing.23416.8 - 7.0.11-servicing.23416.8 + 7.0.11-servicing.23422.3 + 7.0.11-servicing.23422.3 7.0.11 7.0.11 From 141c0a7453627adbc1f72e38071e4444d811ff35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 22:24:02 +0000 Subject: [PATCH 16/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,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 From Version 7.0.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index d32aa5b64..43bad0279 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -44,15 +44,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 27f427750..8945ff865 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c9f28c6a29182e54d1c292d1cff9778315cee51c + 721967ad57b950287505e20f9953ff14b9a10485 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 29b232880d00408f61601fd63a87d54784dde835 + cf068f24c37b6166910886b26bde7bd32bf71259 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec5aa7cde49700e67dc2f1a77e713c0c3bd26b6f + 5e1f89ce74e9a890047bc6374af04d0f4a050eab - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 639189647d647da4008fa57fd63b1d415c84b487 + 81760b1e789d848e1c44733615cf2939159603a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 8037dc673134da614f02f4b84f6a9a61e047ae60 + aea83fde388f1f90c7068116c2653b12e31bac40 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 36faaa323..63da1f5ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23416.5 + 7.0.11-servicing.23422.3 - 7.0.11-servicing.23416.7 + 7.0.11-servicing.23422.2 @@ -58,11 +58,11 @@ 7.0.11 7.0.11 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 - 7.0.11-servicing.23416.1 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 + 7.0.11-servicing.23422.8 0.2.0 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23422.7 - 7.0.308-servicing.23422.7 + 7.0.308-servicing.23422.25 + 7.0.308-servicing.23422.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23416.8 - 7.0.11-servicing.23416.8 + 7.0.11-servicing.23422.3 + 7.0.11-servicing.23422.3 7.0.11 7.0.11 From ad11d7f236395263aea24ee76c1adc7a23ecb5d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 16:01:57 +0000 Subject: [PATCH 17/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates 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,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.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 43bad0279..2d3540811 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,13 +13,13 @@ - + - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8945ff865..abfc60fc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e1f89ce74e9a890047bc6374af04d0f4a050eab + 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a @@ -169,11 +169,11 @@ https://github.com/dotnet/emsdk - fcd8602188cfe2f73c73f5ae57e33c0654ce9858 + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/emsdk - fcd8602188cfe2f73c73f5ae57e33c0654ce9858 + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 63da1f5ba..5c76d0db3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23422.25 - 7.0.308-servicing.23422.25 + 7.0.308-servicing.23425.20 + 7.0.308-servicing.23425.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.11-servicing.23418.12 - 7.0.11-servicing.23418.12 + 7.0.11-servicing.23424.27 + 7.0.11-servicing.23424.27 7.0.11 7.0.11 7.0.11 From b0295ea498bd466d61c73edd04cf0ef378edcc6c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 16:05:35 +0000 Subject: [PATCH 18/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates 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,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.11 -> To Version 7.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 8 ++++---- 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 65273e3fc..2b6b9e39f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,16 +10,16 @@ - + - + - + @@ -47,9 +47,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdfcfcb33..17b26bbe8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 721967ad57b950287505e20f9953ff14b9a10485 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 41b7214ace077c230589720cf3460073d1bbd948 + ecb34f85ec92e1b3c814edf7da83337e199e7f66 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 587a47261def4391c5fded60fd79ea3414c4a9af + b257a52f3e0245203a2888dcbdd46c99be86bf56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 587a47261def4391c5fded60fd79ea3414c4a9af + b257a52f3e0245203a2888dcbdd46c99be86bf56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 587a47261def4391c5fded60fd79ea3414c4a9af + b257a52f3e0245203a2888dcbdd46c99be86bf56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 587a47261def4391c5fded60fd79ea3414c4a9af + b257a52f3e0245203a2888dcbdd46c99be86bf56 @@ -165,11 +165,11 @@ https://github.com/dotnet/emsdk - fcd8602188cfe2f73c73f5ae57e33c0654ce9858 + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/emsdk - fcd8602188cfe2f73c73f5ae57e33c0654ce9858 + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index f80c644bb..21b3651b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.111 - 7.0.111-servicing.23422.24 - 7.0.111-servicing.23422.24 + 7.0.111-servicing.23425.22 + 7.0.111-servicing.23425.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.11-servicing.23418.12 - 7.0.11-servicing.23418.12 + 7.0.11-servicing.23424.27 + 7.0.11-servicing.23424.27 7.0.11 7.0.11 7.0.11 From 39579bbae4a397a8beca6a4305c764062d42e47e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 17:54:59 +0000 Subject: [PATCH 19/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 --- 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 2b6b9e39f..12126931d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 17b26bbe8..ae925414b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b257a52f3e0245203a2888dcbdd46c99be86bf56 + dc70f49b6fdb704c917f130aea5a13c18d975207 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b257a52f3e0245203a2888dcbdd46c99be86bf56 + dc70f49b6fdb704c917f130aea5a13c18d975207 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b257a52f3e0245203a2888dcbdd46c99be86bf56 + dc70f49b6fdb704c917f130aea5a13c18d975207 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b257a52f3e0245203a2888dcbdd46c99be86bf56 + dc70f49b6fdb704c917f130aea5a13c18d975207 diff --git a/eng/Versions.props b/eng/Versions.props index 21b3651b2..ec11b8211 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.111 - 7.0.111-servicing.23425.22 - 7.0.111-servicing.23425.22 + 7.0.111-servicing.23425.26 + 7.0.111-servicing.23425.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 288633c161cdacd0c0b2d88d7b81e4a036d9bb55 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 19:00:22 +0000 Subject: [PATCH 20/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates 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 From Version 7.0.11 -> To Version 7.0.11 (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 12126931d..d8eb87349 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae925414b..e1815d754 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc70f49b6fdb704c917f130aea5a13c18d975207 + d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc70f49b6fdb704c917f130aea5a13c18d975207 + d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc70f49b6fdb704c917f130aea5a13c18d975207 + d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dc70f49b6fdb704c917f130aea5a13c18d975207 + d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4 diff --git a/eng/Versions.props b/eng/Versions.props index ec11b8211..b64511458 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.11 7.0.11 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.111 - 7.0.111-servicing.23425.26 - 7.0.111-servicing.23425.26 + 7.0.111-servicing.23425.35 + 7.0.111-servicing.23425.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 85f6922cb3b4a6115f1e3fde9c8c99da130346d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 19:00:44 +0000 Subject: [PATCH 21/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates 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 From Version 7.0.11 -> To Version 7.0.11 (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 2d3540811..f4c5be77c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -44,12 +44,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abfc60fc0..1abc874bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cf068f24c37b6166910886b26bde7bd32bf71259 + 70048beee894074e9718206a0017d9b080ee66ff https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 95fefa4d1dd7f80800dc00d747cd2d5fd4b3c45a + f469d782833a83a3c210f3ed1807f2c05a2ba6d4 diff --git a/eng/Versions.props b/eng/Versions.props index 5c76d0db3..de74eb863 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.11 7.0.11 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 - 7.0.11-servicing.23422.8 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 + 7.0.11-servicing.23425.2 0.2.0 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23425.20 - 7.0.308-servicing.23425.20 + 7.0.308-servicing.23425.34 + 7.0.308-servicing.23425.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6c569fb358b5052929648fb24c7f20a79c145b8d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 21:44:28 +0000 Subject: [PATCH 22/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.11 -> To Version 7.0.11 (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 f4c5be77c..cc1a1596f 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 1abc874bb..aefc4f1b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f469d782833a83a3c210f3ed1807f2c05a2ba6d4 + 3df19b5c2397628b241f0785320858fa0ab1d9aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 81760b1e789d848e1c44733615cf2939159603a3 + 66db733312de7bd21ed3e73cee0b27fb75d91b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aea83fde388f1f90c7068116c2653b12e31bac40 + 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index de74eb863..1eaede787 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23422.3 + 7.0.11-servicing.23425.2 - 7.0.11-servicing.23422.2 + 7.0.11-servicing.23425.6 @@ -70,8 +70,8 @@ 7.0.308 - 7.0.308-servicing.23425.34 - 7.0.308-servicing.23425.34 + 7.0.308-servicing.23425.45 + 7.0.308-servicing.23425.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.11-servicing.23422.3 - 7.0.11-servicing.23422.3 + 7.0.11-servicing.23425.5 + 7.0.11-servicing.23425.5 7.0.11 7.0.11 From 8ccd8a807f77ab0d1daf6a9d8c5a2e957e00b041 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 21:46:55 +0000 Subject: [PATCH 23/26] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.111 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 7.0.11 -> To Version 7.0.11 (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 d8eb87349..ea2adade5 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 e1815d754..9253d3890 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 721967ad57b950287505e20f9953ff14b9a10485 + b193aa2e8630cef7ac1d858be3677b0c129e2faf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4 + d0b45a002cc72d1932d7c1a6a87482bac3518c5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4 + d0b45a002cc72d1932d7c1a6a87482bac3518c5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4 + d0b45a002cc72d1932d7c1a6a87482bac3518c5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52e32cde3bfffcdb95d1eb0bc16251a8f3e53d4 + d0b45a002cc72d1932d7c1a6a87482bac3518c5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 81760b1e789d848e1c44733615cf2939159603a3 + 66db733312de7bd21ed3e73cee0b27fb75d91b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - aea83fde388f1f90c7068116c2653b12e31bac40 + 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b64511458..6398d4c16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23422.3 + 7.0.11-servicing.23425.2 - 7.0.11-servicing.23422.2 + 7.0.11-servicing.23425.6 @@ -70,8 +70,8 @@ 7.0.111 - 7.0.111-servicing.23425.35 - 7.0.111-servicing.23425.35 + 7.0.111-servicing.23425.44 + 7.0.111-servicing.23425.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.11-servicing.23422.3 - 7.0.11-servicing.23422.3 + 7.0.11-servicing.23425.5 + 7.0.11-servicing.23425.5 7.0.11 7.0.11 From 529188e483f3634a687c4df353364a812c245e2b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:27:03 -0700 Subject: [PATCH 24/26] Update branding to 7.0.112 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f9f9cd5e4..c64853195 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 11 + 12 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 92332ccd3031ef9f5642a050835cec8972338141 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:27:07 -0700 Subject: [PATCH 25/26] Update branding to 7.0.309 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7db5fcb8c..e9798b657 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 08 + 09 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 0c7d38132a88882f78951734fed1b02a567381da Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 12 Sep 2023 16:06:51 -0500 Subject: [PATCH 26/26] .NET Source-Build 7.0.111 September 2023 Updates (#17341) --- eng/Versions.props | 4 ++-- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a2a75258d..12b8f2cd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -215,8 +215,8 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 7.0.110 - 7.0.110 + 7.0.111 + 7.0.111 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index f8dc920b3..654f89210 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110" + "dotnet": "7.0.111" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1",