From 3949e52fddb829602dde50b151c0bf23dad4c0cc Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 23 Jun 2023 17:44:47 +0000 Subject: [PATCH 001/294] 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 002/294] 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 003/294] 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 004/294] 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 005/294] 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 b0dda375d13513f4b0db90517ff4408e05eb68a4 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 18 Jul 2023 20:37:24 +0000 Subject: [PATCH 006/294] Merged PR 32726: Update SB test baselines This reverts the changes that were made in https://github.com/dotnet/installer/pull/16959 and https://github.com/dotnet/installer/pull/16972. These changes only apply to the internal repo. --- .../assets/baselines/MissingXmlDoc.txt | 1 - .../assets/baselines/MsftToSbSdk.diff | 17 ----------------- 2 files changed, 18 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml 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 4e98d267b..1b86a0d2e 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,20 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -42,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From fd19247682774290394c6304e9a2b26a7ae7304d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 21:00:12 +0000 Subject: [PATCH 007/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23401.9 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index adbb45577..36c723357 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,15 +49,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5554bca6..bd159ad10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 diff --git a/eng/Versions.props b/eng/Versions.props index 97effa0a5..3d2372ddc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.413-servicing.23367.15 - 6.0.413-servicing.23367.15 + 6.0.414-servicing.23401.9 + 6.0.414-servicing.23401.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e403960548a2b1c58eede62f6f6e71693597a76 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 21:01:13 +0000 Subject: [PATCH 008/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.7 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.7 --- NuGet.config | 16 ++++++++++++++++ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 237478e93..f2ea52dee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -15,12 +17,18 @@ + + + + + + @@ -41,14 +49,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2569e5124..eb0120592 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 diff --git a/eng/Versions.props b/eng/Versions.props index c1cb463e7..32aecf03a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.316-servicing.23367.14 - 6.0.316-servicing.23367.14 + 6.0.317-servicing.23401.7 + 6.0.317-servicing.23401.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe9469ff1c6d39f18ac2500d00a7c6aaecc3ab62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 1 Aug 2023 23:37:34 +0000 Subject: [PATCH 009/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230801.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23401.20 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb0120592..90cb5129f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 + 674ce8a93a6de851e91ae8151e72693314daef56 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5c6a3f05fd8eb4be6365c0c9c3fb6eb4f3472e0 + 674ce8a93a6de851e91ae8151e72693314daef56 diff --git a/eng/Versions.props b/eng/Versions.props index 32aecf03a..6224051b5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23401.7 - 6.0.317-servicing.23401.7 + 6.0.317-servicing.23401.20 + 6.0.317-servicing.23401.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5368f4278f60e1e94d6f6576df8ec6d17eb22477 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Aug 2023 19:53:57 +0000 Subject: [PATCH 010/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23408.8 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 90cb5129f..1d99db0eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 674ce8a93a6de851e91ae8151e72693314daef56 + 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 674ce8a93a6de851e91ae8151e72693314daef56 + 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a diff --git a/eng/Versions.props b/eng/Versions.props index 6224051b5..812bd6d64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23401.20 - 6.0.317-servicing.23401.20 + 6.0.317-servicing.23408.8 + 6.0.317-servicing.23408.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 10caa4a7f128d436eb91b5fa081787c36d6a8568 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 8 Aug 2023 21:55:54 +0000 Subject: [PATCH 011/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230808.18 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23408.18 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd159ad10..26beb5cd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 + 1fa8b41e99188499e02b7e18f30960c80130acbb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1b7e089bba6c87921600e03f83ddb77ba6bb59e2 + 1fa8b41e99188499e02b7e18f30960c80130acbb diff --git a/eng/Versions.props b/eng/Versions.props index 3d2372ddc..6e6c35af7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23401.9 - 6.0.414-servicing.23401.9 + 6.0.414-servicing.23408.18 + 6.0.414-servicing.23408.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 67ece7f3cb341470c3236af917d4269291584e80 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 10:15:06 +0000 Subject: [PATCH 012/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.2 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.2 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 36c723357..f27f973a5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26beb5cd6..606e014f2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8b41e99188499e02b7e18f30960c80130acbb + 61fa08a18b023d205e572969bc4acdeeda2e98a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1fa8b41e99188499e02b7e18f30960c80130acbb + 61fa08a18b023d205e572969bc4acdeeda2e98a8 diff --git a/eng/Versions.props b/eng/Versions.props index 6e6c35af7..bd4f80d85 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23408.18 - 6.0.414-servicing.23408.18 + 6.0.414-servicing.23409.2 + 6.0.414-servicing.23409.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4cc5d8c18a541c28ad7d20e577f3a63582a19635 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 15:10:40 +0000 Subject: [PATCH 013/294] Update dependencies from https://github.com/dotnet/arcade build 20230808.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 6.0.0-beta.23361.3 -> To Version 6.0.0-beta.23408.5 --- NuGet.config | 14 ++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 237478e93..a6c9c345e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,24 @@ + + - + + + + @@ -41,14 +46,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2569e5124..62db8623a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 - + https://github.com/dotnet/arcade - cd79d2e8f7844d0a9aca607d4d5b9b6ab78e2f34 + 98fd22588fbb0f407faa6a74cb1aa79031306151 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c1cb463e7..c9f660c5a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23361.3 + 6.0.0-beta.23408.5 diff --git a/global.json b/global.json index 3364ad030..327cfe027 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.120", + "dotnet": "6.0.121", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23361.3", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23361.3" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" } } From 9ed07936ec7ad2454c6e99b2d4c8babe90b437a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 9 Aug 2023 18:27:09 +0000 Subject: [PATCH 014/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.9 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.414-servicing.23409.9 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 606e014f2..024d08ad0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61fa08a18b023d205e572969bc4acdeeda2e98a8 + abf876d5642725dcfc24748308ba5fe849d6fab7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 61fa08a18b023d205e572969bc4acdeeda2e98a8 + abf876d5642725dcfc24748308ba5fe849d6fab7 diff --git a/eng/Versions.props b/eng/Versions.props index bd4f80d85..93c78b957 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23409.2 - 6.0.414-servicing.23409.2 + 6.0.414-servicing.23409.9 + 6.0.414-servicing.23409.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e68b8872b07966792171f6a5d8d77facb8b42a65 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 10 Aug 2023 00:35:35 +0000 Subject: [PATCH 015/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230809.16 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.317-servicing.23409.16 --- NuGet.config | 6 ------ eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index f2ea52dee..a6c9c345e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,9 +16,6 @@ - - - @@ -54,9 +51,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d99db0eb..3cfee3060 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a + 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 14ca8605fe72f4e61f0aeb4ae8eaad71e324808a + 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 diff --git a/eng/Versions.props b/eng/Versions.props index 812bd6d64..c4129850d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23408.8 - 6.0.317-servicing.23408.8 + 6.0.317-servicing.23409.16 + 6.0.317-servicing.23409.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e64c1a447c8957ad8662e9a17f950eec720299c1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 10 Aug 2023 15:12:34 +0000 Subject: [PATCH 016/294] Merged PR 33069: Update 6.0 SDK diff Update MSFT to SB SDK diff baseline --- .../assets/baselines/MsftToSbSdk.diff | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 1b86a0d2e..4e98d267b 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,20 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml + ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -29,6 +42,10 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll ++./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ From cdfa6bad98831f759d3afd947f3de673579af434 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 10 Aug 2023 19:58:12 +0000 Subject: [PATCH 017/294] 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 8bcdc0361bb0433619104df96bc24ad34357b3cf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 15 Aug 2023 16:30:03 +0000 Subject: [PATCH 018/294] [release/7.0.4xx] Update dependencies from dotnet/test-templates (#17192) [release/7.0.4xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74fcc18d3..78c20b8d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 diff --git a/eng/Versions.props b/eng/Versions.props index adf9b8891..db56480f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 + 1.1.0-rc.23415.2 + 1.1.0-rc.23415.2 + 1.1.0-rc.23415.2 From 14f5e6b15b38d00384047f85bd4ac669457a1231 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 17:49:53 +0000 Subject: [PATCH 019/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.27 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++--------- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 40 ++++++++++----------- 3 files changed, 66 insertions(+), 78 deletions(-) diff --git a/NuGet.config b/NuGet.config index f27f973a5..98c2f6245 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,19 @@ - - - + + - - - - - - + @@ -46,21 +40,15 @@ - - - + + - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9a07d567..62d6bee3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - abf876d5642725dcfc24748308ba5fe849d6fab7 + 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - abf876d5642725dcfc24748308ba5fe849d6fab7 + 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + ccb899fabb951da0ce4ada295ab2783170aacef8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 76663d25f..a10ada7e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23409.7 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23409.17 @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.22 + 6.0.22 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 0.2.0 - 6.0.414-servicing.23409.9 - 6.0.414-servicing.23409.9 + 6.0.414-servicing.23415.27 + 6.0.414-servicing.23415.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23414.22 + 6.0.22-servicing.23414.22 + 6.0.22 + 6.0.22 + 6.0.22 + 6.0.22 2.1.0 - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23410.4 + 6.0.22-servicing.23410.4 + 6.0.22 + 6.0.22 From a54f92707fbea8a4ae52c3ed3263eb530248febf Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Tue, 15 Aug 2023 18:25:56 +0000 Subject: [PATCH 020/294] [internal/release/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0: from 6.0.21-servicing.23367.3 to 6.0.22-servicing.23410.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0: from 6.0.21-servicing.23367.3 to 6.0.22-servicing.23410.4 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.6.0: from 6.0.21-servicing.23363.11 to 6.0.22-servicing.23414.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 6.0.21-servicing.23364.38 to 6.0.22-servicing.23415.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ItemTemplates: from 6.0.316 to 6.0.317 (parent: Microsoft.NET.Sdk) - Microsoft.TemplateEngine.Cli: from 6.0.316-servicing.23363.10 to 6.0.317-servicing.23410.4 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Common.ProjectTemplates.6.0: from 6.0.316 to 6.0.317 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 6.0.21-servicing.23364.6 to 6.0.22-servicing.23409.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 6.0.21 to 6.0.22 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 6.0.21-servicing.23364.5 to 6.0.22-servicing.23409.17 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) --- NuGet.config | 26 ++++-------- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 44 ++++++++++---------- 3 files changed, 76 insertions(+), 86 deletions(-) diff --git a/NuGet.config b/NuGet.config index a6c9c345e..41960ca45 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,20 @@ - - - + + - - - + - - - + @@ -46,20 +41,15 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb5994d3b..7a429bf90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + 0a9fee4daf8b2cf93643927a4d598a933fd04851 @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + d64564a1514b5250cac0337fb0759c92cdaa23e6 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + 82d2a38fd04a1db368e48280fd60da635c8988c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 + b97627e7dfff543aec01fb1cafe5016a934b3c2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a3a5b0ba38cf8300582504ffc072c4b4582d4d1 + b97627e7dfff543aec01fb1cafe5016a934b3c2f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0e63a4c51e83395143e12eb3df9d1de0081905f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + ccb899fabb951da0ce4ada295ab2783170aacef8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dab8cd878..d3e52d9a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23409.7 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23409.17 - 6.0.316 + 6.0.317 @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.22 + 6.0.22 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.2 0.2.0 - 6.0.317-servicing.23409.16 - 6.0.317-servicing.23409.16 + 6.0.317-servicing.23415.28 + 6.0.317-servicing.23415.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23414.22 + 6.0.22-servicing.23414.22 + 6.0.22 + 6.0.22 + 6.0.22 + 6.0.22 2.1.0 - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23410.4 + 6.0.22-servicing.23410.4 + 6.0.22 + 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.316 + 6.0.317 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 9496edd76d185be0be2375b23c06a6d5bba008c6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 21:51:17 +0000 Subject: [PATCH 021/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.43 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.43 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98c2f6245..770aaf731 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,9 +14,10 @@ - + + @@ -43,9 +44,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62d6bee3a..b2e17d560 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c @@ -90,27 +90,27 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf + 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 80c31bae826a31d33443ddcce33ac3c1f2d6f7bf + 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 diff --git a/eng/Versions.props b/eng/Versions.props index a10ada7e5..0002da27c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.413 + 6.0.414 @@ -56,8 +56,8 @@ - 6.0.414-servicing.23415.27 - 6.0.414-servicing.23415.27 + 6.0.414-servicing.23415.43 + 6.0.414-servicing.23415.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23414.22 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.3 6.0.22 6.0.22 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.413 + 6.0.414 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 05e8f967633a5cb7292f4ca74e4798c076e0165d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 21:51:35 +0000 Subject: [PATCH 022/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.42 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.28 -> To Version 6.0.317-servicing.23415.42 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 41960ca45..98bb498d3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,10 +14,10 @@ - + - + @@ -44,9 +44,9 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a429bf90..84c0190a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 260db9b146db87a22317896a116fb51a32f290c6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0a9fee4daf8b2cf93643927a4d598a933fd04851 + 683c57982ac41cf4beead6fef7f03e86a111dd3c @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82d2a38fd04a1db368e48280fd60da635c8988c0 + ec605f4126da7a5d8bf87437887ebdbf2d523b14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b97627e7dfff543aec01fb1cafe5016a934b3c2f + 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b97627e7dfff543aec01fb1cafe5016a934b3c2f + 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 diff --git a/eng/Versions.props b/eng/Versions.props index d3e52d9a6..60aa1eeac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.317-servicing.23415.28 - 6.0.317-servicing.23415.28 + 6.0.317-servicing.23415.42 + 6.0.317-servicing.23415.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23414.22 - 6.0.22-servicing.23414.22 + 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.3 6.0.22 6.0.22 6.0.22 From 18862d431c696379569985e36be608b3b97f0b14 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 23:47:21 +0000 Subject: [PATCH 023/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.54 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23415.54 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 770aaf731..c537de642 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,13 +41,13 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b2e17d560..05893bc10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 69521b6e8f0f56c680f5b5d07bbc88d4520a96aa + c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 + a2b41011e7c7aeab6e671e50888686b4ded9b437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1d9b4b0dc0d0c47dd9f2959aad442d4d54cb0861 + a2b41011e7c7aeab6e671e50888686b4ded9b437 diff --git a/eng/Versions.props b/eng/Versions.props index 0002da27c..362ce3c9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 0.2.0 - 6.0.414-servicing.23415.43 - 6.0.414-servicing.23415.43 + 6.0.414-servicing.23415.54 + 6.0.414-servicing.23415.54 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4bc155f49ee15f38d88f8fbf85964c5c2681d0f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 15 Aug 2023 23:47:53 +0000 Subject: [PATCH 024/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230815.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.28 -> To Version 6.0.317-servicing.23415.55 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.22-servicing.23414.22 -> To Version 6.0.22-servicing.23415.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 12 ++++++------ 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/NuGet.config b/NuGet.config index 98bb498d3..4138eba4e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -17,7 +17,7 @@ - + @@ -41,12 +41,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84c0190a1..21c833ce4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d64564a1514b5250cac0337fb0759c92cdaa23e6 + 9f97a50097da4f5e8aac121013558288880cd35b https://github.com/dotnet/test-templates @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ec605f4126da7a5d8bf87437887ebdbf2d523b14 + edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 + d46d5b9980f0635c0b5a532bc674aa79626ca6a3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2d2e78bf4ab78e3853609d953c2d9c7a302204d0 + d46d5b9980f0635c0b5a532bc674aa79626ca6a3 diff --git a/eng/Versions.props b/eng/Versions.props index 60aa1eeac..5bc002f36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 - 6.0.22-servicing.23415.2 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.12 0.2.0 - 6.0.317-servicing.23415.42 - 6.0.317-servicing.23415.42 + 6.0.317-servicing.23415.55 + 6.0.317-servicing.23415.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 59f938949d658dce176aa88d81c2482539ea43c3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 18:51:57 +0000 Subject: [PATCH 025/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++---- eng/Version.Details.xml | 64 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++-------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index c537de642..61be111e9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + @@ -41,16 +41,16 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05893bc10..e3e33729b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + d13a7c399c119654dfc02eac26c4b31ab16a5cfe - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c01790a7867594b5690846097ee6132e8ab43730 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a2b41011e7c7aeab6e671e50888686b4ded9b437 + 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a2b41011e7c7aeab6e671e50888686b4ded9b437 + 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 8e49f7f69149415593f0da365cae4ffdecb07c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ccb899fabb951da0ce4ada295ab2783170aacef8 + 7b82fc319b73beb7dd40ff77bd4c9403711b35a7 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 362ce3c9b..54b7f57fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23409.7 + 6.0.22-servicing.23415.9 - 6.0.22-servicing.23409.17 + 6.0.22-servicing.23415.8 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 0.2.0 - 6.0.414-servicing.23415.54 - 6.0.414-servicing.23415.54 + 6.0.414-servicing.23416.21 + 6.0.414-servicing.23416.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.3 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23410.4 - 6.0.22-servicing.23410.4 + 6.0.22-servicing.23415.6 + 6.0.22-servicing.23415.6 6.0.22 6.0.22 From 72d2deba7eb1a864c64096b531804b3a5bb242cc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:27:38 +0000 Subject: [PATCH 026/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.39 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 61be111e9..434639dcd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,7 +17,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3e33729b..1da055bfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c01790a7867594b5690846097ee6132e8ab43730 + acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 + 18cfeb734a1799183382e0c264d748cd71c9cdc5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9eb5f6c42ff0c1c7a9dd98484521ec68a5080bc6 + 18cfeb734a1799183382e0c264d748cd71c9cdc5 diff --git a/eng/Versions.props b/eng/Versions.props index 54b7f57fb..6c627b3e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.414-servicing.23416.21 - 6.0.414-servicing.23416.21 + 6.0.414-servicing.23416.39 + 6.0.414-servicing.23416.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c6505a010cfe757ffb4b6cb8d2791e6ca5b0ea1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:30:42 +0000 Subject: [PATCH 027/294] 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 11c362656ae233aa0578f80c2f6b5e00f86b89fa Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 21:34:26 +0000 Subject: [PATCH 028/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.401 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.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 | 11 +++- eng/Version.Details.xml | 132 ++++++++++++++++++++-------------------- eng/Versions.props | 52 ++++++++-------- 3 files changed, 102 insertions(+), 93 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1a2c374a..7d2f52492 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,22 @@ - + + + + + + @@ -39,11 +44,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78c20b8d7..9676ee21a 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,82 +98,82 @@ 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + af21b65a2035aa14b087fde062f18d954c285306 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + af21b65a2035aa14b087fde062f18d954c285306 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + af21b65a2035aa14b087fde062f18d954c285306 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + af21b65a2035aa14b087fde062f18d954c285306 - + 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 - 159a701477f5ca1e2d960e9bf79ce05769b3c671 + 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/dotnet/fsharp - 159a701477f5ca1e2d960e9bf79ce05769b3c671 + 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/microsoft/vstest - bc17bb9693cfc4778ded51aa0ab7f1065433f989 + 76fea143ffe5e3883dcd04e0923b4b8e1e158145 - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker - + https://github.com/dotnet/roslyn - dad7898acd6372d4380612b9f225db0c2cbfa1e9 + 09841218a495cafad75ba163350d1e8949d8e5d6 - + https://github.com/dotnet/msbuild - 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 + 8ec440e684ef7834461f652276d5e8a88a132532 - + https://github.com/dotnet/msbuild - 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 + 8ec440e684ef7834461f652276d5e8a88a132532 - + https://github.com/nuget/nuget.client - 13f2b6af6e9864711e815cfbffd7aa5015c52cec + b46f5f64159a81d930ac8cdfde96e76f90796c62 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 db56480f0..4f24b0bfe 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,29 +56,29 @@ - 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.400 - 7.0.400-rtm.23369.15 - 7.0.400-rtm.23369.15 + 7.0.401 + 7.0.401-servicing.23416.26 + 7.0.401-servicing.23416.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23366.1 + 4.7.0-3.23403.2 @@ -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 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview-23364-03 + 17.7.1-release-23414-02 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 44c6374ceef623446e16cddad997a071b18a2eb0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 22:28:31 +0000 Subject: [PATCH 029/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.49 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23409.9 -> To Version 6.0.414-servicing.23416.49 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 434639dcd..3a4103200 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,7 +20,7 @@ - + @@ -50,7 +50,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1da055bfe..1c26110b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d13a7c399c119654dfc02eac26c4b31ab16a5cfe + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating acea295c10b625d213c7e8abeab109e73c9d3cac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18cfeb734a1799183382e0c264d748cd71c9cdc5 + d055edde5a61e6d7bad86a41ada7a7b2779f5891 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 18cfeb734a1799183382e0c264d748cd71c9cdc5 + d055edde5a61e6d7bad86a41ada7a7b2779f5891 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8e49f7f69149415593f0da365cae4ffdecb07c22 + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7b82fc319b73beb7dd40ff77bd4c9403711b35a7 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6c627b3e6..27b45b91b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23415.9 + 6.0.22-servicing.23416.4 - 6.0.22-servicing.23415.8 + 6.0.22-servicing.23416.8 @@ -56,8 +56,8 @@ - 6.0.414-servicing.23416.39 - 6.0.414-servicing.23416.39 + 6.0.414-servicing.23416.49 + 6.0.414-servicing.23416.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,8 +78,8 @@ - 6.0.22-servicing.23415.6 - 6.0.22-servicing.23415.6 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 6.0.22 6.0.22 From 7e71db02945cb85e974dcf9b2eb25e9929438883 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:14:47 +0000 Subject: [PATCH 030/294] 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 a65848192ac982b6264793f367ffd2b8f80181c1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:15:18 +0000 Subject: [PATCH 031/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.401 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.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 7d2f52492..f4bfbd21a 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 9676ee21a..f8b419e16 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 - af21b65a2035aa14b087fde062f18d954c285306 + 59bf9deb5e895fccfaba1a93d7bc6c8c78455990 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af21b65a2035aa14b087fde062f18d954c285306 + 59bf9deb5e895fccfaba1a93d7bc6c8c78455990 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af21b65a2035aa14b087fde062f18d954c285306 + 59bf9deb5e895fccfaba1a93d7bc6c8c78455990 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af21b65a2035aa14b087fde062f18d954c285306 + 59bf9deb5e895fccfaba1a93d7bc6c8c78455990 - + 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 4f24b0bfe..7de93e13d 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.401 - 7.0.401-servicing.23416.26 - 7.0.401-servicing.23416.26 + 7.0.401-servicing.23416.56 + 7.0.401-servicing.23416.56 $(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 2cfcee6fcad216c8fbd654858b776c51dbbf07bb Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:23:22 +0000 Subject: [PATCH 032/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23415.55 -> To Version 6.0.317-servicing.23416.48 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4138eba4e..45ce906ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21c833ce4..4cbf0f69c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 260db9b146db87a22317896a116fb51a32f290c6 + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 683c57982ac41cf4beead6fef7f03e86a111dd3c + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9f97a50097da4f5e8aac121013558288880cd35b + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - edc936dcf28fdc28a220c4fa733e1bf1c1ea2f49 + c132c1c5651cb4b2e83a539e2de599d549f24f52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d46d5b9980f0635c0b5a532bc674aa79626ca6a3 + 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d46d5b9980f0635c0b5a532bc674aa79626ca6a3 + 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0e63a4c51e83395143e12eb3df9d1de0081905f8 + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ccb899fabb951da0ce4ada295ab2783170aacef8 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5bc002f36..4f00b6c2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23409.7 + 6.0.22-servicing.23416.4 - 6.0.22-servicing.23409.17 + 6.0.22-servicing.23416.8 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 - 6.0.22-servicing.23415.12 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 0.2.0 - 6.0.317-servicing.23415.55 - 6.0.317-servicing.23415.55 + 6.0.317-servicing.23416.48 + 6.0.317-servicing.23416.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.3 - 6.0.22-servicing.23415.3 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23410.4 - 6.0.22-servicing.23410.4 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 6.0.22 6.0.22 From ac49a5f38a5afb454a7f09203e7022e3a573437c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:25:43 +0000 Subject: [PATCH 033/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230816.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.122-servicing.23416.47 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 30 ++++--------- eng/Version.Details.xml | 96 ++++++++++++++++++++--------------------- eng/Versions.props | 46 ++++++++++---------- 3 files changed, 80 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index a5401b038..362628a5b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,21 @@ - - - + - - - + + - - - + - - - + @@ -49,22 +42,17 @@ - - - + + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5581ce16f..1d976fb5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + 22cc81b45d1c04f1bf12a6acda58e341704a2858 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + 4a4636ef3830ce86442952f41f84e4e2a4578c22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 0db2312765488a8a77ba6cef692fa53c636a47e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 6e6b474ef5222e55160a289e666bc156f4718f66 https://github.com/dotnet/fsharp @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + f9eee071e6e1ff0d19d2c98306221b63ae1d05a0 https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 98528e76f..f39d309eb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.22-servicing.23416.4 - 6.0.21-servicing.23364.5 + 6.0.22-servicing.23416.8 - 6.0.121 + 6.0.122 @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.22 + 6.0.22 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 + 6.0.22-servicing.23415.23 0.2.0 - 6.0.121-servicing.23367.13 - 6.0.121-servicing.23367.13 + 6.0.122-servicing.23416.47 + 6.0.122-servicing.23416.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,20 +68,20 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23415.11 + 6.0.22-servicing.23415.11 + 6.0.22 + 6.0.22 + 6.0.22 + 6.0.22 2.1.0 - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.22-servicing.23416.7 + 6.0.22-servicing.23416.7 + 6.0.22 + 6.0.22 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.121 + 6.0.122 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.21 + 6.0.22 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 1d2de9a0d7509be3068c77af3253279f49bdbd9d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 16 Aug 2023 23:27:45 +0000 Subject: [PATCH 034/294] 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 a47236db64a3e8057fc12b973fe3e2e3a93ebed4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Aug 2023 16:32:40 +0000 Subject: [PATCH 035/294] Update dependencies from https://github.com/dotnet/test-templates build 20230817.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23415.2 -> To Version 1.1.0-rc.23417.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 78c20b8d7..92fdf2ceb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 + c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://github.com/dotnet/test-templates - 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 + c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://github.com/dotnet/test-templates - 56167d00449a4f6dbdc880f7abe7d3097b9b6df8 + c2c77959527a597caf3d0351ea0d25c085fbb32c diff --git a/eng/Versions.props b/eng/Versions.props index db56480f0..87f154ec0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23415.2 - 1.1.0-rc.23415.2 - 1.1.0-rc.23415.2 + 1.1.0-rc.23417.1 + 1.1.0-rc.23417.1 + 1.1.0-rc.23417.1 From b16d5462c8ce4b2fe757a12250635ce1baf5d82d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Aug 2023 17:58:46 +0000 Subject: [PATCH 036/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230817.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.401 -> To Version 7.0.401 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.7.0-3.23403.2 -> To Version 4.7.0-3.23416.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index f4bfbd21a..b9a7f749e 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 f8b419e16..1e32c4f4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59bf9deb5e895fccfaba1a93d7bc6c8c78455990 + 60f1abd4baa37783b84cdd9f9045cc07bd8d3425 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59bf9deb5e895fccfaba1a93d7bc6c8c78455990 + 60f1abd4baa37783b84cdd9f9045cc07bd8d3425 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59bf9deb5e895fccfaba1a93d7bc6c8c78455990 + 60f1abd4baa37783b84cdd9f9045cc07bd8d3425 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 59bf9deb5e895fccfaba1a93d7bc6c8c78455990 + 60f1abd4baa37783b84cdd9f9045cc07bd8d3425 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 09841218a495cafad75ba163350d1e8949d8e5d6 + 43b0b05cc4f492fd5de00f6f6717409091df8daa diff --git a/eng/Versions.props b/eng/Versions.props index 7de93e13d..48e6aac45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,15 +70,15 @@ 7.0.401 - 7.0.401-servicing.23416.56 - 7.0.401-servicing.23416.56 + 7.0.401-servicing.23417.13 + 7.0.401-servicing.23417.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23403.2 + 4.7.0-3.23416.9 From 0e0a2063a030f688cb35de079ff316dee98d2b7d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 17 Aug 2023 18:59:45 +0000 Subject: [PATCH 037/294] Merged PR 33234: Update 6.0 source-build SDK diff baseline --- .../assets/baselines/MissingXmlDoc.txt | 1 - .../assets/baselines/MsftToSbSdk.diff | 22 +++---------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml 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 4e98d267b..71ae3f0b9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,20 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -42,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ @@ -348,13 +331,13 @@ index ------------ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/ ./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.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.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 @@ -431,9 +414,10 @@ index ------------ +./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll -./sdk/x.y.z/System.Drawing.Common.dll ++./sdk/x.y.z/System.Formats.Asn1.dll ./sdk/x.y.z/System.Resources.Extensions.dll --./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/System.Security.Cryptography.Xml.dll -./sdk/x.y.z/System.Security.Permissions.dll From cc1db914339b4012194a7de08ab967d094e6f19b Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 17 Aug 2023 18:59:59 +0000 Subject: [PATCH 038/294] 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 72d5ba401915f2a90c28e54cf09283d7a5815e8c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 17 Aug 2023 13:14:13 -0700 Subject: [PATCH 039/294] 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 7cbb79538..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 359b356988e6d67aa830aea6adbaacaa26cde2e9 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 17 Aug 2023 13:16:03 -0700 Subject: [PATCH 040/294] 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 041/294] 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 042/294] 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 716ba6e95961ca5b61210efcb2f31c41946a197e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 18:08:47 +0000 Subject: [PATCH 043/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.401 -> To Version 7.0.401 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,Microsoft.NET.Test.Sdk,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 | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index b9a7f749e..1d5ecbba8 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 5648b03f6..487f639d9 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 - 60f1abd4baa37783b84cdd9f9045cc07bd8d3425 + 7af9108fcc7916b16b375d6d00e6f245861fec20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 60f1abd4baa37783b84cdd9f9045cc07bd8d3425 + 7af9108fcc7916b16b375d6d00e6f245861fec20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 60f1abd4baa37783b84cdd9f9045cc07bd8d3425 + 7af9108fcc7916b16b375d6d00e6f245861fec20 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 60f1abd4baa37783b84cdd9f9045cc07bd8d3425 + 7af9108fcc7916b16b375d6d00e6f245861fec20 @@ -133,7 +133,7 @@ 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/microsoft/vstest 76fea143ffe5e3883dcd04e0923b4b8e1e158145 diff --git a/eng/Versions.props b/eng/Versions.props index b4b437fda..9de44ad31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.401 - 7.0.401-servicing.23417.13 - 7.0.401-servicing.23417.13 + 7.0.401-servicing.23422.8 + 7.0.401-servicing.23422.8 $(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 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.1-release-23414-02 + 17.7.1-release-23418-01 From da8de81b20802be3fd79d6db6acc08fa0d0a240c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 19:04:45 +0000 Subject: [PATCH 044/294] 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 045/294] 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 b87c27e0a53b8e30b778973698480055611cbd79 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 22:21:40 +0000 Subject: [PATCH 046/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230822.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.401 -> To Version 7.0.401 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 1d5ecbba8..c1faa3718 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 487f639d9..f7e0e3736 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 - 7af9108fcc7916b16b375d6d00e6f245861fec20 + 48ed42cff3714736b922e6507c24ec006401f6e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7af9108fcc7916b16b375d6d00e6f245861fec20 + 48ed42cff3714736b922e6507c24ec006401f6e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7af9108fcc7916b16b375d6d00e6f245861fec20 + 48ed42cff3714736b922e6507c24ec006401f6e8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7af9108fcc7916b16b375d6d00e6f245861fec20 + 48ed42cff3714736b922e6507c24ec006401f6e8 - + 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 9de44ad31..bc9138fa3 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.401 - 7.0.401-servicing.23422.8 - 7.0.401-servicing.23422.8 + 7.0.401-servicing.23422.26 + 7.0.401-servicing.23422.26 $(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 141c0a7453627adbc1f72e38071e4444d811ff35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Aug 2023 22:24:02 +0000 Subject: [PATCH 047/294] 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 9ef79ca49edb0fc3db1748e1fc69bb7b536af9da Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 15:51:22 +0000 Subject: [PATCH 048/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.21 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.122-servicing.23416.47 -> To Version 6.0.122-servicing.23425.21 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.22 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++++----- eng/Version.Details.xml | 74 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 58 insertions(+), 58 deletions(-) diff --git a/NuGet.config b/NuGet.config index 362628a5b..115bd3427 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,21 +7,21 @@ - + - + - + - + - + @@ -42,17 +42,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d976fb5b..61a6f0917 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a4636ef3830ce86442952f41f84e4e2a4578c22 + 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a4636ef3830ce86442952f41f84e4e2a4578c22 + 8d6c86fd918b96350521dc48dc996b6231616f0f https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 4a4636ef3830ce86442952f41f84e4e2a4578c22 + 8d6c86fd918b96350521dc48dc996b6231616f0f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 + 851641e40c1191f339933987d6c1aac3837ce7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7c13ea1f7860cc61a744327e65c18b7b8e25e9f1 + 851641e40c1191f339933987d6c1aac3837ce7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6e6b474ef5222e55160a289e666bc156f4718f66 + f501934867fd4723518c1c7b03c6033c2e52ecad https://github.com/dotnet/fsharp @@ -168,7 +168,7 @@ https://github.com/dotnet/emsdk - f9eee071e6e1ff0d19d2c98306221b63ae1d05a0 + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index f39d309eb..4d23cd2d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23416.4 + 6.0.22-servicing.23424.7 - 6.0.22-servicing.23416.8 + 6.0.22-servicing.23425.2 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 0.2.0 - 6.0.122-servicing.23416.47 - 6.0.122-servicing.23416.47 + 6.0.122-servicing.23425.21 + 6.0.122-servicing.23425.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23416.7 - 6.0.22-servicing.23416.7 + 6.0.22-servicing.23425.2 + 6.0.22-servicing.23425.2 6.0.22 6.0.22 From 084700ab5c8cbe7e2a66cb328f14979e55bd1ac3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 15:53:19 +0000 Subject: [PATCH 049/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.24 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.317-servicing.23416.48 -> To Version 6.0.317-servicing.23425.24 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 45ce906ad..e250238a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cbf0f69c..1f5ca2132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c132c1c5651cb4b2e83a539e2de599d549f24f52 + 1f521522b17430e3760fd09760e77822b0bd891b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c + da716438f260441518b4f7d9962ced9814769669 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09ea5708c6f6e29fe6db2e24a45665cdaca90e9c + da716438f260441518b4f7d9962ced9814769669 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6e6b474ef5222e55160a289e666bc156f4718f66 + f501934867fd4723518c1c7b03c6033c2e52ecad https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4f00b6c2c..107032483 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23416.4 + 6.0.22-servicing.23424.7 - 6.0.22-servicing.23416.8 + 6.0.22-servicing.23425.2 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 0.2.0 - 6.0.317-servicing.23416.48 - 6.0.317-servicing.23416.48 + 6.0.317-servicing.23425.24 + 6.0.317-servicing.23425.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23416.7 - 6.0.22-servicing.23416.7 + 6.0.22-servicing.23425.2 + 6.0.22-servicing.23425.2 6.0.22 6.0.22 From ad11d7f236395263aea24ee76c1adc7a23ecb5d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 16:01:57 +0000 Subject: [PATCH 050/294] 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 051/294] 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 1ba1c51066ed49a976aaa961ed793965999c7b3e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 16:05:59 +0000 Subject: [PATCH 052/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.401 -> To Version 7.0.401 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 c1faa3718..c505c605e 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 f7e0e3736..356f74124 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 - 48ed42cff3714736b922e6507c24ec006401f6e8 + d43a006e078c2dd9419b0ac51987ea464b86de4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48ed42cff3714736b922e6507c24ec006401f6e8 + d43a006e078c2dd9419b0ac51987ea464b86de4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48ed42cff3714736b922e6507c24ec006401f6e8 + d43a006e078c2dd9419b0ac51987ea464b86de4d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48ed42cff3714736b922e6507c24ec006401f6e8 + d43a006e078c2dd9419b0ac51987ea464b86de4d @@ -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 bc9138fa3..6ee8ad215 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.401 - 7.0.401-servicing.23422.26 - 7.0.401-servicing.23422.26 + 7.0.401-servicing.23425.23 + 7.0.401-servicing.23425.23 $(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 39579bbae4a397a8beca6a4305c764062d42e47e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 17:54:59 +0000 Subject: [PATCH 053/294] 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 7806d7511ad97589e42ad415e1d740131fc451a1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 18:40:03 +0000 Subject: [PATCH 054/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.32 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.414-servicing.23416.49 -> To Version 6.0.414-servicing.23425.32 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.22 -> To Version 6.0.22 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++----- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 24 +++++++------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3a4103200..19715c85a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c26110b6..2dbb1a3e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 22cc81b45d1c04f1bf12a6acda58e341704a2858 + 017f84465cd8eb56c666ad1e6872d4fc23cec288 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ad40cc35b59e63e9e5dae830d8cd10ddcd41eddf + 4bb6dc195c0a3bc4c7e24ff54a8925b98db4fecd @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - f9a977fa26e4ba036bc74a60797b1de3a6e3ed07 + 564969bca155b40432d101ec35f24a0e81e6afa0 https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - acea295c10b625d213c7e8abeab109e73c9d3cac + ce2a08ace580a06ac3ea0291222f5e550c9f32b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d055edde5a61e6d7bad86a41ada7a7b2779f5891 + e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d055edde5a61e6d7bad86a41ada7a7b2779f5891 + e15f4d6367b5030f0ae7f604e8f50bdc63c534a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0db2312765488a8a77ba6cef692fa53c636a47e9 + 53190af510e57c1c146bd8a23725509771a42ae0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6e6b474ef5222e55160a289e666bc156f4718f66 + f501934867fd4723518c1c7b03c6033c2e52ecad https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 27b45b91b..4ff72a28c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.22-servicing.23416.4 + 6.0.22-servicing.23424.7 - 6.0.22-servicing.23416.8 + 6.0.22-servicing.23425.2 @@ -46,18 +46,18 @@ 6.0.22 6.0.22 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 - 6.0.22-servicing.23415.23 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 + 6.0.22-servicing.23424.15 0.2.0 - 6.0.414-servicing.23416.49 - 6.0.414-servicing.23416.49 + 6.0.414-servicing.23425.32 + 6.0.414-servicing.23425.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.22-servicing.23415.11 - 6.0.22-servicing.23415.11 + 6.0.22-servicing.23424.25 + 6.0.22-servicing.23424.25 6.0.22 6.0.22 6.0.22 @@ -78,8 +78,8 @@ - 6.0.22-servicing.23416.7 - 6.0.22-servicing.23416.7 + 6.0.22-servicing.23425.2 + 6.0.22-servicing.23425.2 6.0.22 6.0.22 From 88a87203d8ff51ebee298f93873a250f55f3ac20 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 18:51:42 +0000 Subject: [PATCH 055/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.401 -> To Version 7.0.401 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 c505c605e..77973b4e3 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 356f74124..b8ad177b5 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 - d43a006e078c2dd9419b0ac51987ea464b86de4d + 17024f4849233342c260cf319e1035084906a721 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d43a006e078c2dd9419b0ac51987ea464b86de4d + 17024f4849233342c260cf319e1035084906a721 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d43a006e078c2dd9419b0ac51987ea464b86de4d + 17024f4849233342c260cf319e1035084906a721 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d43a006e078c2dd9419b0ac51987ea464b86de4d + 17024f4849233342c260cf319e1035084906a721 diff --git a/eng/Versions.props b/eng/Versions.props index 6ee8ad215..1d0fa76c9 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.401 - 7.0.401-servicing.23425.23 - 7.0.401-servicing.23425.23 + 7.0.401-servicing.23425.33 + 7.0.401-servicing.23425.33 $(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 056/294] 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 057/294] 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 058/294] 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 21aaff41f12b0d0307d45961c8152b11044cc5d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 25 Aug 2023 21:44:52 +0000 Subject: [PATCH 059/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230825.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.401 -> To Version 7.0.401 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 77973b4e3..fc6bffb0f 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 b8ad177b5..b336bf629 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 - 17024f4849233342c260cf319e1035084906a721 + 2838d93742658300698b2194882d57fd978fb168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17024f4849233342c260cf319e1035084906a721 + 2838d93742658300698b2194882d57fd978fb168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17024f4849233342c260cf319e1035084906a721 + 2838d93742658300698b2194882d57fd978fb168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17024f4849233342c260cf319e1035084906a721 + 2838d93742658300698b2194882d57fd978fb168 - + 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 1d0fa76c9..203e57cc6 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.401 - 7.0.401-servicing.23425.33 - 7.0.401-servicing.23425.33 + 7.0.401-servicing.23425.43 + 7.0.401-servicing.23425.43 $(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 060/294] 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 ed38683fa0fea5111f5adb1a221ca99caeeb36ae Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 29 Aug 2023 04:34:15 +0000 Subject: [PATCH 061/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230828.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.401 -> To Version 7.0.401 --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 25 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc6bffb0f..ed9273260 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,26 @@ + + + + + + - + + + @@ -44,14 +52,20 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b336bf629..3053ca721 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2838d93742658300698b2194882d57fd978fb168 + 5e4a3b029243c5cac0139ceff151422971ded738 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2838d93742658300698b2194882d57fd978fb168 + 5e4a3b029243c5cac0139ceff151422971ded738 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2838d93742658300698b2194882d57fd978fb168 + 5e4a3b029243c5cac0139ceff151422971ded738 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2838d93742658300698b2194882d57fd978fb168 + 5e4a3b029243c5cac0139ceff151422971ded738 diff --git a/eng/Versions.props b/eng/Versions.props index 203e57cc6..69bd5d32a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.401 - 7.0.401-servicing.23425.43 - 7.0.401-servicing.23425.43 + 7.0.401-servicing.23428.8 + 7.0.401-servicing.23428.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c8aec3e808e27bafe27cca880fda564ab72938b5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:49 -0700 Subject: [PATCH 062/294] Update branding to 6.0.123 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 98528e76f..3535ea913 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 22 + 23 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 47d41a3d1a0b6e4fe7c5573749a3d7738c1f537c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:54 -0700 Subject: [PATCH 063/294] Update branding to 6.0.318 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index acfa240d8..e74a2d23f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 17 + 18 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From c0954c6acae2cc7ef58ad877382e593deaf1659f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:26:58 -0700 Subject: [PATCH 064/294] Update branding to 6.0.415 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 10e567eb8..583c355f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 529188e483f3634a687c4df353364a812c245e2b Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:27:03 -0700 Subject: [PATCH 065/294] 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 066/294] 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 49b3873822b318832a8a5f1102c6bb1e72f9c63e Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 31 Aug 2023 11:27:12 -0700 Subject: [PATCH 067/294] Update branding to 7.0.402 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 87f154ec0..8ed38a112 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 01 + 02 $(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 068/294] .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", From b5fbd1b9bf0f76bacd299241af8e5f72014d874d Mon Sep 17 00:00:00 2001 From: Antoine Martin Date: Wed, 13 Sep 2023 11:57:52 -0400 Subject: [PATCH 069/294] [release/6.0.1xx] Fix aspnetcore build on musl-libc platforms (#17324) --- .../tarball/content/Directory.Build.props | 5 +---- .../tarball/content/repos/aspnetcore.proj | 1 + src/SourceBuild/tarball/content/repos/installer.proj | 2 +- .../tarball/content/tools-local/init-build.proj | 12 ++++++++++++ src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateLayout.targets | 3 +++ 6 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/SourceBuild/tarball/content/Directory.Build.props b/src/SourceBuild/tarball/content/Directory.Build.props index 797e54fa6..c4902c251 100644 --- a/src/SourceBuild/tarball/content/Directory.Build.props +++ b/src/SourceBuild/tarball/content/Directory.Build.props @@ -181,6 +181,7 @@ freebsd-$(Platform) osx-$(Platform) linux-$(Platform) + linux-musl-$(Platform) win-$(Platform) $(PortableRid) @@ -230,12 +231,8 @@ - - - - diff --git a/src/SourceBuild/tarball/content/repos/aspnetcore.proj b/src/SourceBuild/tarball/content/repos/aspnetcore.proj index 480f3c713..4a589ea41 100644 --- a/src/SourceBuild/tarball/content/repos/aspnetcore.proj +++ b/src/SourceBuild/tarball/content/repos/aspnetcore.proj @@ -7,6 +7,7 @@ $(BuildCommandArgs) --arch $(Platform) $(BuildCommandArgs) --no-build-repo-tasks + $(BuildCommandArgs) --os-name linux-musl $(BuildCommandArgs) /p:BuildNodeJs=false $(BuildCommandArgs) /p:PublishCompressedFilesPathPrefix=$(SourceBuiltAspNetCoreRuntime) $(BuildCommandArgs) /p:CoreSetupRid=freebsd-x64 /p:PortableBuild=true $(BuildCommandArgs) /p:CoreSetupRid=osx-x64 diff --git a/src/SourceBuild/tarball/content/tools-local/init-build.proj b/src/SourceBuild/tarball/content/tools-local/init-build.proj index b2c3beed1..81f5e5b6a 100644 --- a/src/SourceBuild/tarball/content/tools-local/init-build.proj +++ b/src/SourceBuild/tarball/content/tools-local/init-build.proj @@ -9,6 +9,7 @@ + @@ -22,6 +23,7 @@ + + + + + + diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 8949af132..a59ed388f 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -6,7 +6,7 @@ microsoft.netcore.app.runtime.$(SharedFrameworkRid) - microsoft.netcore.app.crossgen2.$(HostOSName)-$(BuildArchitecture) + microsoft.netcore.app.crossgen2.$(Crossgen2Rid) $(NuGetPackageRoot)/$(RuntimeNETCrossgenPackageName)/$(MicrosoftNETCoreAppRuntimePackageVersion)/tools/crossgen2$(ExeExtension) diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets index 88a053b61..ce5e09b69 100644 --- a/src/redist/targets/GenerateLayout.targets +++ b/src/redist/targets/GenerateLayout.targets @@ -84,6 +84,9 @@ dotnet-runtime$(PgoTerm)-$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) windowsdesktop-runtime-$(MicrosoftWindowsDesktopAppRuntimePackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension) + $(HostOSName)-$(BuildArchitecture) + $(SharedFrameworkRid) + $(SharedFrameworkRid) linux-x64 $(AspNetCoreInstallerRid) From c97f99c992d3e2fcbf7679b9c28f6caf70449314 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 21:30:49 +0000 Subject: [PATCH 070/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.112 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.11 -> To Version 7.0.12 (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 ea2adade5..dc36b2347 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,22 @@ - + - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9253d3890..40de2dd91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + b056b7af6535c39c5464aff05d6202d807de8af2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + b056b7af6535c39c5464aff05d6202d807de8af2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + b056b7af6535c39c5464aff05d6202d807de8af2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + b056b7af6535c39c5464aff05d6202d807de8af2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + b056b7af6535c39c5464aff05d6202d807de8af2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + b056b7af6535c39c5464aff05d6202d807de8af2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + b056b7af6535c39c5464aff05d6202d807de8af2 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d0b45a002cc72d1932d7c1a6a87482bac3518c5d + ce1fb285fe831252ceda5d2c6a810c2f37494ca8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d0b45a002cc72d1932d7c1a6a87482bac3518c5d + ce1fb285fe831252ceda5d2c6a810c2f37494ca8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d0b45a002cc72d1932d7c1a6a87482bac3518c5d + ce1fb285fe831252ceda5d2c6a810c2f37494ca8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d0b45a002cc72d1932d7c1a6a87482bac3518c5d + ce1fb285fe831252ceda5d2c6a810c2f37494ca8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 66db733312de7bd21ed3e73cee0b27fb75d91b70 + eabb0b168f69e1afd828a0f38144405b311e310b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 + d2fc4e13cada6591f520f2245bf53a3aadb85357 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 9506882149df72322dba902cd42778ae4c4a6fbf - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 9506882149df72322dba902cd42778ae4c4a6fbf https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 12b8f2cd7..b059713c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23425.2 + 7.0.12-servicing.23463.13 - 7.0.11-servicing.23425.6 + 7.0.12-servicing.23463.6 @@ -56,22 +56,22 @@ - 7.0.11 - 7.0.11 - 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 + 7.0.12 + 7.0.12 + 7.0.12-servicing.23456.20 + 7.0.12-servicing.23456.20 + 7.0.12-servicing.23456.20 + 7.0.12-servicing.23456.20 + 7.0.12-servicing.23456.20 0.2.0 - 7.0.111 - 7.0.111-servicing.23425.44 - 7.0.111-servicing.23425.44 + 7.0.112 + 7.0.112-servicing.23464.31 + 7.0.112-servicing.23464.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.11-servicing.23424.27 - 7.0.11-servicing.23424.27 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 + 7.0.12-servicing.23463.5 + 7.0.12-servicing.23463.5 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 - 7.0.11-servicing.23425.5 - 7.0.11-servicing.23425.5 - 7.0.11 - 7.0.11 + 7.0.12-servicing.23463.5 + 7.0.12-servicing.23463.5 + 7.0.12 + 7.0.12 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.11 - 7.0.11 + 7.0.12 + 7.0.12 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From bc04f9d81ada0ba8708fbd288c1484af1af43fb5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 23:52:09 +0000 Subject: [PATCH 071/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.111 -> To Version 7.0.112 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.11 -> To Version 7.0.12 (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 dc36b2347..1a71f65ad 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 40de2dd91..ae53a1394 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b056b7af6535c39c5464aff05d6202d807de8af2 + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b056b7af6535c39c5464aff05d6202d807de8af2 + 3245d136715de117ace2bbb765dbe9978bb5574d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b056b7af6535c39c5464aff05d6202d807de8af2 + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b056b7af6535c39c5464aff05d6202d807de8af2 + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b056b7af6535c39c5464aff05d6202d807de8af2 + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b056b7af6535c39c5464aff05d6202d807de8af2 + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b056b7af6535c39c5464aff05d6202d807de8af2 + 3245d136715de117ace2bbb765dbe9978bb5574d https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ce1fb285fe831252ceda5d2c6a810c2f37494ca8 + 75054fce0d7d3292c7600e4fbcec32724ea93693 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ce1fb285fe831252ceda5d2c6a810c2f37494ca8 + 75054fce0d7d3292c7600e4fbcec32724ea93693 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ce1fb285fe831252ceda5d2c6a810c2f37494ca8 + 75054fce0d7d3292c7600e4fbcec32724ea93693 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ce1fb285fe831252ceda5d2c6a810c2f37494ca8 + 75054fce0d7d3292c7600e4fbcec32724ea93693 diff --git a/eng/Versions.props b/eng/Versions.props index b059713c2..d88e08ae3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23456.20 - 7.0.12-servicing.23456.20 - 7.0.12-servicing.23456.20 - 7.0.12-servicing.23456.20 - 7.0.12-servicing.23456.20 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 0.2.0 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23464.31 - 7.0.112-servicing.23464.31 + 7.0.112-servicing.23464.36 + 7.0.112-servicing.23464.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 92a1ea292ea6d1f6a74cbd3116de14d7d92a2b25 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 23:53:12 +0000 Subject: [PATCH 072/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.401 -> To Version 7.0.402 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.11 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 34 ++++------- eng/Version.Details.xml | 122 ++++++++++++++++++++-------------------- eng/Versions.props | 52 ++++++++--------- 3 files changed, 97 insertions(+), 111 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed9273260..e565c4301 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,30 +7,22 @@ - + - - - + - - - + - - - + - + - - - + @@ -52,21 +44,15 @@ - - - + - - - + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3053ca721..35cc044f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d https://github.com/dotnet/test-templates @@ -98,44 +98,44 @@ c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e4a3b029243c5cac0139ceff151422971ded738 + e13ff2a2d4beca22594a0ac884f4ae8763e3edf9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e4a3b029243c5cac0139ceff151422971ded738 + e13ff2a2d4beca22594a0ac884f4ae8763e3edf9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e4a3b029243c5cac0139ceff151422971ded738 + e13ff2a2d4beca22594a0ac884f4ae8763e3edf9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5e4a3b029243c5cac0139ceff151422971ded738 + e13ff2a2d4beca22594a0ac884f4ae8763e3edf9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 66db733312de7bd21ed3e73cee0b27fb75d91b70 + eabb0b168f69e1afd828a0f38144405b311e310b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 + d2fc4e13cada6591f520f2245bf53a3aadb85357 - + https://github.com/dotnet/fsharp - 30bbce677c36d8b190c5400dd909ee45bef8ed48 + 0e471797f52dc75f7052d84e8d5e142339a05d89 - + https://github.com/dotnet/fsharp - 30bbce677c36d8b190c5400dd909ee45bef8ed48 + 0e471797f52dc75f7052d84e8d5e142339a05d89 - + https://github.com/microsoft/vstest - 76fea143ffe5e3883dcd04e0923b4b8e1e158145 + 604e7beeb3abe7e351a7bb5e507bea66d76a5888 @@ -144,18 +144,18 @@ linker - + https://github.com/dotnet/roslyn - 43b0b05cc4f492fd5de00f6f6717409091df8daa + d7f0cdd7525f65d2ff9e22ccbaa429f5526212f0 https://github.com/dotnet/msbuild - 8ec440e684ef7834461f652276d5e8a88a132532 + 4fca2199878f0c252bfdacc64d7dc22b38bb309c - + https://github.com/dotnet/msbuild - 8ec440e684ef7834461f652276d5e8a88a132532 + 4fca2199878f0c252bfdacc64d7dc22b38bb309c @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 9506882149df72322dba902cd42778ae4c4a6fbf - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 9506882149df72322dba902cd42778ae4c4a6fbf https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 861fd2f15..14769f095 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23425.2 + 7.0.12-servicing.23463.13 - 7.0.11-servicing.23425.6 + 7.0.12-servicing.23463.6 @@ -56,29 +56,29 @@ - 7.0.11 - 7.0.11 - 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 + 7.0.12 + 7.0.12 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 0.2.0 - 7.0.401 - 7.0.401-servicing.23428.8 - 7.0.401-servicing.23428.8 + 7.0.402 + 7.0.402-servicing.23464.38 + 7.0.402-servicing.23464.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23416.9 + 4.7.0-3.23431.5 @@ -86,20 +86,20 @@ - 7.0.11-servicing.23424.27 - 7.0.11-servicing.23424.27 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 + 7.0.12-servicing.23463.5 + 7.0.12-servicing.23463.5 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 - 7.0.11-servicing.23425.5 - 7.0.11-servicing.23425.5 - 7.0.11 - 7.0.11 + 7.0.12-servicing.23463.5 + 7.0.12-servicing.23463.5 + 7.0.12 + 7.0.12 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.1-release-23418-01 + 17.7.2-release-23423-01 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.11 - 7.0.11 + 7.0.12 + 7.0.12 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From c199984fafa8fb0fbf4134ff9c141544f0251224 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 14 Sep 2023 23:55:47 +0000 Subject: [PATCH 073/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230914.37 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.308 -> To Version 7.0.309 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.11 -> To Version 7.0.12 (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 cc1a1596f..369e59eb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,19 @@ - + - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aefc4f1b5..033225070 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b193aa2e8630cef7ac1d858be3677b0c129e2faf + a7b337d3753c016ea00efeacf7a234e603852d3a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - ecb34f85ec92e1b3c814edf7da83337e199e7f66 + 3bcb9f24805914a1a73d9b4ef0c82b28ede106b4 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 70048beee894074e9718206a0017d9b080ee66ff + 3245d136715de117ace2bbb765dbe9978bb5574d https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3df19b5c2397628b241f0785320858fa0ab1d9aa + c7d84fe8930df16f4204fbad3b515b7d9a8edb80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3df19b5c2397628b241f0785320858fa0ab1d9aa + c7d84fe8930df16f4204fbad3b515b7d9a8edb80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3df19b5c2397628b241f0785320858fa0ab1d9aa + c7d84fe8930df16f4204fbad3b515b7d9a8edb80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3df19b5c2397628b241f0785320858fa0ab1d9aa + c7d84fe8930df16f4204fbad3b515b7d9a8edb80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 66db733312de7bd21ed3e73cee0b27fb75d91b70 + eabb0b168f69e1afd828a0f38144405b311e310b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6432861c5a360348a9e1a6cc76cced7bd25ab3f9 + d2fc4e13cada6591f520f2245bf53a3aadb85357 https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 9506882149df72322dba902cd42778ae4c4a6fbf - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 9506882149df72322dba902cd42778ae4c4a6fbf https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index aa10713a7..8f2b0fdaf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.11-servicing.23425.2 + 7.0.12-servicing.23463.13 - 7.0.11-servicing.23425.6 + 7.0.12-servicing.23463.6 @@ -56,22 +56,22 @@ - 7.0.11 - 7.0.11 - 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 + 7.0.12 + 7.0.12 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 + 7.0.12-servicing.23464.9 0.2.0 - 7.0.308 - 7.0.308-servicing.23425.45 - 7.0.308-servicing.23425.45 + 7.0.309 + 7.0.309-servicing.23464.37 + 7.0.309-servicing.23464.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.11-servicing.23424.27 - 7.0.11-servicing.23424.27 - 7.0.11 - 7.0.11 - 7.0.11 - 7.0.11 + 7.0.12-servicing.23463.5 + 7.0.12-servicing.23463.5 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 - 7.0.11-servicing.23425.5 - 7.0.11-servicing.23425.5 - 7.0.11 - 7.0.11 + 7.0.12-servicing.23463.5 + 7.0.12-servicing.23463.5 + 7.0.12 + 7.0.12 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.11 - 7.0.11 + 7.0.12 + 7.0.12 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 04d2e433c900d88b9a76b0f3fbd01656c4ba79d2 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Fri, 15 Sep 2023 08:52:47 -0500 Subject: [PATCH 074/294] .NET Source-Build 6.0.122 September 2023 Updates (#17340) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- .../assets/baselines/MissingXmlDoc.txt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 08cf8283c..d3d273fe2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.121 + 6.0.122 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index e981a599e..c832b0941 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121" + "dotnet": "6.0.122" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index 38f80e186..bde73ece6 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,6 +1,7 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml +Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml From 8f9c6a465f38a1b213ccfa7e64e9c091d1883997 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 20:34:14 +0000 Subject: [PATCH 075/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 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.12 -> To Version 7.0.12 (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 369e59eb5..5357832cd 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 033225070..22e8f8926 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c7d84fe8930df16f4204fbad3b515b7d9a8edb80 + e844526e3bb50d0cff599ec0a06fffe3148cbeea diff --git a/eng/Versions.props b/eng/Versions.props index 8f2b0fdaf..7249b3ca5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23464.37 - 7.0.309-servicing.23464.37 + 7.0.309-servicing.23465.23 + 7.0.309-servicing.23465.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d7f3f62a1260d6c287ead758f56c486a30e09ef9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 20:39:34 +0000 Subject: [PATCH 076/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 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.12 -> To Version 7.0.12 (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 1a71f65ad..301cee26b 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 ae53a1394..7caf049c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 75054fce0d7d3292c7600e4fbcec32724ea93693 + 409cf50af6e57365a901a272e771f9456adc1a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 75054fce0d7d3292c7600e4fbcec32724ea93693 + 409cf50af6e57365a901a272e771f9456adc1a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 75054fce0d7d3292c7600e4fbcec32724ea93693 + 409cf50af6e57365a901a272e771f9456adc1a85 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 75054fce0d7d3292c7600e4fbcec32724ea93693 + 409cf50af6e57365a901a272e771f9456adc1a85 diff --git a/eng/Versions.props b/eng/Versions.props index d88e08ae3..bed17e276 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 0.2.0 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23464.36 - 7.0.112-servicing.23464.36 + 7.0.112-servicing.23465.22 + 7.0.112-servicing.23465.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2b19845f7efa62935a8d3f645747838678f0c0f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 22:22:34 +0000 Subject: [PATCH 077/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.402 -> To Version 7.0.402 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.12 -> To Version 7.0.12 (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 e565c4301..f08529d1e 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 35cc044f4..a38bbc972 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3245d136715de117ace2bbb765dbe9978bb5574d + 3b98a551683f4a78926f61dc1860f9ae89be2b3d https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e13ff2a2d4beca22594a0ac884f4ae8763e3edf9 + c90cfb4e4c5e4b7fc154e1422bf0967cf7e343f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e13ff2a2d4beca22594a0ac884f4ae8763e3edf9 + c90cfb4e4c5e4b7fc154e1422bf0967cf7e343f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e13ff2a2d4beca22594a0ac884f4ae8763e3edf9 + c90cfb4e4c5e4b7fc154e1422bf0967cf7e343f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e13ff2a2d4beca22594a0ac884f4ae8763e3edf9 + c90cfb4e4c5e4b7fc154e1422bf0967cf7e343f4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eabb0b168f69e1afd828a0f38144405b311e310b + b9a47bfae827dc3a7b38beb00ff6a68aeeb1a2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2fc4e13cada6591f520f2245bf53a3aadb85357 + 52e852eeeba7d94815f4aa698081af53fe313543 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 14769f095..05c311696 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23463.13 + 7.0.12-servicing.23465.7 - 7.0.12-servicing.23463.6 + 7.0.12-servicing.23465.3 @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 - 7.0.12-servicing.23464.9 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 + 7.0.12-servicing.23465.12 0.2.0 @@ -70,8 +70,8 @@ 7.0.402 - 7.0.402-servicing.23464.38 - 7.0.402-servicing.23464.38 + 7.0.402-servicing.23465.29 + 7.0.402-servicing.23465.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.12-servicing.23463.5 - 7.0.12-servicing.23463.5 + 7.0.12-servicing.23465.4 + 7.0.12-servicing.23465.4 7.0.12 7.0.12 From 4ac38fb5554ad7ef316a1e35cc7f92d2eed7596e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 22:26:37 +0000 Subject: [PATCH 078/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 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.12 -> To Version 7.0.12 (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 5357832cd..901e264ee 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 22e8f8926..8943dc5b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e844526e3bb50d0cff599ec0a06fffe3148cbeea + 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eabb0b168f69e1afd828a0f38144405b311e310b + b9a47bfae827dc3a7b38beb00ff6a68aeeb1a2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2fc4e13cada6591f520f2245bf53a3aadb85357 + 52e852eeeba7d94815f4aa698081af53fe313543 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7249b3ca5..6f148faef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23463.13 + 7.0.12-servicing.23465.7 - 7.0.12-servicing.23463.6 + 7.0.12-servicing.23465.3 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23465.23 - 7.0.309-servicing.23465.23 + 7.0.309-servicing.23465.30 + 7.0.309-servicing.23465.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.12-servicing.23463.5 - 7.0.12-servicing.23463.5 + 7.0.12-servicing.23465.4 + 7.0.12-servicing.23465.4 7.0.12 7.0.12 From a18e2bccbdecc49165b0f75076db8b17b62f001f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 15 Sep 2023 23:08:08 +0000 Subject: [PATCH 079/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230915.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 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.12 -> To Version 7.0.12 (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 301cee26b..7d4898030 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 7caf049c1..ef47be723 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a7b337d3753c016ea00efeacf7a234e603852d3a + 68b041da8346b082f4c458ccb4aea79c0fdf9491 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 409cf50af6e57365a901a272e771f9456adc1a85 + 1c39d3e5827cfac86b5b1e4a051babb39cf1a118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 409cf50af6e57365a901a272e771f9456adc1a85 + 1c39d3e5827cfac86b5b1e4a051babb39cf1a118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 409cf50af6e57365a901a272e771f9456adc1a85 + 1c39d3e5827cfac86b5b1e4a051babb39cf1a118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 409cf50af6e57365a901a272e771f9456adc1a85 + 1c39d3e5827cfac86b5b1e4a051babb39cf1a118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - eabb0b168f69e1afd828a0f38144405b311e310b + b9a47bfae827dc3a7b38beb00ff6a68aeeb1a2b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - d2fc4e13cada6591f520f2245bf53a3aadb85357 + 52e852eeeba7d94815f4aa698081af53fe313543 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index bed17e276..2bdb4a2b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23463.13 + 7.0.12-servicing.23465.7 - 7.0.12-servicing.23463.6 + 7.0.12-servicing.23465.3 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23465.22 - 7.0.112-servicing.23465.22 + 7.0.112-servicing.23465.31 + 7.0.112-servicing.23465.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.12-servicing.23463.5 - 7.0.12-servicing.23463.5 + 7.0.12-servicing.23465.4 + 7.0.12-servicing.23465.4 7.0.12 7.0.12 From 21a1321b35503fa3a093c9678cb61ce71df8284d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:48:29 +0000 Subject: [PATCH 080/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 --- 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 901e264ee..24f7b04ef 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 8943dc5b7..0464c4962 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 + afdaa753974497c5189c6f8713aac005589771a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 + afdaa753974497c5189c6f8713aac005589771a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 + afdaa753974497c5189c6f8713aac005589771a5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0bfd8c30c267fe1ae21eab586a22aa119677e0b1 + afdaa753974497c5189c6f8713aac005589771a5 diff --git a/eng/Versions.props b/eng/Versions.props index 6f148faef..8d760f559 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23465.30 - 7.0.309-servicing.23465.30 + 7.0.309-servicing.23469.17 + 7.0.309-servicing.23469.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 762f58c561485c70d4d3d315a3c6250e55f6e4df Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 18:48:47 +0000 Subject: [PATCH 081/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.402 -> To Version 7.0.402 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.7.0-3.23431.5 -> To Version 4.7.0-3.23465.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index f08529d1e..590cc176e 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 a38bbc972..4a64298de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c90cfb4e4c5e4b7fc154e1422bf0967cf7e343f4 + ca3b13c4c5965fe035adf267f996823b5038a870 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c90cfb4e4c5e4b7fc154e1422bf0967cf7e343f4 + ca3b13c4c5965fe035adf267f996823b5038a870 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c90cfb4e4c5e4b7fc154e1422bf0967cf7e343f4 + ca3b13c4c5965fe035adf267f996823b5038a870 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c90cfb4e4c5e4b7fc154e1422bf0967cf7e343f4 + ca3b13c4c5965fe035adf267f996823b5038a870 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - d7f0cdd7525f65d2ff9e22ccbaa429f5526212f0 + b5c9211b1b432cdc0f08afec217329701b08af1c diff --git a/eng/Versions.props b/eng/Versions.props index 05c311696..174cdcb64 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,15 +70,15 @@ 7.0.402 - 7.0.402-servicing.23465.29 - 7.0.402-servicing.23465.29 + 7.0.402-servicing.23469.22 + 7.0.402-servicing.23469.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23431.5 + 4.7.0-3.23465.3 From efeed6c5b8d336a7f2737adaa809d22856f78c94 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Sep 2023 19:17:17 +0000 Subject: [PATCH 082/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230919.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 --- 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 7d4898030..91c1134d0 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 ef47be723..38a028307 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c39d3e5827cfac86b5b1e4a051babb39cf1a118 + cd499fdac9f634e1662d0753d3fd720593af1bb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c39d3e5827cfac86b5b1e4a051babb39cf1a118 + cd499fdac9f634e1662d0753d3fd720593af1bb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c39d3e5827cfac86b5b1e4a051babb39cf1a118 + cd499fdac9f634e1662d0753d3fd720593af1bb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c39d3e5827cfac86b5b1e4a051babb39cf1a118 + cd499fdac9f634e1662d0753d3fd720593af1bb2 diff --git a/eng/Versions.props b/eng/Versions.props index 2bdb4a2b3..8c8c0a0c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23465.31 - 7.0.112-servicing.23465.31 + 7.0.112-servicing.23469.19 + 7.0.112-servicing.23469.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 71749d33834dfec4f6e03fa5c4deeec8c3fe49be Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 27 Sep 2023 16:48:21 -0500 Subject: [PATCH 083/294] Handle variations in branch names for triggering SB tarball build (#17434) --- eng/source-build-tarball-build-official.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/source-build-tarball-build-official.yml b/eng/source-build-tarball-build-official.yml index 7164fafb7..eb47706f8 100644 --- a/eng/source-build-tarball-build-official.yml +++ b/eng/source-build-tarball-build-official.yml @@ -9,8 +9,10 @@ resources: include: - release/6.0.1xx - internal/release/6.0.1xx* + - internal/release/*/6.0.1xx* - release/7.0.1xx - internal/release/7.0.1xx* + - internal/release/*/7.0.1xx* stages: - build From 03c33a186a1ff4982c846da5c3959661227e07dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:05:59 +0000 Subject: [PATCH 084/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.35 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.413-servicing.23367.15 -> To Version 6.0.415-servicing.23477.35 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver From Version 6.0.21-servicing.23363.11 -> To Version 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++----------------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 32 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index f27f973a5..99b3e6dd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,25 +7,17 @@ - - - + - - - - - - @@ -46,21 +38,13 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9c3d54c5e..f67f720d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 171bf8e96b7a11471a40fcd6b0376b435e895de8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 32a105ca98fd8a3807b81912fbef60a085378f24 + 171bf8e96b7a11471a40fcd6b0376b435e895de8 diff --git a/eng/Versions.props b/eng/Versions.props index 583c355f0..5040b1d4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.413-servicing.23367.15 - 6.0.413-servicing.23367.15 + 6.0.415-servicing.23477.35 + 6.0.415-servicing.23477.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 From 76098239700644026ba4f70272223dca59719c1b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:06:19 +0000 Subject: [PATCH 085/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.33 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.316-servicing.23367.14 -> To Version 6.0.318-servicing.23477.33 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver From Version 6.0.21-servicing.23363.11 -> To Version 6.0.23-servicing.23475.15 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++-------- 3 files changed, 32 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index 237478e93..8203ce00b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,17 @@ - - + - - @@ -41,15 +38,12 @@ - - + - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62db8623a..c1eb9571d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + c275f388513a7ca17defaea62bb9ac8a275a59d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 68456cae299435babf6fe194ec79e305275985f9 + c275f388513a7ca17defaea62bb9ac8a275a59d7 diff --git a/eng/Versions.props b/eng/Versions.props index e74a2d23f..68eec28c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.316-servicing.23367.14 - 6.0.316-servicing.23367.14 + 6.0.318-servicing.23477.33 + 6.0.318-servicing.23477.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 From fc219bcc8f778c242cc7bf08346c0369cc142467 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 00:06:37 +0000 Subject: [PATCH 086/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.34 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.34 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 23 ++------------------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++++-------- 3 files changed, 35 insertions(+), 54 deletions(-) diff --git a/NuGet.config b/NuGet.config index a5401b038..2802cd154 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,17 @@ - - - - - - + - - - - - - @@ -49,22 +38,14 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5581ce16f..c9b3a6fd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 3c299ae525000e4dd138b22c0f549110625876ed - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 - - https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e40b3abf1b41621d4298642a5fd300ebf7cccf6d + + https://github.com/dotnet/runtime + 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + ca0ebf8e674f65d640b1c52c3199c81d562f31db - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1f77c362a752e25c643140f014af4ee0a05fce4b + ca0ebf8e674f65d640b1c52c3199c81d562f31db @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 60d640a5c1025d1e9e89188cabe41e692d0f5468 + 3c754f28788fae642dc307a948479204e9f7dd5a https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 3535ea913..a4cf0a1c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.121-servicing.23367.13 - 6.0.121-servicing.23367.13 + 6.0.123-servicing.23477.34 + 6.0.123-servicing.23477.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,12 +68,12 @@ - 6.0.21-servicing.23363.11 - 6.0.21-servicing.23363.11 - 6.0.21 - 6.0.21 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23475.15 + 6.0.23-servicing.23475.15 + 6.0.23 + 6.0.23 + 6.0.23 + 6.0.23 2.1.0 @@ -185,7 +185,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.21 + 6.0.22 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 230219d45946a0ab2e8038801bc3299968d1bd0a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 01:37:12 +0000 Subject: [PATCH 087/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.40 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2802cd154..cb4afa3ff 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,6 +16,7 @@ + @@ -44,6 +45,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9b3a6fd2..899fdace3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - b84e7c0a5a2a6d8dc8ce802975b4e117d01a891f + bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca0ebf8e674f65d640b1c52c3199c81d562f31db + d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca0ebf8e674f65d640b1c52c3199c81d562f31db + d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 diff --git a/eng/Versions.props b/eng/Versions.props index a4cf0a1c1..f53dfa3b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.121 + 6.0.123 @@ -56,8 +56,8 @@ - 6.0.123-servicing.23477.34 - 6.0.123-servicing.23477.34 + 6.0.123-servicing.23477.40 + 6.0.123-servicing.23477.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.121 + 6.0.123 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From ea2c912efe125c9e0f090f9121f50793e6faa2b8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 03:08:14 +0000 Subject: [PATCH 088/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.51 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.51 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index cb4afa3ff..6cb6d58e1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,6 +19,7 @@ + @@ -48,6 +49,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 899fdace3..cb689fa1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 + faa436e9bd02d1c505ce20017847d73cee1932c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d3c1f874d6647fefbc39f8ddafb09cb9f24a0583 + faa436e9bd02d1c505ce20017847d73cee1932c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f53dfa3b1..252ee35c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 @@ -56,8 +56,8 @@ - 6.0.123-servicing.23477.40 - 6.0.123-servicing.23477.40 + 6.0.123-servicing.23477.51 + 6.0.123-servicing.23477.51 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 From d1482ceb6b1a72fd3fd1f86e1ae0e117b977d786 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 06:03:21 +0000 Subject: [PATCH 089/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.58 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23477.58 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 ++ eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cb6d58e1..119de589a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -40,6 +41,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb689fa1b..1cab14032 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 90338b105f12ba33ffbe768c19d31b2877bf5eec https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - faa436e9bd02d1c505ce20017847d73cee1932c1 + 8beae7e451ad480a56dbe5058ef9d0374f3c8033 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - faa436e9bd02d1c505ce20017847d73cee1932c1 + 8beae7e451ad480a56dbe5058ef9d0374f3c8033 diff --git a/eng/Versions.props b/eng/Versions.props index 252ee35c5..4f5253f90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,20 +44,20 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.19 0.2.0 - 6.0.123-servicing.23477.51 - 6.0.123-servicing.23477.51 + 6.0.123-servicing.23477.58 + 6.0.123-servicing.23477.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f817683aea089c4f30bc317435e8f2e9ee699655 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 14:45:51 +0000 Subject: [PATCH 090/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.12 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.121-servicing.23367.13 -> To Version 6.0.123-servicing.23478.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,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.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index 119de589a..b4009a88d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -41,7 +41,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1cab14032..6c544b0bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 90338b105f12ba33ffbe768c19d31b2877bf5eec + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8beae7e451ad480a56dbe5058ef9d0374f3c8033 + 09662876479587805f5892daaa54569e6323deb3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8beae7e451ad480a56dbe5058ef9d0374f3c8033 + 09662876479587805f5892daaa54569e6323deb3 diff --git a/eng/Versions.props b/eng/Versions.props index 4f5253f90..0249e1e83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 - 6.0.23-servicing.23477.19 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 - 6.0.123-servicing.23477.58 - 6.0.123-servicing.23477.58 + 6.0.123-servicing.23478.12 + 6.0.123-servicing.23478.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 045b8d39b99c1b2de45f9e051158d3d6632dfb76 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 14:54:23 +0000 Subject: [PATCH 091/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.112 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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++------------------ eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2bc601a50..0b04034b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,9 @@ - - - - + - - - - @@ -24,12 +17,9 @@ + - - - - @@ -51,19 +41,13 @@ - - - - + + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 41f0b6154..6b1a9f1e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 82f22c431bb683309ba75d749d920ae8ffb06c02 + c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 diff --git a/eng/Versions.props b/eng/Versions.props index c64853195..294b3043c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.12 + 7.0.12 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 0.2.0 - 7.0.110 - 7.0.110-servicing.23367.22 - 7.0.110-servicing.23367.22 + 7.0.112 + 7.0.112-servicing.23478.7 + 7.0.112-servicing.23478.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6feb442df97178723c6d58b25758a41533abc194 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 14:58:30 +0000 Subject: [PATCH 092/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.402 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,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.Tasks From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------- 3 files changed, 55 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1a2c374a..c90061b5d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,17 @@ - + + + @@ -39,9 +41,11 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92fdf2ceb..716787d6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + bb6521b7b018ff165cb3ca10347c7052d213167c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + bb6521b7b018ff165cb3ca10347c7052d213167c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + bb6521b7b018ff165cb3ca10347c7052d213167c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8e1f76c1f41ecd37935288c617c53342533db704 + bb6521b7b018ff165cb3ca10347c7052d213167c @@ -124,43 +124,43 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 - + https://github.com/dotnet/fsharp - 159a701477f5ca1e2d960e9bf79ce05769b3c671 + 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/dotnet/fsharp - 159a701477f5ca1e2d960e9bf79ce05769b3c671 + 30bbce677c36d8b190c5400dd909ee45bef8ed48 - + https://github.com/microsoft/vstest - bc17bb9693cfc4778ded51aa0ab7f1065433f989 + 76fea143ffe5e3883dcd04e0923b4b8e1e158145 - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker - + https://github.com/dotnet/roslyn - dad7898acd6372d4380612b9f225db0c2cbfa1e9 + 43b0b05cc4f492fd5de00f6f6717409091df8daa - + https://github.com/dotnet/msbuild - 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 + 8ec440e684ef7834461f652276d5e8a88a132532 - + https://github.com/dotnet/msbuild - 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 + 8ec440e684ef7834461f652276d5e8a88a132532 - + https://github.com/nuget/nuget.client - 13f2b6af6e9864711e815cfbffd7aa5015c52cec + b46f5f64159a81d930ac8cdfde96e76f90796c62 diff --git a/eng/Versions.props b/eng/Versions.props index 8ed38a112..330dc4cdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,29 +56,29 @@ - 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.12 + 7.0.12 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 0.2.0 - 7.0.400 - 7.0.400-rtm.23369.15 - 7.0.400-rtm.23369.15 + 7.0.402 + 7.0.402-servicing.23478.9 + 7.0.402-servicing.23478.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23366.1 + 4.7.0-3.23416.9 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview-23364-03 + 17.7.1-release-23418-01 From 2f011300bfe17207409c41f17c50202c19483849 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 15:01:07 +0000 Subject: [PATCH 093/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.309 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,Microsoft.NET.ILLink.Tasks From Version 7.0.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 40 ++++------------------------------ eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 3 files changed, 38 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index b885835bc..f49350550 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,34 +10,16 @@ - - - - + - - - - - - - - - - - - + - - - - @@ -59,27 +41,13 @@ - - - - + - - - - - - - - + - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d206477b..c0a143f4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5a4c82ec57fadddef9ce841d608de5c7c8c74446 + 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 https://github.com/dotnet/test-templates @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 93655ee31e403d6dccf43195ebd7334dbedbffd9 + 6757a33ea4a33570514d20dd278cd3ac6d363d9b @@ -138,9 +138,9 @@ e7ea853f64af5a4c240acaf9e54cdae3ae0eb7bb - + https://github.com/dotnet/linker - 13a94b5bdc9d01ecd9eb2bd699bd34d597c3ec19 + 53b3303c57b3fe659500fb362a0eef12991c1197 linker diff --git a/eng/Versions.props b/eng/Versions.props index e9798b657..b0877ffc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.12 + 7.0.12 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 0.2.0 - 7.0.307 - 7.0.307-servicing.23367.21 - 7.0.307-servicing.23367.21 + 7.0.309 + 7.0.309-servicing.23478.8 + 7.0.309-servicing.23478.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b7cc0b053243b8525c776345c769dddb93bab1b6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 16:04:56 +0000 Subject: [PATCH 094/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.402 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,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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,NuGet.Build.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.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index c90061b5d..3521b1470 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,9 +15,10 @@ + - + @@ -44,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 716787d6d..5e11c5d0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb6521b7b018ff165cb3ca10347c7052d213167c + dccb57fb6140b9b13cb97aa6a031b2975e86fc90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb6521b7b018ff165cb3ca10347c7052d213167c + dccb57fb6140b9b13cb97aa6a031b2975e86fc90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb6521b7b018ff165cb3ca10347c7052d213167c + dccb57fb6140b9b13cb97aa6a031b2975e86fc90 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - bb6521b7b018ff165cb3ca10347c7052d213167c + dccb57fb6140b9b13cb97aa6a031b2975e86fc90 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 330dc4cdb..fe11374c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.402 - 7.0.402-servicing.23478.9 - 7.0.402-servicing.23478.9 + 7.0.402-servicing.23478.16 + 7.0.402-servicing.23478.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,12 @@ - 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.12-servicing.23477.20 + 7.0.12-servicing.23477.20 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.10 - 7.0.10 + 7.0.11 + 7.0.11 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From ce6ed2d04a386b89e0bde38b81837f0003e1b8d6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 16:10:16 +0000 Subject: [PATCH 095/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.307 -> To Version 7.0.309 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,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.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.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index f49350550..6cdf5e76c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,9 +15,10 @@ + - + @@ -44,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a143f4e..95e85fa0c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6757a33ea4a33570514d20dd278cd3ac6d363d9b + 804aff807ca42d6f112bf7dd26dfe6161aa1f11b @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index b0877ffc7..920605f6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23478.8 - 7.0.309-servicing.23478.8 + 7.0.309-servicing.23478.17 + 7.0.309-servicing.23478.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,12 +86,12 @@ - 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.12-servicing.23477.20 + 7.0.12-servicing.23477.20 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 @@ -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 22dd334fe1c5aee46acec0c75c606f21a73a8ac6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:08:48 +0000 Subject: [PATCH 096/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.41 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.33 -> To Version 6.0.318-servicing.23477.41 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c1eb9571d..5ede60723 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c275f388513a7ca17defaea62bb9ac8a275a59d7 + 65842b2844d354fbda32a61a5f974a7df74dd4ae - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c275f388513a7ca17defaea62bb9ac8a275a59d7 + 65842b2844d354fbda32a61a5f974a7df74dd4ae diff --git a/eng/Versions.props b/eng/Versions.props index 68eec28c9..bb3592c89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.33 - 6.0.318-servicing.23477.33 + 6.0.318-servicing.23477.41 + 6.0.318-servicing.23477.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48ec5bfab962997cee4fbaf6ae41d1950c56e0fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:08:57 +0000 Subject: [PATCH 097/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.53 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.41 -> To Version 6.0.318-servicing.23477.53 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ede60723..510204ec6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65842b2844d354fbda32a61a5f974a7df74dd4ae + cccbf1c1f105af16ad122b53c6d35702e41b55e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 65842b2844d354fbda32a61a5f974a7df74dd4ae + cccbf1c1f105af16ad122b53c6d35702e41b55e4 diff --git a/eng/Versions.props b/eng/Versions.props index bb3592c89..c433b43a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.41 - 6.0.318-servicing.23477.41 + 6.0.318-servicing.23477.53 + 6.0.318-servicing.23477.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1be7383da96fa85394061f5fb7915ea896dfa567 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:09:05 +0000 Subject: [PATCH 098/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.57 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.53 -> To Version 6.0.318-servicing.23477.57 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 510204ec6..cf878fa54 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cccbf1c1f105af16ad122b53c6d35702e41b55e4 + c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cccbf1c1f105af16ad122b53c6d35702e41b55e4 + c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 diff --git a/eng/Versions.props b/eng/Versions.props index c433b43a2..ccdad7c14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23477.53 - 6.0.318-servicing.23477.53 + 6.0.318-servicing.23477.57 + 6.0.318-servicing.23477.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f079309f9336248845ca2bfdfa65910cff1a2a8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:09:12 +0000 Subject: [PATCH 099/294] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8203ce00b..8855eb812 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,8 +17,10 @@ + + @@ -38,12 +41,15 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf878fa54..b91e3ccdb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 82b4d8dbf6c14f1f819d17278c3f742f9fc29bbd + a71fcc8c6464214b05c6bbadd5b7385fb88f30fe https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ccdad7c14..af7e134fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 - 6.0.316 + 6.0.318 @@ -44,12 +44,12 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.316 + 6.0.318 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From d1579c4f20e5f83e8a5a61dbd08b958a8ac7a0d2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:19 +0000 Subject: [PATCH 100/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.42 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.35 -> To Version 6.0.415-servicing.23477.42 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f67f720d0..4b55484dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 171bf8e96b7a11471a40fcd6b0376b435e895de8 + dabc0c64866617f84f21cdb5d87db6a50e4e5144 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 171bf8e96b7a11471a40fcd6b0376b435e895de8 + dabc0c64866617f84f21cdb5d87db6a50e4e5144 diff --git a/eng/Versions.props b/eng/Versions.props index 5040b1d4c..2c7878bd4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.35 - 6.0.415-servicing.23477.35 + 6.0.415-servicing.23477.42 + 6.0.415-servicing.23477.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7ca72019f042f532536608a27e9e558a30122eba Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:27 +0000 Subject: [PATCH 101/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.52 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.42 -> To Version 6.0.415-servicing.23477.52 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b55484dc..8ca09bc8a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dabc0c64866617f84f21cdb5d87db6a50e4e5144 + 64040b68463b7933255af3d3e2193586fe259d98 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dabc0c64866617f84f21cdb5d87db6a50e4e5144 + 64040b68463b7933255af3d3e2193586fe259d98 diff --git a/eng/Versions.props b/eng/Versions.props index 2c7878bd4..49d76812f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.42 - 6.0.415-servicing.23477.42 + 6.0.415-servicing.23477.52 + 6.0.415-servicing.23477.52 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2191d456f60e9afb47945a2fa2b4acbc27824a8f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:34 +0000 Subject: [PATCH 102/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230927.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.52 -> To Version 6.0.415-servicing.23477.56 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8ca09bc8a..f82d016f4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64040b68463b7933255af3d3e2193586fe259d98 + baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 64040b68463b7933255af3d3e2193586fe259d98 + baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 diff --git a/eng/Versions.props b/eng/Versions.props index 49d76812f..dca8bdc9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23477.52 - 6.0.415-servicing.23477.52 + 6.0.415-servicing.23477.56 + 6.0.415-servicing.23477.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84b8c178115a1afda0a1a364792751987fcc14c8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:10:42 +0000 Subject: [PATCH 103/294] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.21 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++++---------- 3 files changed, 50 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index 99b3e6dd7..b92191712 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -16,8 +17,10 @@ + + @@ -38,13 +41,16 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f82d016f4..f7baaa280 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 3c299ae525000e4dd138b22c0f549110625876ed + ac9d0f6242b48fca7e36d519cde33210a798adec https://github.com/dotnet/runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a08d9ce2caf02455c0b825bcdc32974bdf769a80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - cec88a329584349fda070f4c7346b10538210ace + 1d49c492e467318607e5874fc6af645115fd0434 https://github.com/dotnet/test-templates @@ -90,18 +90,18 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 28896af5870a6d8130bb1fc8ea5d11dab1573ec8 + 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 052009561f916cf06df82d89297ae3ed66cf5d2f + 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - fa467fd679da61d9e429ce2654ef63766afcd7f5 + 5bef1839b6b4a882df7813165abc368f070659f0 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dca8bdc9e..ed174f841 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.21-servicing.23364.6 + 6.0.23-servicing.23477.14 - 6.0.21-servicing.23364.5 + 6.0.23-servicing.23477.3 - 6.0.413 + 6.0.415 @@ -44,12 +44,12 @@ - 6.0.21 - 6.0.21 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 - 6.0.21-servicing.23364.38 + 6.0.23 + 6.0.23 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 + 6.0.23-servicing.23477.22 0.2.0 @@ -78,10 +78,10 @@ - 6.0.21-servicing.23367.3 - 6.0.21-servicing.23367.3 - 6.0.21 - 6.0.21 + 6.0.23-servicing.23477.7 + 6.0.23-servicing.23477.7 + 6.0.23 + 6.0.23 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.413 + 6.0.415 $(MicrosoftAspNetCoreAppRuntimePackageVersion) $(MicrosoftWinFormsProjectTemplates50PackageVersion) From 53f9a61939f037c237050b290cb9a1f2ccb8a672 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 28 Sep 2023 17:15:36 +0000 Subject: [PATCH 104/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230928.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.110 -> To Version 7.0.112 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,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,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.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++--------- 3 files changed, 37 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0b04034b8..3aa2e78a3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,9 +15,10 @@ + - + @@ -44,8 +45,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6b1a9f1e3..a6443618c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 996ed6b07099f377a6b05581860a1f66a30aca00 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a6dbb800a47735bde43187350fd3aff4071c7f9c + 4a824ef37caa51072221584c64cbf15455f406ca @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a34d8fa78cbe4c7e2949f81dec99e3da7395f9 + 6b4e8cf775212eee50af8c0faca409263c1d3ab4 @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f - + https://github.com/dotnet/emsdk - 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d + 79b01e47d43eeba5442af569770480696102972f https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 294b3043c..1427dc9b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23478.7 - 7.0.112-servicing.23478.7 + 7.0.112-servicing.23478.18 + 7.0.112-servicing.23478.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,12 +82,12 @@ - 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.12-servicing.23477.20 + 7.0.12-servicing.23477.20 + 7.0.12 + 7.0.12 + 7.0.12 + 7.0.12 2.1.0 @@ -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 fdd48b76205bfc945d802ba28375b9a17aa83414 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 28 Sep 2023 23:44:07 +0000 Subject: [PATCH 105/294] Merged PR 34026: Update SB SDK and XML diff baselines --- .../assets/baselines/MissingXmlDoc.txt | 1 - .../assets/baselines/MsftToSbSdk.diff | 22 +++---------------- 2 files changed, 3 insertions(+), 20 deletions(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt index bde73ece6..38f80e186 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MissingXmlDoc.txt @@ -1,7 +1,6 @@ Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.Analyzers.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/cs/Microsoft.AspNetCore.App.CodeFixes.xml Microsoft.AspNetCore.App.Ref/analyzers/dotnet/roslyn4.0/cs/Microsoft.Extensions.Logging.Generators.xml -Microsoft.AspNetCore.App.Ref/ref/netx.y/System.Runtime.CompilerServices.Unsafe.xml Microsoft.NETCore.App.Ref/analyzers/dotnet/cs/System.Text.Json.SourceGeneration.xml Microsoft.NETCore.App.Ref/ref/netx.y/Microsoft.VisualBasic.xml Microsoft.NETCore.App.Ref/ref/netx.y/mscorlib.xml 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 4e98d267b..71ae3f0b9 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/MsftToSbSdk.diff @@ -14,20 +14,7 @@ index ------------ ./packs/Microsoft.AspNetCore.App.Ref/ ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ @@ ------------ @@ - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.JSInterop.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/Microsoft.Net.Http.Headers.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.DiagnosticSource.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.dll - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Diagnostics.EventLog.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Formats.Asn1.xml - ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.IO.Pipelines.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Runtime.CompilerServices.Unsafe.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.AccessControl.xml ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.dll ./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Security.Cryptography.Xml.xml -./packs/Microsoft.NETCore.App.Host.portable-rid/ @@ -42,10 +29,6 @@ index ------------ -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/libnethost.so -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/nethost.h -./packs/Microsoft.NETCore.App.Host.portable-rid/x.y.z/runtimes/portable-rid/native/singlefilehost -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Encodings.Web.xml -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.dll -+./packs/Microsoft.AspNetCore.App.Ref/x.y.z/ref/netx.y/System.Text.Json.xml +./packs/Microsoft.NETCore.App.Host.banana-rid/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/ +./packs/Microsoft.NETCore.App.Host.banana-rid/x.y.z/runtimes/ @@ -348,13 +331,13 @@ index ------------ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/ -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/Microsoft.Win32.SystemEvents.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Drawing.Common.dll --./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Security.Cryptography.Pkcs.dll -./sdk/x.y.z/runtimes/win/lib/netcoreapp3.0/System.Windows.Extensions.dll -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/ -./sdk/x.y.z/runtimes/win/lib/netstandard2.0/System.Security.Cryptography.ProtectedData.dll ./sdk/x.y.z/runtimes/win/lib/netx.y/ ./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.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/runtimes/win/lib/netx.y/System.Security.Cryptography.ProtectedData.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 @@ -431,9 +414,10 @@ index ------------ +./sdk/x.y.z/System.Diagnostics.DiagnosticSource.dll ./sdk/x.y.z/System.Diagnostics.EventLog.dll -./sdk/x.y.z/System.Drawing.Common.dll ++./sdk/x.y.z/System.Formats.Asn1.dll ./sdk/x.y.z/System.Resources.Extensions.dll --./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll +./sdk/x.y.z/System.Runtime.CompilerServices.Unsafe.dll + ./sdk/x.y.z/System.Security.Cryptography.Pkcs.dll ./sdk/x.y.z/System.Security.Cryptography.ProtectedData.dll -./sdk/x.y.z/System.Security.Cryptography.Xml.dll -./sdk/x.y.z/System.Security.Permissions.dll From f2a621680aed301a573fbf9e64d2168a74ddf530 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 29 Sep 2023 16:24:54 +0000 Subject: [PATCH 106/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++--- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++--------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3aa2e78a3..595c01e4a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -18,9 +18,10 @@ - + + @@ -42,14 +43,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a6443618c..f8bb0ad9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6b4e8cf775212eee50af8c0faca409263c1d3ab4 + f5007c06163c6178620407098ec549594b00d0c1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 75eafed7999075bca879940ad0b1a0794061ddb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + c94bac748138456f4feef271b3dc18e4b46453e6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 1427dc9b7..d1fff5345 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.12-servicing.23478.3 - 7.0.10-servicing.23364.4 + 7.0.12-servicing.23478.2 @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23478.18 - 7.0.112-servicing.23478.18 + 7.0.112-servicing.23479.5 + 7.0.112-servicing.23479.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,10 +92,10 @@ - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12 + 7.0.12 From 8b85dc17dd4d337d38e34e7e0231b4c53f76f47d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 29 Sep 2023 16:46:28 +0000 Subject: [PATCH 107/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++--- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++--------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6cdf5e76c..d94f950be 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,9 +18,10 @@ - + + @@ -42,14 +43,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 95e85fa0c..ad565cffe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 804aff807ca42d6f112bf7dd26dfe6161aa1f11b + 2cabc043689054a1f0ddf5895d32572190515ae8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 75eafed7999075bca879940ad0b1a0794061ddb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + c94bac748138456f4feef271b3dc18e4b46453e6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 920605f6f..699696ef5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.12-servicing.23478.3 - 7.0.10-servicing.23364.4 + 7.0.12-servicing.23478.2 @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23478.17 - 7.0.309-servicing.23478.17 + 7.0.309-servicing.23479.6 + 7.0.309-servicing.23479.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12 + 7.0.12 From d243d897aa6432acb050db2e9aa6e65c0dbd516a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 29 Sep 2023 16:48:01 +0000 Subject: [PATCH 108/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.402 -> To Version 7.0.402 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.10 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++--- eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++--------- 3 files changed, 50 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3521b1470..ffd2ea614 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -18,9 +18,10 @@ - + + @@ -42,14 +43,15 @@ - + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5e11c5d0f..55dc2437e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 996ed6b07099f377a6b05581860a1f66a30aca00 + 018db428575093156be75c5bc20d33aebae33be4 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1b8fbf7f0a75bc2c513b6181c2629bc8d6aa0983 + b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dccb57fb6140b9b13cb97aa6a031b2975e86fc90 + 3fcc2c62fe1a3a15c2101703934b02f457ef5bcc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dccb57fb6140b9b13cb97aa6a031b2975e86fc90 + 3fcc2c62fe1a3a15c2101703934b02f457ef5bcc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dccb57fb6140b9b13cb97aa6a031b2975e86fc90 + 3fcc2c62fe1a3a15c2101703934b02f457ef5bcc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - dccb57fb6140b9b13cb97aa6a031b2975e86fc90 + 3fcc2c62fe1a3a15c2101703934b02f457ef5bcc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1f1ac283c5d3bb3302111f8aef567a3541863c49 + 75eafed7999075bca879940ad0b1a0794061ddb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 + c94bac748138456f4feef271b3dc18e4b46453e6 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fe11374c6..be7d61a5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.10-servicing.23364.5 + 7.0.12-servicing.23478.3 - 7.0.10-servicing.23364.4 + 7.0.12-servicing.23478.2 @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 + 7.0.12-servicing.23478.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.402 - 7.0.402-servicing.23478.16 - 7.0.402-servicing.23478.16 + 7.0.402-servicing.23479.4 + 7.0.402-servicing.23479.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,10 +96,10 @@ - 7.0.10-servicing.23367.2 - 7.0.10-servicing.23367.2 - 7.0.10 - 7.0.10 + 7.0.12-servicing.23478.2 + 7.0.12-servicing.23478.2 + 7.0.12 + 7.0.12 From 4fe08e837a0be59082de87efe529bb93fc3a7068 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Fri, 29 Sep 2023 17:24:51 +0000 Subject: [PATCH 109/294] Deleted 0002-Add-explicit-System.Text.Json-dependency.patch --- ...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 7cbb79538..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 f10d699fa9bccaf7eb3a962b98718f7b4129541c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Fri, 29 Sep 2023 17:27:12 +0000 Subject: [PATCH 110/294] Deleted 0002-Add-explicit-System.Text.Json-dependency.patch The patch is unable to be applied. --- ...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 99b0a4d95f9bb80a0c3f540f35c8df4814e97660 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 01:55:02 +0000 Subject: [PATCH 111/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.29 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23478.12 -> To Version 6.0.123-servicing.23479.29 Dependency coherency updates VS.Redist.Common.NetCore.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0 From Version 6.0.23-servicing.23475.15 -> To Version 6.0.23-servicing.23479.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index b4009a88d..84e9b6596 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,19 +8,25 @@ + + - + + + + + @@ -41,16 +47,22 @@ + + - + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c544b0bd..932a156bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,7 +17,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ac9d0f6242b48fca7e36d519cde33210a798adec - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09662876479587805f5892daaa54569e6323deb3 + 81bd2a95ea21deb9f26a689b6ee58156283b868d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 09662876479587805f5892daaa54569e6323deb3 + 81bd2a95ea21deb9f26a689b6ee58156283b868d diff --git a/eng/Versions.props b/eng/Versions.props index 0249e1e83..179012d2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23478.12 - 6.0.123-servicing.23478.12 + 6.0.123-servicing.23479.29 + 6.0.123-servicing.23479.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 From 9415960d4eded05d2f69e0cb9e4c5fc8d3613c1d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:01 +0000 Subject: [PATCH 112/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.39 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.29 -> To Version 6.0.123-servicing.23479.39 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 932a156bf..65e097e19 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81bd2a95ea21deb9f26a689b6ee58156283b868d + 3fbbefae235360eb12638f0993ab7f7956d87735 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 81bd2a95ea21deb9f26a689b6ee58156283b868d + 3fbbefae235360eb12638f0993ab7f7956d87735 diff --git a/eng/Versions.props b/eng/Versions.props index 179012d2c..5c5e6319d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.29 - 6.0.123-servicing.23479.29 + 6.0.123-servicing.23479.39 + 6.0.123-servicing.23479.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cae700fe1319db9592763c037ec3ec6995125b7c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:07 +0000 Subject: [PATCH 113/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.66 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.112 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.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 595c01e4a..ef9fc45aa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,12 +16,16 @@ + + - + + + @@ -43,14 +47,18 @@ - + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f8bb0ad9e..f417e14d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f5007c06163c6178620407098ec549594b00d0c1 + 8f60c1c695ad668c81d635c22539c5abf864e7da diff --git a/eng/Versions.props b/eng/Versions.props index d1fff5345..3554f410a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23479.5 - 7.0.112-servicing.23479.5 + 7.0.112-servicing.23479.66 + 7.0.112-servicing.23479.66 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d8ba6e005be7e3493b89a58f48b8f6046920a79b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:09 +0000 Subject: [PATCH 114/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.48 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.39 -> To Version 6.0.123-servicing.23479.48 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65e097e19..b925ef454 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fbbefae235360eb12638f0993ab7f7956d87735 + ae62158db346bbafa5af2f49828120f5fe0abe84 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fbbefae235360eb12638f0993ab7f7956d87735 + ae62158db346bbafa5af2f49828120f5fe0abe84 diff --git a/eng/Versions.props b/eng/Versions.props index 5c5e6319d..70dbaf233 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.39 - 6.0.123-servicing.23479.39 + 6.0.123-servicing.23479.48 + 6.0.123-servicing.23479.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0b05af8774825a123a4e563127e0565afddd1869 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:18 +0000 Subject: [PATCH 115/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.57 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.48 -> To Version 6.0.123-servicing.23479.57 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b925ef454..e29d794dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62158db346bbafa5af2f49828120f5fe0abe84 + e67ea07bc961d270c84659d31bca260e49171eec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae62158db346bbafa5af2f49828120f5fe0abe84 + e67ea07bc961d270c84659d31bca260e49171eec diff --git a/eng/Versions.props b/eng/Versions.props index 70dbaf233..8450188f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.48 - 6.0.123-servicing.23479.48 + 6.0.123-servicing.23479.57 + 6.0.123-servicing.23479.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 855b6b5d0910fd8330f2667f3970cbb538edaecc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:25 +0000 Subject: [PATCH 116/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.71 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.123-servicing.23479.57 -> To Version 6.0.123-servicing.23479.71 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e29d794dd..ceb77a7a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating bff71fd17286a916e2b3c416e5d91717ff906b25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e67ea07bc961d270c84659d31bca260e49171eec + 082ef34b8850ad9efedd43955188bec151c3ff79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e67ea07bc961d270c84659d31bca260e49171eec + 082ef34b8850ad9efedd43955188bec151c3ff79 diff --git a/eng/Versions.props b/eng/Versions.props index 8450188f6..0343bc766 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23479.57 - 6.0.123-servicing.23479.57 + 6.0.123-servicing.23479.71 + 6.0.123-servicing.23479.71 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3a33e75529cd5abaf13d579c64c68aa6dcb4ac31 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:01:34 +0000 Subject: [PATCH 117/294] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++++--------------- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 38 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 84e9b6596..e4ad17f61 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,7 @@ - - - + @@ -19,14 +17,10 @@ - - - + - - - + @@ -47,23 +41,17 @@ - - - + - - - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ceb77a7a4..8fe2fb57d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://github.com/dotnet/runtime @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,16 +92,16 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - bff71fd17286a916e2b3c416e5d91717ff906b25 + 819017e168bbcb9650a9504406f0d65b483b424c https://dev.azure.com/dnceng/internal/_git/dotnet-sdk @@ -113,13 +113,13 @@ 082ef34b8850ad9efedd43955188bec151c3ff79 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0343bc766..a00c3d73e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,10 +46,10 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From 64fd6201091b4d590aa923aad6f6d7e947f2b18b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:02:38 +0000 Subject: [PATCH 118/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.67 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.402 -> To Version 7.0.402 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.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index ffd2ea614..81bd3eb80 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,18 +10,22 @@ - + + + - + + + @@ -43,14 +47,18 @@ - + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 55dc2437e..08692ef7c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fcc2c62fe1a3a15c2101703934b02f457ef5bcc + 871597f816328549affc195fb2ab5620b3a578f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fcc2c62fe1a3a15c2101703934b02f457ef5bcc + 871597f816328549affc195fb2ab5620b3a578f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fcc2c62fe1a3a15c2101703934b02f457ef5bcc + 871597f816328549affc195fb2ab5620b3a578f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3fcc2c62fe1a3a15c2101703934b02f457ef5bcc + 871597f816328549affc195fb2ab5620b3a578f5 diff --git a/eng/Versions.props b/eng/Versions.props index be7d61a5f..4d5c5bc79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.402 - 7.0.402-servicing.23479.4 - 7.0.402-servicing.23479.4 + 7.0.402-servicing.23479.67 + 7.0.402-servicing.23479.67 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e610891a41947d5e7d937dfc2e58db65b3439b69 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:02:58 +0000 Subject: [PATCH 119/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.68 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.309 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.12 -> To Version 7.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++++++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 38 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index d94f950be..ed994c9ec 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,18 +10,22 @@ - + + + - + + + @@ -43,14 +47,18 @@ - + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad565cffe..63e35eae3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - b6dd95ffe5c2a7e3abb110b5ad83b4c03e159e03 + 57512b49997283599b00a6b67d0ccebaec171daf https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cabc043689054a1f0ddf5895d32572190515ae8 + 5a48ee082690a5e3b6a0b51632071f89c2f8d725 diff --git a/eng/Versions.props b/eng/Versions.props index 699696ef5..70971a8cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.12 7.0.12 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 - 7.0.12-servicing.23478.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 + 7.0.12-servicing.23479.22 0.2.0 @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23479.6 - 7.0.309-servicing.23479.6 + 7.0.309-servicing.23479.68 + 7.0.309-servicing.23479.68 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a15f83f24a4b485de776e9564075d6fe7cad1b9a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:03:51 +0000 Subject: [PATCH 120/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.69 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23477.57 -> To Version 6.0.318-servicing.23479.69 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8855eb812..64a1657f1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b91e3ccdb..d79f3bb69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,21 +3,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c https://dev.azure.com/dnceng/internal/_git/dotnet-templating - a71fcc8c6464214b05c6bbadd5b7385fb88f30fe + c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c99358f96c9e0d3a9c71d5f4bdba9455c798a2c0 + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index af7e134fa..f65377789 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 - 6.0.318-servicing.23477.57 - 6.0.318-servicing.23477.57 + 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.69 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From 7e2be1f5074f3df4b492d2f08181a23d041b4c68 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:04:00 +0000 Subject: [PATCH 121/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23477.56 -> To Version 6.0.415-servicing.23479.70 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets,Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.23 -> To Version 6.0.23 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 +++++------ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 50 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index b92191712..a14489bf7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7baaa280..2c06860d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,21 +3,21 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ac9d0f6242b48fca7e36d519cde33210a798adec + 24ec132b51329b9f434eba3fb7e64de570bc1017 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -25,7 +25,7 @@ https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 - + https://github.com/dotnet/runtime 301ba1ee5d1cfff28a8866924733603f3adf4936 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1d49c492e467318607e5874fc6af645115fd0434 + 5e314b8223a8c80f6c9c08985e050b7aed06b0fa https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 19126af4e50c8ba07fcd78b3435c0cdf0e8f7922 + 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - baa805b8bcf24e1081624afd70a5f4d4bd3dbb18 + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 8b4c9d0ea07f702c35873b8f5b773510ca0d8941 + 5589f30c2c75e37b50934791b7f98e26973b03c4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 5bef1839b6b4a882df7813165abc368f070659f0 + 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index ed174f841..77d04c9bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23477.14 + 6.0.23-servicing.23479.10 - 6.0.23-servicing.23477.3 + 6.0.23-servicing.23479.5 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 - 6.0.23-servicing.23477.22 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 + 6.0.23-servicing.23479.20 0.2.0 - 6.0.415-servicing.23477.56 - 6.0.415-servicing.23477.56 + 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23475.15 - 6.0.23-servicing.23475.15 + 6.0.23-servicing.23479.5 + 6.0.23-servicing.23479.5 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23477.7 - 6.0.23-servicing.23477.7 + 6.0.23-servicing.23479.7 + 6.0.23-servicing.23479.7 6.0.23 6.0.23 From dffc87a32c4cb34338e5eff2e05ef1f6ef26df36 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:03 +0000 Subject: [PATCH 122/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.70 -> To Version 6.0.415-servicing.23479.30 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c06860d8..c727f2dcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + 29bac7a5cef32b4fdd69a79799040347ab4c62fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + 29bac7a5cef32b4fdd69a79799040347ab4c62fc diff --git a/eng/Versions.props b/eng/Versions.props index 77d04c9bf..94567f8c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.70 - 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.30 + 6.0.415-servicing.23479.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 187b820af2fb72e8fc52a6c08fe47ae2b9896f60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:04 +0000 Subject: [PATCH 123/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.28 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.69 -> To Version 6.0.318-servicing.23479.28 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d79f3bb69..bfde77346 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 16495d6f58f9d2d6bd9557c66b7d316c53716c7e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 16495d6f58f9d2d6bd9557c66b7d316c53716c7e diff --git a/eng/Versions.props b/eng/Versions.props index f65377789..167a78ad8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.69 - 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.28 + 6.0.318-servicing.23479.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76985f56fb3dba1609c07f38a96da85069959957 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:10 +0000 Subject: [PATCH 124/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.40 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.30 -> To Version 6.0.415-servicing.23479.40 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c727f2dcc..9e254f0b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29bac7a5cef32b4fdd69a79799040347ab4c62fc + 798f74fcb6e86c328f6c55cb96907752e0164611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 29bac7a5cef32b4fdd69a79799040347ab4c62fc + 798f74fcb6e86c328f6c55cb96907752e0164611 diff --git a/eng/Versions.props b/eng/Versions.props index 94567f8c9..f8f42a414 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.30 - 6.0.415-servicing.23479.30 + 6.0.415-servicing.23479.40 + 6.0.415-servicing.23479.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae70e87b345305f93583de3ce2aa60ddc9a84c3c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:11 +0000 Subject: [PATCH 125/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.38 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.28 -> To Version 6.0.318-servicing.23479.38 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfde77346..cf99c5938 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16495d6f58f9d2d6bd9557c66b7d316c53716c7e + b0bd2676d5b0079cd4382d62ebf95d6532b4d168 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 16495d6f58f9d2d6bd9557c66b7d316c53716c7e + b0bd2676d5b0079cd4382d62ebf95d6532b4d168 diff --git a/eng/Versions.props b/eng/Versions.props index 167a78ad8..3892fbbd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.28 - 6.0.318-servicing.23479.28 + 6.0.318-servicing.23479.38 + 6.0.318-servicing.23479.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f68ad03f61c60c15f139226c4aae0119b7d35e60 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:17 +0000 Subject: [PATCH 126/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.47 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.40 -> To Version 6.0.415-servicing.23479.47 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e254f0b3..aa6ea5906 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 798f74fcb6e86c328f6c55cb96907752e0164611 + 1767ce68cb9f27c42d55f34d6f0901153f29d5ee - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 798f74fcb6e86c328f6c55cb96907752e0164611 + 1767ce68cb9f27c42d55f34d6f0901153f29d5ee diff --git a/eng/Versions.props b/eng/Versions.props index f8f42a414..c56f8747d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.40 - 6.0.415-servicing.23479.40 + 6.0.415-servicing.23479.47 + 6.0.415-servicing.23479.47 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 364dc4c268098f6b1756acb9d252fc05ef8ea4d4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:19 +0000 Subject: [PATCH 127/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.46 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.38 -> To Version 6.0.318-servicing.23479.46 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf99c5938..12f20cd4a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0bd2676d5b0079cd4382d62ebf95d6532b4d168 + e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0bd2676d5b0079cd4382d62ebf95d6532b4d168 + e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 diff --git a/eng/Versions.props b/eng/Versions.props index 3892fbbd0..d73c574b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.38 - 6.0.318-servicing.23479.38 + 6.0.318-servicing.23479.46 + 6.0.318-servicing.23479.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 68bd681d7c03f3c7c61c66ebc18bb4c8539d11d0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:24 +0000 Subject: [PATCH 128/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.56 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.47 -> To Version 6.0.415-servicing.23479.56 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa6ea5906..dc6793b95 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1767ce68cb9f27c42d55f34d6f0901153f29d5ee + 6e7f11dfd675ac9a715426914d081d0522bf325c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1767ce68cb9f27c42d55f34d6f0901153f29d5ee + 6e7f11dfd675ac9a715426914d081d0522bf325c diff --git a/eng/Versions.props b/eng/Versions.props index c56f8747d..6e00936c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.47 - 6.0.415-servicing.23479.47 + 6.0.415-servicing.23479.56 + 6.0.415-servicing.23479.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 27d1988d9b494a43620f4e3b6b9d6f33fe249a26 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:27 +0000 Subject: [PATCH 129/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.55 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.46 -> To Version 6.0.318-servicing.23479.55 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 12f20cd4a..6dc7d39e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 + 556a86c4113dc00918dc5f5af33c8947f9ec63ff - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e29368ee2d5f2b5a0bbdbda6374d7a1cf6775b18 + 556a86c4113dc00918dc5f5af33c8947f9ec63ff diff --git a/eng/Versions.props b/eng/Versions.props index d73c574b7..932a00ae5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.46 - 6.0.318-servicing.23479.46 + 6.0.318-servicing.23479.55 + 6.0.318-servicing.23479.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d93ea239eefc0c499f3e92060ac88bbb121df4ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:31 +0000 Subject: [PATCH 130/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.70 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.415-servicing.23479.56 -> To Version 6.0.415-servicing.23479.70 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dc6793b95..2c06860d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 1b2b001a14ddb53823315e675b8d2936c9965918 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7f11dfd675ac9a715426914d081d0522bf325c + 41584f8690a6d383db4c980ff4279dada7d1dd0a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6e7f11dfd675ac9a715426914d081d0522bf325c + 41584f8690a6d383db4c980ff4279dada7d1dd0a diff --git a/eng/Versions.props b/eng/Versions.props index 6e00936c8..77d04c9bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23479.56 - 6.0.415-servicing.23479.56 + 6.0.415-servicing.23479.70 + 6.0.415-servicing.23479.70 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 00e0950ae1b407ea194fafc0b76266e0df3d2f78 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 30 Sep 2023 06:06:35 +0000 Subject: [PATCH 131/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230929.69 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.318-servicing.23479.55 -> To Version 6.0.318-servicing.23479.69 --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6dc7d39e9..d79f3bb69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c57972a193acf770588f8e8ef64cec082b27800c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 556a86c4113dc00918dc5f5af33c8947f9ec63ff + 9f5cb3400f5877845decdddd2c17d57cf77f2202 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 556a86c4113dc00918dc5f5af33c8947f9ec63ff + 9f5cb3400f5877845decdddd2c17d57cf77f2202 diff --git a/eng/Versions.props b/eng/Versions.props index 932a00ae5..f65377789 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23479.55 - 6.0.318-servicing.23479.55 + 6.0.318-servicing.23479.69 + 6.0.318-servicing.23479.69 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24086fb71dd39bd42ddee1f3c05499774999398e Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 17:56:48 +0000 Subject: [PATCH 132/294] Merged PR 34148: [internal/release/frameshift/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.123 to 6.0.123 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.123-servicing.23479.10 to 6.0.123-servicing.23480.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.123 to 6.0.123 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) ... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index e4ad17f61..49478e17d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,17 +41,17 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8fe2fb57d..06ce9eb12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 819017e168bbcb9650a9504406f0d65b483b424c + d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 082ef34b8850ad9efedd43955188bec151c3ff79 + 1194051db6856c16088cb986345a62dcfa7d89fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 082ef34b8850ad9efedd43955188bec151c3ff79 + 1194051db6856c16088cb986345a62dcfa7d89fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index a00c3d73e..24277c346 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.123-servicing.23479.71 - 6.0.123-servicing.23479.71 + 6.0.123-servicing.23480.27 + 6.0.123-servicing.23480.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From 462a63808716c6525ede956568cdd8df6d25f575 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 17:58:22 +0000 Subject: [PATCH 133/294] Merged PR 34149: [internal/release/frameshift/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.415 to 6.0.415 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.415-rtm.23479.11 to 6.0.415-rtm.23480.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.415 to 6.0.415 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.P... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index a14489bf7..23ad3ebc8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,16 +41,16 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c06860d8..e4e428567 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 1b2b001a14ddb53823315e675b8d2936c9965918 + c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41584f8690a6d383db4c980ff4279dada7d1dd0a + fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 77d04c9bf..fae520d6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.415-servicing.23479.70 - 6.0.415-servicing.23479.70 + 6.0.415-servicing.23480.28 + 6.0.415-servicing.23480.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From df92e2d472598c60ecd99f7094f3ee05012a66bc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 30 Sep 2023 18:06:47 +0000 Subject: [PATCH 134/294] Merged PR 34152: [internal/release/frameshift/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.7 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.23-servicing.23479.5 to 6.0.23-servicing.23480.2 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.23-servicing.23479.20 to 6.0.23-servicing.23480.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.318-servicing.23479.12 to 6.0.318-servicing.23480.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.318 to 6.0.318 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.23-servicing.23479.10 to 6.0.23-servicing.23480.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.23 to 6.0.23 (parent: Microsoft.NET.Sdk) - **Microsoft.... --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++------ 3 files changed, 62 insertions(+), 62 deletions(-) diff --git a/NuGet.config b/NuGet.config index 64a1657f1..c8e5ee130 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,20 +7,20 @@ - + - + - + - + @@ -41,15 +41,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d79f3bb69..f0ac19843 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 24ec132b51329b9f434eba3fb7e64de570bc1017 + 5bb01c1a3fcf97da46862c28d5cca36b0e5142f6 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 - https://github.com/dotnet/runtime - 301ba1ee5d1cfff28a8866924733603f3adf4936 + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + e0f0de876a67755a2c6cd2dc730c13f5959bdea8 @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5e314b8223a8c80f6c9c08985e050b7aed06b0fa + bc25dd5d39fd057f7cb28acb5ad4d9e925a375de https://github.com/dotnet/test-templates @@ -92,34 +92,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c57972a193acf770588f8e8ef64cec082b27800c + 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 080adee382cb58e12355903e015f96891d78dad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f5cb3400f5877845decdddd2c17d57cf77f2202 + 080adee382cb58e12355903e015f96891d78dad4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 5589f30c2c75e37b50934791b7f98e26973b03c4 + a8ba4b39b59ca421254550010de48b33d7c7b57d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 95b3ee1f49936a0c9d22faee3d6a8f872e8c83ec + 2b6f0273734c631e1ecc8c503836d4fab840065b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index f65377789..053fce3fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.23-servicing.23479.10 + 6.0.23-servicing.23480.3 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 @@ -46,18 +46,18 @@ 6.0.23 6.0.23 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 - 6.0.23-servicing.23479.20 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 + 6.0.23-servicing.23480.7 0.2.0 - 6.0.318-servicing.23479.69 - 6.0.318-servicing.23479.69 + 6.0.318-servicing.23480.29 + 6.0.318-servicing.23480.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -68,8 +68,8 @@ - 6.0.23-servicing.23479.5 - 6.0.23-servicing.23479.5 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 6.0.23 @@ -78,8 +78,8 @@ - 6.0.23-servicing.23479.7 - 6.0.23-servicing.23479.7 + 6.0.23-servicing.23480.2 + 6.0.23-servicing.23480.2 6.0.23 6.0.23 From 6963d2d1e0eb7c42b773f62b1d34fe34a7182d17 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:18 +0000 Subject: [PATCH 135/294] Merged PR 34160: [internal/release/frameshift/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:972ce726-6675-4ba6-cadf-08dbbf3cebf2) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 972ce726-6675-4ba6-cadf-08dbbf3cebf2 - **Build**: 20230930.38 - **Date Produced**: October 1, 2023 1:52:12 AM UTC - **Commit**: bb5ae4829da51d315033bedb73116477b0390cd3 - **Branch**: refs/heads/internal/release/frameshift/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1] - **Microsoft.NET.Sdk**: [from 6.0.415-servicing.23480.28 to 6.0.415-servicing.23480.38][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCfe3cff583e&targetVersion=GCbb5ae4829d&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:972ce726-6675-4ba6-cadf-08dbbf3cebf2) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4e428567..05566786f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c2eaaa1ff778461cf69f1386b1f2b37d674a0ab0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 + bb5ae4829da51d315033bedb73116477b0390cd3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - fe3cff583e6d6ed33a4ccbf4eecbbe18d8743778 + bb5ae4829da51d315033bedb73116477b0390cd3 diff --git a/eng/Versions.props b/eng/Versions.props index fae520d6b..ef5eb1b77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.415-servicing.23480.28 - 6.0.415-servicing.23480.28 + 6.0.415-servicing.23480.38 + 6.0.415-servicing.23480.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bcbed60f06e45836728bb36dbb2ddfc52572b787 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:28 +0000 Subject: [PATCH 136/294] Merged PR 34162: [internal/release/frameshift/6.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:faa69491-4c9a-4477-752f-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: faa69491-4c9a-4477-752f-08dbbf92e774 - **Build**: 20230930.39 - **Date Produced**: October 1, 2023 1:52:26 AM UTC - **Commit**: 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 - **Branch**: refs/heads/internal/release/frameshift/6.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.318-servicing.23480.29 to 6.0.318-servicing.23480.39][1] - **Microsoft.NET.Sdk**: [from 6.0.318-servicing.23480.29 to 6.0.318-servicing.23480.39][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC080adee382&targetVersion=GC40c58ac25e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:faa69491-4c9a-4477-752f-08dbbf92e774) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f0ac19843..0c2c995c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 81b4aff895d7eaab61aa000a696f7bc79fc49b70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 080adee382cb58e12355903e015f96891d78dad4 + 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 080adee382cb58e12355903e015f96891d78dad4 + 40c58ac25e9fcb1bbee56a592918fc464f64a6e7 diff --git a/eng/Versions.props b/eng/Versions.props index 053fce3fc..90e7220b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.318-servicing.23480.29 - 6.0.318-servicing.23480.29 + 6.0.318-servicing.23480.39 + 6.0.318-servicing.23480.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a33389fcc17c512c4ce21b1cf88863aa55e7307a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:15:47 +0000 Subject: [PATCH 137/294] Merged PR 34161: [internal/release/frameshift/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:c1ce247f-982c-4c66-45be-08dbbf92e44a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: c1ce247f-982c-4c66-45be-08dbbf92e44a - **Build**: 20230930.40 - **Date Produced**: October 1, 2023 1:52:22 AM UTC - **Commit**: 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 - **Branch**: refs/heads/internal/release/frameshift/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.123-servicing.23480.27 to 6.0.123-servicing.23480.40][1] - **Microsoft.NET.Sdk**: [from 6.0.123-servicing.23480.27 to 6.0.123-servicing.23480.40][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC1194051db6&targetVersion=GC6fe8d6cc28&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:c1ce247f-982c-4c66-45be-08dbbf92e44a) --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06ce9eb12..b04700e60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating d0deccaa5039ef510feef0dbb63a63dcc88112f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1194051db6856c16088cb986345a62dcfa7d89fc + 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1194051db6856c16088cb986345a62dcfa7d89fc + 6fe8d6cc286d81d61d48c08b31e57d5a3eba1b22 diff --git a/eng/Versions.props b/eng/Versions.props index 24277c346..2eb7a5b93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,8 @@ - 6.0.123-servicing.23480.27 - 6.0.123-servicing.23480.27 + 6.0.123-servicing.23480.40 + 6.0.123-servicing.23480.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c97215789531577c81c203f54f4b03ca92ab771a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:23:03 +0000 Subject: [PATCH 138/294] Merged PR 34163: [internal/release/frameshift/7.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:80a7d8ee-cef6-47d1-9179-08dbbf3a441d) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: 80a7d8ee-cef6-47d1-9179-08dbbf3a441d - **Build**: 20230930.37 - **Date Produced**: October 1, 2023 2:01:44 AM UTC - **Commit**: 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - **Branch**: refs/heads/internal/release/frameshift/7.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.112 to 7.0.112][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] - **Microsoft.NET.Sdk**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.112-servicing.23479.66 to 7.0.112-servicing.23480.37][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8f60c1c695&targetVersion=GC152e97ccf0&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:80a7d8ee-cef6-47d1-9179-08dbbf3a441d) --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef9fc45aa..91f4d8984 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,8 @@ + + @@ -16,14 +18,18 @@ + + - + + + @@ -47,18 +53,24 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f417e14d7..5131222e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8f60c1c695ad668c81d635c22539c5abf864e7da + 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 diff --git a/eng/Versions.props b/eng/Versions.props index 3554f410a..e45ca64c0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.112 - 7.0.112-servicing.23479.66 - 7.0.112-servicing.23479.66 + 7.0.112-servicing.23480.37 + 7.0.112-servicing.23480.37 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 552bd6c89b07627bc57be1c07b59e0e2c8934207 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:24:36 +0000 Subject: [PATCH 139/294] Merged PR 34164: [internal/release/frameshift/7.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:d52de2a0-7c5a-452e-752b-08dbbf92e774) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: d52de2a0-7c5a-452e-752b-08dbbf92e774 - **Build**: 20230930.36 - **Date Produced**: October 1, 2023 2:06:09 AM UTC - **Commit**: f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - **Branch**: refs/heads/internal/release/frameshift/7.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.309 to 7.0.309][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] - **Microsoft.NET.Sdk**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.309-servicing.23479.68 to 7.0.309-servicing.23480.36][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC5a48ee0826&targetVersion=GCf44358c3c9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:d52de2a0-7c5a-452e-752b-08dbbf92e774) --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed994c9ec..618382a29 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,19 +11,25 @@ + + + + - + + + @@ -47,18 +53,24 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 63e35eae3..871ca7086 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5a48ee082690a5e3b6a0b51632071f89c2f8d725 + f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a diff --git a/eng/Versions.props b/eng/Versions.props index 70971a8cd..65750b4b4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.309 - 7.0.309-servicing.23479.68 - 7.0.309-servicing.23479.68 + 7.0.309-servicing.23480.36 + 7.0.309-servicing.23480.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 791db8e2d8adc71af53b20024f653182d86e320a Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sun, 1 Oct 2023 02:25:50 +0000 Subject: [PATCH 140/294] Merged PR 34165: [internal/release/frameshift/7.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ddb42dff-279e-4311-e70f-08dbbf42dcec) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ddb42dff-279e-4311-e70f-08dbbf42dcec - **Build**: 20230930.41 - **Date Produced**: October 1, 2023 2:07:45 AM UTC - **Commit**: 975080f3fa9503f43bd46bc0d99e7bb94481e778 - **Branch**: refs/heads/internal/release/frameshift/7.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 7.0.402 to 7.0.402][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 7.0.402-servicing.23479.67 to 7.0.402-servicing.23480.41][1] - **Microsoft.NET.Sdk**: [from 7.0.402-servicing.23479.67 to 7.0.402-servicing.23480.41][1] - **Microsoft.TemplateEngine.Cli**: [from 7.0.402-servicing.23479.67 to 7.0.402-servicing.23480.41][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC871597f816&targetVersion=GC975080f3fa&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ddb42dff-279e-4311-e70f-08dbbf42dcec) --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 23 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 81bd3eb80..bcc919063 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,19 +11,25 @@ + + + + - + + + @@ -47,18 +53,24 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08692ef7c..426838a47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 871597f816328549affc195fb2ab5620b3a578f5 + 975080f3fa9503f43bd46bc0d99e7bb94481e778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 871597f816328549affc195fb2ab5620b3a578f5 + 975080f3fa9503f43bd46bc0d99e7bb94481e778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 871597f816328549affc195fb2ab5620b3a578f5 + 975080f3fa9503f43bd46bc0d99e7bb94481e778 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 871597f816328549affc195fb2ab5620b3a578f5 + 975080f3fa9503f43bd46bc0d99e7bb94481e778 diff --git a/eng/Versions.props b/eng/Versions.props index 4d5c5bc79..9780d1887 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.402 - 7.0.402-servicing.23479.67 - 7.0.402-servicing.23479.67 + 7.0.402-servicing.23480.41 + 7.0.402-servicing.23480.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8db2da707c21f242d1a6c5a2bcc331f152828c9d Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:35 -0700 Subject: [PATCH 141/294] Update branding to 6.0.124 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d3d273fe2..476cea82c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 23 + 24 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 8bc78a3797571a573b60b68394441ae5b5d49ed6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:39 -0700 Subject: [PATCH 142/294] Update branding to 6.0.319 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index c09ac1668..c3fbc4677 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 18 + 19 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From b29045dcd48dbbf1944d5de492a12245900ea5f1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:44 -0700 Subject: [PATCH 143/294] Update branding to 6.0.416 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ff1a589ee..865235900 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 15 + 16 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From e30e5b6c742b0d03ce03240701066920bc617415 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:48 -0700 Subject: [PATCH 144/294] Update branding to 7.0.113 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 12b8f2cd7..8b8c44e4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 12 + 13 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 07b77653a1401edf61e0f8fed93c41c7705a1e26 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:52 -0700 Subject: [PATCH 145/294] Update branding to 7.0.310 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index aa10713a7..c062b2ed5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 09 + 10 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From a1e54c7f92ac4d9928a4e23ac5b41ee3cc1e4b5c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 3 Oct 2023 15:46:56 -0700 Subject: [PATCH 146/294] Update branding to 7.0.403 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index fd4d10f72..5f0ff3591 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 23c6cc482330c6a57fa6739740b45b4b633b1ec5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:13:57 +0000 Subject: [PATCH 147/294] [release/7.0.3xx] Update dependencies from dotnet/arcade (#17446) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc1a1596f..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aefc4f1b5..cef41663f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c062b2ed5..6fc67f8b1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23408.3 + 7.0.0-beta.23478.1 diff --git a/global.json b/global.json index bf1732f08..4a49aa951 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1" } } From 6ba901ffd7062d7f6cc5581ac5a888d141bbe444 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 4 Oct 2023 17:14:04 +0000 Subject: [PATCH 148/294] [release/7.0.4xx] Update dependencies from dotnet/arcade (#17445) [release/7.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index fc6bffb0f..6034dc65f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,14 @@ - - - - - @@ -44,15 +39,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b336bf629..6236790c3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 5f0ff3591..e167a5989 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23408.3 + 7.0.0-beta.23478.1 diff --git a/global.json b/global.json index bf1732f08..4a49aa951 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.111", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1" } } From 010d736face78c6a2cba5b00baa7732b385974e7 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 10 Oct 2023 15:41:29 -0700 Subject: [PATCH 149/294] .NET Source-Build 7.0.112 October 2023 Updates (#17495) --- 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 8b8c44e4a..22763d0dd 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.111 - 7.0.111 + 7.0.112 + 7.0.112 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 654f89210..ffceab958 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.111" + "dotnet": "7.0.112" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 0099fd01897eee2c6be5a0c41c8a8e9409bca0db Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 10 Oct 2023 18:51:41 -0700 Subject: [PATCH 150/294] .NET Source-Build 6.0.123 October 2023 Updates (#17494) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index bdb786486..c3c5ea3c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -174,7 +174,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.122 + 6.0.123 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index c832b0941..20e7bdc4c 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.122" + "dotnet": "6.0.123" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 8cf3bdf83c89c4764544f627f0e3501455046d8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 00:04:46 +0000 Subject: [PATCH 151/294] Update dependencies from https://github.com/dotnet/arcade build 20231011.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23478.1 -> To Version 7.0.0-beta.23511.9 --- NuGet.config | 28 ++++++++++++++++++---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index 618382a29..dfcd372fd 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,23 +11,27 @@ + + + - - - - - + + + + + + @@ -55,15 +59,16 @@ + + + - - - - - + + + @@ -71,6 +76,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e553d283e..c36de20dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 02f83148d..adb213dc3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23478.1 + 7.0.0-beta.23511.9 diff --git a/global.json b/global.json index 4a49aa951..07baaa447 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.111", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" } } From dd86243cf493cd9aaeee1835751bc9f80a0b1386 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 00:04:46 +0000 Subject: [PATCH 152/294] Update dependencies from https://github.com/dotnet/arcade build 20231011.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23478.1 -> To Version 7.0.0-beta.23511.9 --- NuGet.config | 28 ++++++++++++++++++---------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/NuGet.config b/NuGet.config index bcc919063..4175a7ddb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,23 +11,27 @@ + + + - - - - - + + + + + + @@ -55,15 +59,16 @@ + + + - - - - - + + + @@ -71,6 +76,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e35880cb5..f2fcfd3e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 6d7ba5913e94d6f3988f5c66fc57eb00e28b8561 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 19d9b9570..cb3e00d33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23478.1 + 7.0.0-beta.23511.9 diff --git a/global.json b/global.json index 4a49aa951..07baaa447 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.111", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23478.1", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23478.1" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" } } From 0aae0479bebaebd53e3fbdc6e7e82d335ae2255d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Oct 2023 15:13:23 +0000 Subject: [PATCH 153/294] Update dependencies from https://github.com/dotnet/arcade build 20231011.9 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23408.3 -> To Version 7.0.0-beta.23511.9 --- NuGet.config | 28 ++++++++++++---------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 22 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 91f4d8984..41be8fc16 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,6 @@ - - - @@ -17,17 +14,18 @@ - - - - - + + + + + + @@ -53,17 +51,12 @@ - - - - - - - - + + + @@ -71,6 +64,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5131222e8..d5c344a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 - + https://github.com/dotnet/arcade - 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 + acb831a5b31a3cc4a744a8944b6bd172e6969234 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index ced3fc748..8a3ac9bd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23408.3 + 7.0.0-beta.23511.9 diff --git a/global.json b/global.json index bf1732f08..07baaa447 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.110", + "dotnet": "7.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" } } From f756140b8eee50f121c7bf0644a5bc749c690c57 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 17:25:14 +0000 Subject: [PATCH 154/294] [release/6.0.4xx] Update dependencies from dotnet/arcade (#17516) [release/6.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 20 ++++++++- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/common/retain-build.ps1 | 45 +++++++++++++++++++++ eng/common/templates/steps/retain-build.yml | 28 +++++++++++++ global.json | 6 +-- 6 files changed, 101 insertions(+), 12 deletions(-) create mode 100644 eng/common/retain-build.ps1 create mode 100644 eng/common/templates/steps/retain-build.yml diff --git a/NuGet.config b/NuGet.config index 23ad3ebc8..9401b3f64 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - @@ -15,12 +14,21 @@ + + + + + + + + + @@ -41,15 +49,23 @@ - + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05566786f..688060474 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -197,19 +197,19 @@ - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 - + https://github.com/dotnet/arcade - 98fd22588fbb0f407faa6a74cb1aa79031306151 + 06ccd9430e2e3bd29a381a5b27e7976d11b0ed18 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f4ece0e92..fac630493 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 6.0.0-beta.23408.5 + 6.0.0-beta.23511.8 diff --git a/eng/common/retain-build.ps1 b/eng/common/retain-build.ps1 new file mode 100644 index 000000000..e7ba975ad --- /dev/null +++ b/eng/common/retain-build.ps1 @@ -0,0 +1,45 @@ + +Param( +[Parameter(Mandatory=$true)][int] $buildId, +[Parameter(Mandatory=$true)][string] $azdoOrgUri, +[Parameter(Mandatory=$true)][string] $azdoProject, +[Parameter(Mandatory=$true)][string] $token +) + +$ErrorActionPreference = 'Stop' +Set-StrictMode -Version 2.0 + +function Get-AzDOHeaders( + [string] $token) +{ + $base64AuthInfo = [Convert]::ToBase64String([Text.Encoding]::ASCII.GetBytes(":${token}")) + $headers = @{"Authorization"="Basic $base64AuthInfo"} + return $headers +} + +function Update-BuildRetention( + [string] $azdoOrgUri, + [string] $azdoProject, + [int] $buildId, + [string] $token) +{ + $headers = Get-AzDOHeaders -token $token + $requestBody = "{ + `"keepForever`": `"true`" + }" + + $requestUri = "${azdoOrgUri}/${azdoProject}/_apis/build/builds/${buildId}?api-version=6.0" + write-Host "Attempting to retain build using the following URI: ${requestUri} ..." + + try { + Invoke-RestMethod -Uri $requestUri -Method Patch -Body $requestBody -Header $headers -contentType "application/json" + Write-Host "Updated retention settings for build ${buildId}." + } + catch { + Write-Error "Failed to update retention settings for build: $_.Exception.Response.StatusDescription" + exit 1 + } +} + +Update-BuildRetention -azdoOrgUri $azdoOrgUri -azdoProject $azdoProject -buildId $buildId -token $token +exit 0 diff --git a/eng/common/templates/steps/retain-build.yml b/eng/common/templates/steps/retain-build.yml new file mode 100644 index 000000000..83d97a26a --- /dev/null +++ b/eng/common/templates/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/global.json b/global.json index 327cfe027..eeff7fa00 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.121", + "dotnet": "6.0.123", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23408.5", - "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23408.5" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.23511.8", + "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.23511.8" } } From 8df8de9bec6e793cd94ca8804ad2c1f2b80f9275 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:01:16 +0000 Subject: [PATCH 155/294] [release/7.0.4xx] Update dependencies from dotnet/arcade (#17531) [release/7.0.4xx] Update dependencies from dotnet/arcade --- NuGet.config | 36 ------------------------------------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4175a7ddb..6034dc65f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,32 +10,14 @@ - - - - - - - - - - - - - - - - - - @@ -57,29 +39,11 @@ - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2fcfd3e2..48ed74a1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 30e2ef0d2..c818b28a5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23511.9 + 7.0.0-beta.23513.2 diff --git a/global.json b/global.json index 07baaa447..97c00f8b7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23513.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23513.2" } } From 7b19e53bf2680043bb5e1036138b3bca9b29d11a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 20:01:22 +0000 Subject: [PATCH 156/294] [release/7.0.3xx] Update dependencies from dotnet/arcade (#17530) [release/7.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 36 ------------------------------------ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 45 deletions(-) diff --git a/NuGet.config b/NuGet.config index dfcd372fd..d288f50a2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,32 +10,14 @@ - - - - - - - - - - - - - - - - - - @@ -57,29 +39,11 @@ - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c36de20dc..88c09e5dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + 49ef9b336412d5bce043d4935166d8125a2e097d https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 349a148f3..51892008a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23511.9 + 7.0.0-beta.23513.2 diff --git a/global.json b/global.json index 07baaa447..97c00f8b7 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23513.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23513.2" } } From 000f90895857c434eb1be181d0eb6eb68da3f322 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:21:26 -0700 Subject: [PATCH 157/294] Update Windows SDK Projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From a7e0e0daac5311c134955e8205d31f7b37079b0b Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:24:02 -0700 Subject: [PATCH 158/294] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From 5b5d340010ffee9d33d876d4315ab0b59177a0f7 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:25:03 -0700 Subject: [PATCH 159/294] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From 3f50f78ff762da7e376331733bcc5c3a2df2f9fa Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:26:23 -0700 Subject: [PATCH 160/294] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From eee9b654202f333bd3cffa76cd818b16162652dd Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:27:27 -0700 Subject: [PATCH 161/294] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From 7217411d6a8d25a7753ede387cf4893157d52237 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Tue, 17 Oct 2023 11:28:36 -0700 Subject: [PATCH 162/294] Update Windows SDK projection --- eng/ManualVersions.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fb41f0bad..57a4b6415 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,11 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.29 - 10.0.18362.29 - 10.0.19041.29 - 10.0.20348.29 - 10.0.22000.29 - 10.0.22621.29 + 10.0.17763.31 + 10.0.18362.31 + 10.0.19041.31 + 10.0.20348.31 + 10.0.22000.31 + 10.0.22621.31 From aa942314ca16d7dbe2f93b4f346d0b91456e7d28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 20:02:01 +0000 Subject: [PATCH 163/294] Update dependencies from https://github.com/dotnet/arcade build 20231017.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23513.2 -> To Version 7.0.0-beta.23517.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88c09e5dd..a250a1bf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 51892008a..e7b66b011 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23513.2 + 7.0.0-beta.23517.4 diff --git a/global.json b/global.json index 97c00f8b7..07e79e2ed 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23513.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23513.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23517.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23517.4" } } From 136ffd159a12382938937ee62ca79201bbba05fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 20:02:01 +0000 Subject: [PATCH 164/294] Update dependencies from https://github.com/dotnet/arcade build 20231017.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23513.2 -> To Version 7.0.0-beta.23517.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48ed74a1e..cefbaee21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 - + https://github.com/dotnet/arcade - 49ef9b336412d5bce043d4935166d8125a2e097d + cb3ccc523ed844c82a63898ed3fa269680396f26 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index c818b28a5..265dfce08 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23513.2 + 7.0.0-beta.23517.4 diff --git a/global.json b/global.json index 97c00f8b7..07e79e2ed 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23513.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23513.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23517.4", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23517.4" } } From 24d19a86a7dff5a96f13f4d8588ad5f2b46f40ac Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Oct 2023 00:08:07 +0000 Subject: [PATCH 165/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.41 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.402 -> To Version 7.0.403 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 11 +++- eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 52 ++++++++--------- 3 files changed, 98 insertions(+), 89 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6034dc65f..3f913c706 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,17 +7,22 @@ - + + + + + + @@ -39,11 +44,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48ed74a1e..01bc7d5aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 https://github.com/dotnet/test-templates @@ -98,44 +98,44 @@ c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 975080f3fa9503f43bd46bc0d99e7bb94481e778 + 789e5c2f3e8238120bbaf6bf80572cd54bb1e118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 975080f3fa9503f43bd46bc0d99e7bb94481e778 + 789e5c2f3e8238120bbaf6bf80572cd54bb1e118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 975080f3fa9503f43bd46bc0d99e7bb94481e778 + 789e5c2f3e8238120bbaf6bf80572cd54bb1e118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 975080f3fa9503f43bd46bc0d99e7bb94481e778 + 789e5c2f3e8238120bbaf6bf80572cd54bb1e118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 75eafed7999075bca879940ad0b1a0794061ddb0 + b49dcfadfab4004b26d61bf228d48baf599ce6cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c94bac748138456f4feef271b3dc18e4b46453e6 + f3ff7ac9e44dedf252fd0cf06ffe66e171d8bfb5 - + https://github.com/dotnet/fsharp - 30bbce677c36d8b190c5400dd909ee45bef8ed48 + 67d3bb96b714d8f17d87876cc9f4afbe83afcf49 - + https://github.com/dotnet/fsharp - 30bbce677c36d8b190c5400dd909ee45bef8ed48 + 67d3bb96b714d8f17d87876cc9f4afbe83afcf49 - + https://github.com/microsoft/vstest - 76fea143ffe5e3883dcd04e0923b4b8e1e158145 + 604e7beeb3abe7e351a7bb5e507bea66d76a5888 @@ -144,18 +144,18 @@ linker - + https://github.com/dotnet/roslyn - 43b0b05cc4f492fd5de00f6f6717409091df8daa + a3b9f0c274649870015cfe508cacde8fdc15df55 - + https://github.com/dotnet/msbuild - 8ec440e684ef7834461f652276d5e8a88a132532 + 3ebbd7c4982d7df340366ef499e7bc5d85ef817e - + https://github.com/dotnet/msbuild - 8ec440e684ef7834461f652276d5e8a88a132532 + 3ebbd7c4982d7df340366ef499e7bc5d85ef817e @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index c818b28a5..e0fa39fe7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23478.3 + 7.0.13-servicing.23513.5 - 7.0.12-servicing.23478.2 + 7.0.13-servicing.23516.16 @@ -56,29 +56,29 @@ - 7.0.12 - 7.0.12 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 + 7.0.13 + 7.0.13 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 0.2.0 - 7.0.402 - 7.0.402-servicing.23480.41 - 7.0.402-servicing.23480.41 + 7.0.403 + 7.0.403-servicing.23517.41 + 7.0.403-servicing.23517.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23416.9 + 4.7.0-3.23469.2 @@ -86,20 +86,20 @@ - 7.0.12-servicing.23477.20 - 7.0.12-servicing.23477.20 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 + 7.0.13-servicing.23516.30 + 7.0.13-servicing.23516.30 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 2.1.0 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12 - 7.0.12 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13 + 7.0.13 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.1-release-23418-01 + 17.7.2-release-23423-01 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.11 - 7.0.11 + 7.0.13 + 7.0.13 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 53809c21eab09752e9b167334b864b6fd6002c5b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Oct 2023 00:13:22 +0000 Subject: [PATCH 166/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.112 -> To Version 7.0.113 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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 33 ++++--------- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 98 deletions(-) diff --git a/NuGet.config b/NuGet.config index 41be8fc16..332750ca8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,29 +7,22 @@ + + + - - - - + - - - - - - - - + @@ -51,23 +44,15 @@ + + - - - - + - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5c344a58..1ddaf82d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 + 17fdcf30b7838e184a0f381f9b33942a0f07a4d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 + 17fdcf30b7838e184a0f381f9b33942a0f07a4d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 + 17fdcf30b7838e184a0f381f9b33942a0f07a4d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 152e97ccf0f21e648f05b0c1f5e7b602bc1157c8 + 17fdcf30b7838e184a0f381f9b33942a0f07a4d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 75eafed7999075bca879940ad0b1a0794061ddb0 + b49dcfadfab4004b26d61bf228d48baf599ce6cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c94bac748138456f4feef271b3dc18e4b46453e6 + f3ff7ac9e44dedf252fd0cf06ffe66e171d8bfb5 https://github.com/dotnet/fsharp @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 8a3ac9bd0..58a15ca00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23478.3 + 7.0.13-servicing.23513.5 - 7.0.12-servicing.23478.2 + 7.0.13-servicing.23516.16 @@ -56,22 +56,22 @@ - 7.0.12 - 7.0.12 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 + 7.0.13 + 7.0.13 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 0.2.0 - 7.0.112 - 7.0.112-servicing.23480.37 - 7.0.112-servicing.23480.37 + 7.0.113 + 7.0.113-servicing.23517.43 + 7.0.113-servicing.23517.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,20 +82,20 @@ - 7.0.12-servicing.23477.20 - 7.0.12-servicing.23477.20 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 + 7.0.13-servicing.23516.30 + 7.0.13-servicing.23516.30 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 2.1.0 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12 - 7.0.12 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13 + 7.0.13 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.11 - 7.0.11 + 7.0.13 + 7.0.13 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 4705b63277c825b4ada9193fbe715673a9ae2b62 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Oct 2023 00:13:59 +0000 Subject: [PATCH 167/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.42 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.310 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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 ++++ eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 83 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index d288f50a2..4a9fd8ab9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,14 +10,19 @@ + + + + + @@ -39,11 +44,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88c09e5dd..6429429b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 018db428575093156be75c5bc20d33aebae33be4 + 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 4a824ef37caa51072221584c64cbf15455f406ca + 282d49406e510cf9aac323caafc9aa15fdbb456c @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 57512b49997283599b00a6b67d0ccebaec171daf + 466459f06622cdf9c3d036a52375cb271de22134 https://github.com/dotnet/test-templates @@ -98,31 +98,31 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a + 0380d41e80a8056a3cf92c3cccf229bf56e54766 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a + 0380d41e80a8056a3cf92c3cccf229bf56e54766 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a + 0380d41e80a8056a3cf92c3cccf229bf56e54766 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f44358c3c9bc40d6c1868d7004b8cfe8f4db3a7a + 0380d41e80a8056a3cf92c3cccf229bf56e54766 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 75eafed7999075bca879940ad0b1a0794061ddb0 + b49dcfadfab4004b26d61bf228d48baf599ce6cd - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c94bac748138456f4feef271b3dc18e4b46453e6 + f3ff7ac9e44dedf252fd0cf06ffe66e171d8bfb5 https://github.com/dotnet/fsharp @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 - + https://github.com/dotnet/emsdk - 79b01e47d43eeba5442af569770480696102972f + 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 51892008a..5dac2c6be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.12-servicing.23478.3 + 7.0.13-servicing.23513.5 - 7.0.12-servicing.23478.2 + 7.0.13-servicing.23516.16 @@ -56,22 +56,22 @@ - 7.0.12 - 7.0.12 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 - 7.0.12-servicing.23479.22 + 7.0.13 + 7.0.13 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 0.2.0 - 7.0.309 - 7.0.309-servicing.23480.36 - 7.0.309-servicing.23480.36 + 7.0.310 + 7.0.310-servicing.23517.42 + 7.0.310-servicing.23517.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.12-servicing.23477.20 - 7.0.12-servicing.23477.20 - 7.0.12 - 7.0.12 - 7.0.12 - 7.0.12 + 7.0.13-servicing.23516.30 + 7.0.13-servicing.23516.30 + 7.0.13 + 7.0.13 + 7.0.13 + 7.0.13 2.1.0 - 7.0.12-servicing.23478.2 - 7.0.12-servicing.23478.2 - 7.0.12 - 7.0.12 + 7.0.13-servicing.23517.4 + 7.0.13-servicing.23517.4 + 7.0.13 + 7.0.13 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.11 - 7.0.11 + 7.0.13 + 7.0.13 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 04962e30783af8d26f0fef53fe0d618e6d13a4d4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Oct 2023 03:22:59 +0000 Subject: [PATCH 168/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231017.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.310 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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- 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 4a9fd8ab9..54e83584a 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 6429429b7..8e8bc6611 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0380d41e80a8056a3cf92c3cccf229bf56e54766 + 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0380d41e80a8056a3cf92c3cccf229bf56e54766 + 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0380d41e80a8056a3cf92c3cccf229bf56e54766 + 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0380d41e80a8056a3cf92c3cccf229bf56e54766 + 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 diff --git a/eng/Versions.props b/eng/Versions.props index 5dac2c6be..ddf142319 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.310 - 7.0.310-servicing.23517.42 - 7.0.310-servicing.23517.42 + 7.0.310-servicing.23517.56 + 7.0.310-servicing.23517.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5efd38a9be659e29e9573c6447ac4b0ec02dd210 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 18 Oct 2023 08:35:57 +0000 Subject: [PATCH 169/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.402 -> To Version 7.0.403 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3f913c706..b9f91fe4c 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 01bc7d5aa..c2348b797 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 789e5c2f3e8238120bbaf6bf80572cd54bb1e118 + f51c93f484ff1ee59c77fa73dd0ddb49294f4bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 789e5c2f3e8238120bbaf6bf80572cd54bb1e118 + f51c93f484ff1ee59c77fa73dd0ddb49294f4bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 789e5c2f3e8238120bbaf6bf80572cd54bb1e118 + f51c93f484ff1ee59c77fa73dd0ddb49294f4bbf - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 789e5c2f3e8238120bbaf6bf80572cd54bb1e118 + f51c93f484ff1ee59c77fa73dd0ddb49294f4bbf @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - a3b9f0c274649870015cfe508cacde8fdc15df55 + 9d4cc0304792762c34f41cbbec67a1fcd2dc764f diff --git a/eng/Versions.props b/eng/Versions.props index e0fa39fe7..7c824126f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,15 +70,15 @@ 7.0.403 - 7.0.403-servicing.23517.41 - 7.0.403-servicing.23517.41 + 7.0.403-servicing.23518.6 + 7.0.403-servicing.23518.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23469.2 + 4.7.0-3.23517.17 From 3b8e5ee01323f3d60c486e523d68f56a04304932 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:08 -0700 Subject: [PATCH 170/294] Update branding to 6.0.320 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e5ac3afbe..709738fc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 3 - 19 + 20 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 40538ec51933b0f2c89113aab1f8a1440f6f2262 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:13 -0700 Subject: [PATCH 171/294] Update branding to 6.0.417 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d6f2ec0e6..dc111971f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 4 - 16 + 17 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From d9ec7ce28aa4d57f1d68646bd67dcb54f3cc98d4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:18 -0700 Subject: [PATCH 172/294] Update branding to 7.0.114 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a3ac9bd0..db0d3d0f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From db57dadd26077ebb5f5efb107ac1a5fe99c8c0b4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:23 -0700 Subject: [PATCH 173/294] Update branding to 7.0.311 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e7b66b011..7b760e184 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 10 + 11 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From cd038f1eda129fa5418b0bfe8a89b5d601024be8 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 18 Oct 2023 12:30:28 -0700 Subject: [PATCH 174/294] Update branding to 7.0.404 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 265dfce08..f036163be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From efb3be2368e30228fff7a436abf000fcd8bdcc35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 00:28:58 +0000 Subject: [PATCH 175/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.402 -> To Version 7.0.403 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- 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 b9f91fe4c..af2ccdc5c 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 c2348b797..66dc8da17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f51c93f484ff1ee59c77fa73dd0ddb49294f4bbf + 6f9f96c879c0a79f74c795eeaed208470544daf0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f51c93f484ff1ee59c77fa73dd0ddb49294f4bbf + 6f9f96c879c0a79f74c795eeaed208470544daf0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f51c93f484ff1ee59c77fa73dd0ddb49294f4bbf + 6f9f96c879c0a79f74c795eeaed208470544daf0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f51c93f484ff1ee59c77fa73dd0ddb49294f4bbf + 6f9f96c879c0a79f74c795eeaed208470544daf0 diff --git a/eng/Versions.props b/eng/Versions.props index 7c824126f..206019ab3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.403 - 7.0.403-servicing.23518.6 - 7.0.403-servicing.23518.6 + 7.0.403-servicing.23518.26 + 7.0.403-servicing.23518.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5047ef9061c89bef3bf466c4ed2c1e06ffd82717 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 00:47:08 +0000 Subject: [PATCH 176/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.309 -> To Version 7.0.311 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.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 54e83584a..fe24c296a 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 8e8bc6611..bc99e7fd1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 + d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 + d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 + d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8eab757f7d0ff50f3f32af0ef87cf1c7d62544f7 + d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b diff --git a/eng/Versions.props b/eng/Versions.props index ddf142319..16387a82b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.310 - 7.0.310-servicing.23517.56 - 7.0.310-servicing.23517.56 + 7.0.311 + 7.0.311-servicing.23518.32 + 7.0.311-servicing.23518.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9f96920572d6685205c9c0c2f9f54baef2cb6d67 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 01:35:56 +0000 Subject: [PATCH 177/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.402 -> To Version 7.0.404 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.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100 From Version 7.0.12 -> To Version 7.0.13 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index af2ccdc5c..5aaf3d527 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 66dc8da17..c3b723a78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ c2c77959527a597caf3d0351ea0d25c085fbb32c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f9f96c879c0a79f74c795eeaed208470544daf0 + ae8e740865f8da954a73862c4441d46c61caa3ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f9f96c879c0a79f74c795eeaed208470544daf0 + ae8e740865f8da954a73862c4441d46c61caa3ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f9f96c879c0a79f74c795eeaed208470544daf0 + ae8e740865f8da954a73862c4441d46c61caa3ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6f9f96c879c0a79f74c795eeaed208470544daf0 + ae8e740865f8da954a73862c4441d46c61caa3ac diff --git a/eng/Versions.props b/eng/Versions.props index 206019ab3..c4245d1be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.403 - 7.0.403-servicing.23518.26 - 7.0.403-servicing.23518.26 + 7.0.404 + 7.0.404-servicing.23518.35 + 7.0.404-servicing.23518.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b636ce332c0fafa1a665013ee1980be825099e8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 02:01:15 +0000 Subject: [PATCH 178/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.113 -> To Version 7.0.114 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 332750ca8..11f9f54c8 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 1ddaf82d6..7267f1db1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ aaaa0c1826f97a9dfcc67e94136bf01010b55f23 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fdcf30b7838e184a0f381f9b33942a0f07a4d4 + 10d6b299c176b132c1d331ff777f9845f96a08f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fdcf30b7838e184a0f381f9b33942a0f07a4d4 + 10d6b299c176b132c1d331ff777f9845f96a08f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fdcf30b7838e184a0f381f9b33942a0f07a4d4 + 10d6b299c176b132c1d331ff777f9845f96a08f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 17fdcf30b7838e184a0f381f9b33942a0f07a4d4 + 10d6b299c176b132c1d331ff777f9845f96a08f1 diff --git a/eng/Versions.props b/eng/Versions.props index baa9b845b..082136592 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.113 - 7.0.113-servicing.23517.43 - 7.0.113-servicing.23517.43 + 7.0.114 + 7.0.114-servicing.23518.31 + 7.0.114-servicing.23518.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c4db5f44783316ce4a7f622599db2f2f96aee15a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:33:46 +0000 Subject: [PATCH 179/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.46 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++------ eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5aaf3d527..8b9b67dd5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,13 +16,13 @@ - + - + - + @@ -47,12 +47,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f6b9f2aca..7dd190831 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae8e740865f8da954a73862c4441d46c61caa3ac + a14bdf31e0e6bc5b7a2ee99490c1470437019524 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae8e740865f8da954a73862c4441d46c61caa3ac + a14bdf31e0e6bc5b7a2ee99490c1470437019524 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae8e740865f8da954a73862c4441d46c61caa3ac + a14bdf31e0e6bc5b7a2ee99490c1470437019524 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ae8e740865f8da954a73862c4441d46c61caa3ac + a14bdf31e0e6bc5b7a2ee99490c1470437019524 diff --git a/eng/Versions.props b/eng/Versions.props index 1494ccb8d..ba99b4b90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23518.35 - 7.0.404-servicing.23518.35 + 7.0.404-servicing.23518.46 + 7.0.404-servicing.23518.46 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.13-servicing.23516.30 - 7.0.13-servicing.23516.30 + 7.0.13-servicing.23517.18 + 7.0.13-servicing.23517.18 7.0.13 7.0.13 7.0.13 @@ -96,10 +96,10 @@ - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.5 + 7.0.14-servicing.23518.5 + 7.0.14 + 7.0.14 From 7a5581ed81c76644c138b23b775d270d42703bd9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:36:05 +0000 Subject: [PATCH 180/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.113 -> To Version 7.0.114 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++------ eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index 11f9f54c8..a869d8259 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,13 +16,13 @@ - + - + - + @@ -47,12 +47,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7267f1db1..e09651edf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 10d6b299c176b132c1d331ff777f9845f96a08f1 + 318f5222add234db0f23405cef8fdf17e110ed11 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 10d6b299c176b132c1d331ff777f9845f96a08f1 + 318f5222add234db0f23405cef8fdf17e110ed11 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 10d6b299c176b132c1d331ff777f9845f96a08f1 + 318f5222add234db0f23405cef8fdf17e110ed11 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 10d6b299c176b132c1d331ff777f9845f96a08f1 + 318f5222add234db0f23405cef8fdf17e110ed11 diff --git a/eng/Versions.props b/eng/Versions.props index 082136592..5d33cc2a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.114 - 7.0.114-servicing.23518.31 - 7.0.114-servicing.23518.31 + 7.0.114-servicing.23518.44 + 7.0.114-servicing.23518.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.13-servicing.23516.30 - 7.0.13-servicing.23516.30 + 7.0.13-servicing.23517.18 + 7.0.13-servicing.23517.18 7.0.13 7.0.13 7.0.13 @@ -92,10 +92,10 @@ - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.5 + 7.0.14-servicing.23518.5 + 7.0.14 + 7.0.14 From bedf712c818dbcf28465a75df33d6c69add35de1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 03:36:40 +0000 Subject: [PATCH 181/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++------ eng/Version.Details.xml | 46 ++++++++++++++++++++--------------------- eng/Versions.props | 16 +++++++------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe24c296a..1bb6599c4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -16,13 +16,13 @@ - + - + - + @@ -47,12 +47,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 43ddee938..9be1d6bc7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5fd6832be77b5d7fbccc6a40aad12b11e5a3e1d9 + c70d936013055821b0e67e54f3dc413a8341744c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 282d49406e510cf9aac323caafc9aa15fdbb456c + 1fd68c0252f4fc5a75d25731f4407decd4aa218e @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d52fbb6701c62c8f6d5bbe57b8373cebbedf4e0b + 1eef08a93bc30f2f46e11a592ef19af2c618b728 diff --git a/eng/Versions.props b/eng/Versions.props index b1266a5da..250b8a02f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23518.32 - 7.0.311-servicing.23518.32 + 7.0.311-servicing.23518.45 + 7.0.311-servicing.23518.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.13-servicing.23516.30 - 7.0.13-servicing.23516.30 + 7.0.13-servicing.23517.18 + 7.0.13-servicing.23517.18 7.0.13 7.0.13 7.0.13 @@ -96,10 +96,10 @@ - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.5 + 7.0.14-servicing.23518.5 + 7.0.14 + 7.0.14 From 31e64b0fbdd0cd081009a9fc97812838ce94f0f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 04:38:20 +0000 Subject: [PATCH 182/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.61 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- 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 8b9b67dd5..56f212114 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 7dd190831..2640c18c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a14bdf31e0e6bc5b7a2ee99490c1470437019524 + 6a900ec40afdb44361bbd2ce9f2488220d3646f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a14bdf31e0e6bc5b7a2ee99490c1470437019524 + 6a900ec40afdb44361bbd2ce9f2488220d3646f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a14bdf31e0e6bc5b7a2ee99490c1470437019524 + 6a900ec40afdb44361bbd2ce9f2488220d3646f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a14bdf31e0e6bc5b7a2ee99490c1470437019524 + 6a900ec40afdb44361bbd2ce9f2488220d3646f8 diff --git a/eng/Versions.props b/eng/Versions.props index ba99b4b90..86da7630c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23518.46 - 7.0.404-servicing.23518.46 + 7.0.404-servicing.23518.61 + 7.0.404-servicing.23518.61 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ad876c0b5dcdd9de60b33b9274234367f9f141fe Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 04:41:41 +0000 Subject: [PATCH 183/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.62 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- 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 1bb6599c4..67fd2b0ed 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 9be1d6bc7..1d76f63d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1eef08a93bc30f2f46e11a592ef19af2c618b728 + 3c0f521024deeeb554b3992b5966a908db61fb36 diff --git a/eng/Versions.props b/eng/Versions.props index 250b8a02f..35c8377fb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23518.45 - 7.0.311-servicing.23518.45 + 7.0.311-servicing.23518.62 + 7.0.311-servicing.23518.62 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2954c33084c5aaa862033b8af0740ea544941bf9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 07:12:42 +0000 Subject: [PATCH 184/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231018.84 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,VS.Redist.Common.NetCore.SharedFramework.x64.7.0,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.13 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- 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 56f212114..25b051d30 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 2640c18c7..b0ebf1cbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a900ec40afdb44361bbd2ce9f2488220d3646f8 + 21298d5d7a540e3ca41cca75df44fb33e0d020bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a900ec40afdb44361bbd2ce9f2488220d3646f8 + 21298d5d7a540e3ca41cca75df44fb33e0d020bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a900ec40afdb44361bbd2ce9f2488220d3646f8 + 21298d5d7a540e3ca41cca75df44fb33e0d020bb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6a900ec40afdb44361bbd2ce9f2488220d3646f8 + 21298d5d7a540e3ca41cca75df44fb33e0d020bb diff --git a/eng/Versions.props b/eng/Versions.props index 86da7630c..be6df6776 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23518.61 - 7.0.404-servicing.23518.61 + 7.0.404-servicing.23518.84 + 7.0.404-servicing.23518.84 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ce6e592f2df738c3d79f3360768ddccfb956fad7 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Thu, 19 Oct 2023 12:37:19 -0500 Subject: [PATCH 185/294] Disable source build xml doc test (#17579) --- .../Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs index 00c0c2b79..f8f4f2c8b 100644 --- a/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs +++ b/src/SourceBuild/tarball/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/XmlDocTests.cs @@ -18,7 +18,8 @@ public class XmlDocTests : SmokeTests /// Verifies every targeting pack assembly has a xml doc file. /// There are exceptions which are specified in baselines/XmlDocIgnore.*.txt. /// - [Fact] + // Re-enable when fixing https://github.com/dotnet/source-build/issues/3660 + //[Fact] public void VerifyTargetingPacksHaveDoc() { List missingXmlDoc = new(); From 2e1335448eae235f87a0c289ec12bb3fd7e44fef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 23:25:09 +0000 Subject: [PATCH 186/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index 25b051d30..583e70546 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,19 @@ - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0ebf1cbb..238b1e0f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21298d5d7a540e3ca41cca75df44fb33e0d020bb + 88cf20dbc8b65f4033c68b0108fbb77151b00160 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21298d5d7a540e3ca41cca75df44fb33e0d020bb + 88cf20dbc8b65f4033c68b0108fbb77151b00160 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21298d5d7a540e3ca41cca75df44fb33e0d020bb + 88cf20dbc8b65f4033c68b0108fbb77151b00160 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 21298d5d7a540e3ca41cca75df44fb33e0d020bb + 88cf20dbc8b65f4033c68b0108fbb77151b00160 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b49dcfadfab4004b26d61bf228d48baf599ce6cd + fa26bf7ef8dfe0a7c6c88c265a53534b9adeb432 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f3ff7ac9e44dedf252fd0cf06ffe66e171d8bfb5 + 70b1ca685a72453aac47b4f6b6c8aefc1fba7cdb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index be6df6776..6fa18b64f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.13-servicing.23513.5 + 7.0.14-servicing.23518.4 - 7.0.13-servicing.23516.16 + 7.0.14-servicing.23518.12 @@ -56,13 +56,13 @@ - 7.0.13 - 7.0.13 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 + 7.0.14 + 7.0.14 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23518.84 - 7.0.404-servicing.23518.84 + 7.0.404-servicing.23519.55 + 7.0.404-servicing.23519.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.13-servicing.23517.18 - 7.0.13-servicing.23517.18 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.19 + 7.0.14-servicing.23518.19 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 2.1.0 - 7.0.14-servicing.23518.5 - 7.0.14-servicing.23518.5 + 7.0.14-servicing.23519.4 + 7.0.14-servicing.23519.4 7.0.14 7.0.14 From 9ea7744b1ad4f239dc2339138163f1f299cfb6f5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 23:27:17 +0000 Subject: [PATCH 187/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index 67fd2b0ed..6da99784a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,19 +10,19 @@ - + - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d76f63d8..37ddaa987 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c0f521024deeeb554b3992b5966a908db61fb36 + 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c0f521024deeeb554b3992b5966a908db61fb36 + 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c0f521024deeeb554b3992b5966a908db61fb36 + 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c0f521024deeeb554b3992b5966a908db61fb36 + 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b49dcfadfab4004b26d61bf228d48baf599ce6cd + fa26bf7ef8dfe0a7c6c88c265a53534b9adeb432 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f3ff7ac9e44dedf252fd0cf06ffe66e171d8bfb5 + 70b1ca685a72453aac47b4f6b6c8aefc1fba7cdb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 35c8377fb..ee64bb239 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.13-servicing.23513.5 + 7.0.14-servicing.23518.4 - 7.0.13-servicing.23516.16 + 7.0.14-servicing.23518.12 @@ -56,13 +56,13 @@ - 7.0.13 - 7.0.13 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 + 7.0.14 + 7.0.14 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23518.62 - 7.0.311-servicing.23518.62 + 7.0.311-servicing.23519.56 + 7.0.311-servicing.23519.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,18 +86,18 @@ - 7.0.13-servicing.23517.18 - 7.0.13-servicing.23517.18 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.19 + 7.0.14-servicing.23518.19 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 2.1.0 - 7.0.14-servicing.23518.5 - 7.0.14-servicing.23518.5 + 7.0.14-servicing.23519.4 + 7.0.14-servicing.23519.4 7.0.14 7.0.14 From aa467047dc056ec9c8c48eef98d8a4dd1518fda1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 19 Oct 2023 23:34:31 +0000 Subject: [PATCH 188/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.57 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.114 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,VS.Redist.Common.NetCore.SharedFramework.x64.7.0 From Version 7.0.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++---- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 38 +++++++++--------- 3 files changed, 70 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index a869d8259..9eb418d1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -16,13 +16,13 @@ - + - + - + @@ -44,15 +44,15 @@ - + - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e09651edf..9ed954568 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,44 +3,44 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c70d936013055821b0e67e54f3dc413a8341744c + 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1fd68c0252f4fc5a75d25731f4407decd4aa218e + 2527cb5f039d4ec799a3c61b4cab7723eff9be37 @@ -52,34 +52,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 8e9a17b2216f51a5788f8b1c467a4cf3b769e7d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 466459f06622cdf9c3d036a52375cb271de22134 + 6326dc6f72ee38752e59aab158cb54807c7adbfc https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 318f5222add234db0f23405cef8fdf17e110ed11 + 8acfc24b87e7241837c4f0d4d3257a0ed8256f29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 318f5222add234db0f23405cef8fdf17e110ed11 + 8acfc24b87e7241837c4f0d4d3257a0ed8256f29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 318f5222add234db0f23405cef8fdf17e110ed11 + 8acfc24b87e7241837c4f0d4d3257a0ed8256f29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 318f5222add234db0f23405cef8fdf17e110ed11 + 8acfc24b87e7241837c4f0d4d3257a0ed8256f29 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b49dcfadfab4004b26d61bf228d48baf599ce6cd + fa26bf7ef8dfe0a7c6c88c265a53534b9adeb432 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f3ff7ac9e44dedf252fd0cf06ffe66e171d8bfb5 + 70b1ca685a72453aac47b4f6b6c8aefc1fba7cdb https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5d33cc2a7..7893a7d19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.13-servicing.23513.5 + 7.0.14-servicing.23518.4 - 7.0.13-servicing.23516.16 + 7.0.14-servicing.23518.12 @@ -56,13 +56,13 @@ - 7.0.13 - 7.0.13 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 - 7.0.13-servicing.23517.4 + 7.0.14 + 7.0.14 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.6 0.2.0 @@ -70,8 +70,8 @@ 7.0.114 - 7.0.114-servicing.23518.44 - 7.0.114-servicing.23518.44 + 7.0.114-servicing.23519.57 + 7.0.114-servicing.23519.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,18 +82,18 @@ - 7.0.13-servicing.23517.18 - 7.0.13-servicing.23517.18 - 7.0.13 - 7.0.13 - 7.0.13 - 7.0.13 + 7.0.14-servicing.23518.19 + 7.0.14-servicing.23518.19 + 7.0.14 + 7.0.14 + 7.0.14 + 7.0.14 2.1.0 - 7.0.14-servicing.23518.5 - 7.0.14-servicing.23518.5 + 7.0.14-servicing.23519.4 + 7.0.14-servicing.23519.4 7.0.14 7.0.14 From 19631495693d58fb32fcd55e0fbeb8d2d80a67f3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:46:41 +0000 Subject: [PATCH 189/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.78 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.114 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.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9eb418d1f..9b3636cb2 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 9ed954568..4ca6017cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8acfc24b87e7241837c4f0d4d3257a0ed8256f29 + 15ca784d62fc19ab969ab9baa2f00863827cfeab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8acfc24b87e7241837c4f0d4d3257a0ed8256f29 + 15ca784d62fc19ab969ab9baa2f00863827cfeab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8acfc24b87e7241837c4f0d4d3257a0ed8256f29 + 15ca784d62fc19ab969ab9baa2f00863827cfeab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8acfc24b87e7241837c4f0d4d3257a0ed8256f29 + 15ca784d62fc19ab969ab9baa2f00863827cfeab @@ -163,13 +163,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 - + https://github.com/dotnet/emsdk - 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 7893a7d19..2abc78f4a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.114 - 7.0.114-servicing.23519.57 - 7.0.114-servicing.23519.57 + 7.0.114-servicing.23519.78 + 7.0.114-servicing.23519.78 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -82,8 +82,8 @@ - 7.0.14-servicing.23518.19 - 7.0.14-servicing.23518.19 + 7.0.14-servicing.23519.10 + 7.0.14-servicing.23519.10 7.0.14 7.0.14 7.0.14 @@ -228,8 +228,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.13 - 7.0.13 + 7.0.14 + 7.0.14 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From a563162348a7aef7fcb77db7129e45f61372c23f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:52:07 +0000 Subject: [PATCH 190/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.80 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 583e70546..5d6480d27 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 238b1e0f3..53fcb4177 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88cf20dbc8b65f4033c68b0108fbb77151b00160 + 1c047c5bb5f3ef9fe374ed7e19bc64ed9911a716 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88cf20dbc8b65f4033c68b0108fbb77151b00160 + 1c047c5bb5f3ef9fe374ed7e19bc64ed9911a716 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88cf20dbc8b65f4033c68b0108fbb77151b00160 + 1c047c5bb5f3ef9fe374ed7e19bc64ed9911a716 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 88cf20dbc8b65f4033c68b0108fbb77151b00160 + 1c047c5bb5f3ef9fe374ed7e19bc64ed9911a716 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 - + https://github.com/dotnet/emsdk - 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 6fa18b64f..dfe2595c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23519.55 - 7.0.404-servicing.23519.55 + 7.0.404-servicing.23519.80 + 7.0.404-servicing.23519.80 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.14-servicing.23518.19 - 7.0.14-servicing.23518.19 + 7.0.14-servicing.23519.10 + 7.0.14-servicing.23519.10 7.0.14 7.0.14 7.0.14 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.13 - 7.0.13 + 7.0.14 + 7.0.14 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From dfaab3bf57854ab72ce61d86fe682ba1fa8a7cdc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 05:52:56 +0000 Subject: [PATCH 191/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231019.79 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.14 -> To Version 7.0.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 +++++----- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 12 ++++++------ 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6da99784a..d7c53263a 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 37ddaa987..7a6bc7069 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 5775219ff811a6bb4f4d894bb980b6f4245bfc94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2527cb5f039d4ec799a3c61b4cab7723eff9be37 + 808851b07acfa1c5c94b0d4f9fb50debedb2df70 @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 + 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 + 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 + 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6695db9c2c20a3c7e767e25a4e5fc445ed5f7f93 + 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 - + https://github.com/dotnet/emsdk - 44da825cb96e08d28d258c5cda0ba14bbc4f91c3 + 942bfc8cb73e3cfea523cb0a2f08b415b2220358 https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index ee64bb239..df8f0360f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23519.56 - 7.0.311-servicing.23519.56 + 7.0.311-servicing.23519.79 + 7.0.311-servicing.23519.79 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,8 +86,8 @@ - 7.0.14-servicing.23518.19 - 7.0.14-servicing.23518.19 + 7.0.14-servicing.23519.10 + 7.0.14-servicing.23519.10 7.0.14 7.0.14 7.0.14 @@ -231,8 +231,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.13 - 7.0.13 + 7.0.14 + 7.0.14 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 60a841e00eaf1c036dde567e9b5979b1eef533a5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 18:18:17 +0000 Subject: [PATCH 192/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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.14 -> To Version 7.0.14 (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 5d6480d27..2e5d5afe8 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 53fcb4177..722eabe18 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c047c5bb5f3ef9fe374ed7e19bc64ed9911a716 + c5935a169a9a1461a515865b865c271f506bf798 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c047c5bb5f3ef9fe374ed7e19bc64ed9911a716 + c5935a169a9a1461a515865b865c271f506bf798 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c047c5bb5f3ef9fe374ed7e19bc64ed9911a716 + c5935a169a9a1461a515865b865c271f506bf798 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c047c5bb5f3ef9fe374ed7e19bc64ed9911a716 + c5935a169a9a1461a515865b865c271f506bf798 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fa26bf7ef8dfe0a7c6c88c265a53534b9adeb432 + 89f5db690a92e446dbb6eb1906d52788df1fe9a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 70b1ca685a72453aac47b4f6b6c8aefc1fba7cdb + e025c534b87f516425890f1401d052141898a574 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index dfe2595c2..c4a649902 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23518.4 + 7.0.14-servicing.23519.5 - 7.0.14-servicing.23518.12 + 7.0.14-servicing.23519.12 @@ -58,11 +58,11 @@ 7.0.14 7.0.14 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 0.2.0 @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23519.80 - 7.0.404-servicing.23519.80 + 7.0.404-servicing.23520.14 + 7.0.404-servicing.23520.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23519.4 - 7.0.14-servicing.23519.4 + 7.0.14-servicing.23519.19 + 7.0.14-servicing.23519.19 7.0.14 7.0.14 From 9b51b65fb383eb938beab1e883d3bd80950b6935 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 18:18:37 +0000 Subject: [PATCH 193/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.14 -> To Version 7.0.14 (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 d7c53263a..be9a513b9 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 7a6bc7069..e8c914cc6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 + d090ca31701d19e9c15a0da90695a70dbddca74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 + d090ca31701d19e9c15a0da90695a70dbddca74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 + d090ca31701d19e9c15a0da90695a70dbddca74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4f8ecaad5ba4d24317cd9f26689466f192e2eec8 + d090ca31701d19e9c15a0da90695a70dbddca74f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fa26bf7ef8dfe0a7c6c88c265a53534b9adeb432 + 89f5db690a92e446dbb6eb1906d52788df1fe9a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 70b1ca685a72453aac47b4f6b6c8aefc1fba7cdb + e025c534b87f516425890f1401d052141898a574 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index df8f0360f..48a944016 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23518.4 + 7.0.14-servicing.23519.5 - 7.0.14-servicing.23518.12 + 7.0.14-servicing.23519.12 @@ -58,11 +58,11 @@ 7.0.14 7.0.14 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 0.2.0 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23519.79 - 7.0.311-servicing.23519.79 + 7.0.311-servicing.23520.13 + 7.0.311-servicing.23520.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23519.4 - 7.0.14-servicing.23519.4 + 7.0.14-servicing.23519.19 + 7.0.14-servicing.23519.19 7.0.14 7.0.14 From 08bff87970c23543687d3c0a1fece077c8d453a6 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 18:18:58 +0000 Subject: [PATCH 194/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.114 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.14 -> To Version 7.0.14 (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 9b3636cb2..44f05dea9 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 4ca6017cf..0b362b7b5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5775219ff811a6bb4f4d894bb980b6f4245bfc94 + 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 6326dc6f72ee38752e59aab158cb54807c7adbfc + 523c17fe7c87ab56a50214d7ed8685ceb8752f30 https://github.com/dotnet/test-templates @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 15ca784d62fc19ab969ab9baa2f00863827cfeab + c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 15ca784d62fc19ab969ab9baa2f00863827cfeab + c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 15ca784d62fc19ab969ab9baa2f00863827cfeab + c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 15ca784d62fc19ab969ab9baa2f00863827cfeab + c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fa26bf7ef8dfe0a7c6c88c265a53534b9adeb432 + 89f5db690a92e446dbb6eb1906d52788df1fe9a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 70b1ca685a72453aac47b4f6b6c8aefc1fba7cdb + e025c534b87f516425890f1401d052141898a574 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2abc78f4a..4da0e9234 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23518.4 + 7.0.14-servicing.23519.5 - 7.0.14-servicing.23518.12 + 7.0.14-servicing.23519.12 @@ -58,11 +58,11 @@ 7.0.14 7.0.14 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 - 7.0.14-servicing.23519.6 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 + 7.0.14-servicing.23519.18 0.2.0 @@ -70,8 +70,8 @@ 7.0.114 - 7.0.114-servicing.23519.78 - 7.0.114-servicing.23519.78 + 7.0.114-servicing.23520.12 + 7.0.114-servicing.23520.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.14-servicing.23519.4 - 7.0.14-servicing.23519.4 + 7.0.14-servicing.23519.19 + 7.0.14-servicing.23519.19 7.0.14 7.0.14 From 5ef17dd4596830db7068cc157847d202a8d4821f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 20:51:16 +0000 Subject: [PATCH 195/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 --- 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 2e5d5afe8..7ec97320c 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 722eabe18..4a36a465b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5935a169a9a1461a515865b865c271f506bf798 + 04a30ae06ea482ca48a411efe7229a000fa82ed7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5935a169a9a1461a515865b865c271f506bf798 + 04a30ae06ea482ca48a411efe7229a000fa82ed7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5935a169a9a1461a515865b865c271f506bf798 + 04a30ae06ea482ca48a411efe7229a000fa82ed7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5935a169a9a1461a515865b865c271f506bf798 + 04a30ae06ea482ca48a411efe7229a000fa82ed7 diff --git a/eng/Versions.props b/eng/Versions.props index c4a649902..2d2a90eb2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23520.14 - 7.0.404-servicing.23520.14 + 7.0.404-servicing.23520.24 + 7.0.404-servicing.23520.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f91d5e9b77e155ffcfc122e8c47daeae99bbd10b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 21:26:53 +0000 Subject: [PATCH 196/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.114 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.14 -> To Version 7.0.14 (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 44f05dea9..d4de2a518 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 0b362b7b5..43bd1cbd7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f + 548bea6370da8299abae2fae2c5189cc856e7e26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f + 548bea6370da8299abae2fae2c5189cc856e7e26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f + 548bea6370da8299abae2fae2c5189cc856e7e26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c0588dbf16ddf7f955e4c2cebbf75f5d92ad4f6f + 548bea6370da8299abae2fae2c5189cc856e7e26 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 89f5db690a92e446dbb6eb1906d52788df1fe9a1 + 3cf1ad1e72ee7a06055165309a5b38081e91d9a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e025c534b87f516425890f1401d052141898a574 + 00ce9eab67537c1e291e8a7699323b86263803ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 4da0e9234..5a39499b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23519.5 + 7.0.14-servicing.23519.17 - 7.0.14-servicing.23519.12 + 7.0.14-servicing.23519.17 @@ -70,8 +70,8 @@ 7.0.114 - 7.0.114-servicing.23520.12 - 7.0.114-servicing.23520.12 + 7.0.114-servicing.23520.36 + 7.0.114-servicing.23520.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.14-servicing.23519.19 - 7.0.14-servicing.23519.19 + 7.0.14-servicing.23520.4 + 7.0.14-servicing.23520.4 7.0.14 7.0.14 From 550dd1a2bd16230cb91b60b6d1ad0b9d5dfe69a3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 21:33:41 +0000 Subject: [PATCH 197/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.35 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.14 -> To Version 7.0.14 (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 be9a513b9..e36b3ed0c 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 e8c914cc6..9d7878265 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d090ca31701d19e9c15a0da90695a70dbddca74f + c9c85c170a95b935a191087db36d021b88a84074 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d090ca31701d19e9c15a0da90695a70dbddca74f + c9c85c170a95b935a191087db36d021b88a84074 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d090ca31701d19e9c15a0da90695a70dbddca74f + c9c85c170a95b935a191087db36d021b88a84074 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d090ca31701d19e9c15a0da90695a70dbddca74f + c9c85c170a95b935a191087db36d021b88a84074 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 89f5db690a92e446dbb6eb1906d52788df1fe9a1 + 3cf1ad1e72ee7a06055165309a5b38081e91d9a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e025c534b87f516425890f1401d052141898a574 + 00ce9eab67537c1e291e8a7699323b86263803ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 48a944016..0e06c3ed3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23519.5 + 7.0.14-servicing.23519.17 - 7.0.14-servicing.23519.12 + 7.0.14-servicing.23519.17 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23520.13 - 7.0.311-servicing.23520.13 + 7.0.311-servicing.23520.35 + 7.0.311-servicing.23520.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23519.19 - 7.0.14-servicing.23519.19 + 7.0.14-servicing.23520.4 + 7.0.14-servicing.23520.4 7.0.14 7.0.14 From e7298414b808da2ae22bf0996df044ffb84f8d50 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 21:51:08 +0000 Subject: [PATCH 198/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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.14 -> To Version 7.0.14 (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 7ec97320c..d697a66c7 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 4a36a465b..467781978 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 4d41e1b09cb8aa1d03d23d98438c5e8761c8060b + cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04a30ae06ea482ca48a411efe7229a000fa82ed7 + 2cc2563e415051d6454568a35ad9d40308e22b50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04a30ae06ea482ca48a411efe7229a000fa82ed7 + 2cc2563e415051d6454568a35ad9d40308e22b50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04a30ae06ea482ca48a411efe7229a000fa82ed7 + 2cc2563e415051d6454568a35ad9d40308e22b50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04a30ae06ea482ca48a411efe7229a000fa82ed7 + 2cc2563e415051d6454568a35ad9d40308e22b50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 89f5db690a92e446dbb6eb1906d52788df1fe9a1 + 3cf1ad1e72ee7a06055165309a5b38081e91d9a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e025c534b87f516425890f1401d052141898a574 + 00ce9eab67537c1e291e8a7699323b86263803ec https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 2d2a90eb2..1fb13f02a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23519.5 + 7.0.14-servicing.23519.17 - 7.0.14-servicing.23519.12 + 7.0.14-servicing.23519.17 @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23520.24 - 7.0.404-servicing.23520.24 + 7.0.404-servicing.23520.40 + 7.0.404-servicing.23520.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23519.19 - 7.0.14-servicing.23519.19 + 7.0.14-servicing.23520.4 + 7.0.14-servicing.23520.4 7.0.14 7.0.14 From 45e44789d4c1059a990c15a39b49222a73dfcfe2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 20 Oct 2023 23:04:09 +0000 Subject: [PATCH 199/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.44 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 --- 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 d697a66c7..2b8e41269 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 467781978..5a8a351b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cc2563e415051d6454568a35ad9d40308e22b50 + e5910410beeb3891645e1bc49e56317ab1b0c834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cc2563e415051d6454568a35ad9d40308e22b50 + e5910410beeb3891645e1bc49e56317ab1b0c834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cc2563e415051d6454568a35ad9d40308e22b50 + e5910410beeb3891645e1bc49e56317ab1b0c834 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2cc2563e415051d6454568a35ad9d40308e22b50 + e5910410beeb3891645e1bc49e56317ab1b0c834 diff --git a/eng/Versions.props b/eng/Versions.props index 1fb13f02a..46efbf5c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23520.40 - 7.0.404-servicing.23520.40 + 7.0.404-servicing.23520.44 + 7.0.404-servicing.23520.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 239eadcbfc62a85b02a4b51b95bc32ebee3e9d35 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 21 Oct 2023 03:10:49 +0000 Subject: [PATCH 200/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.56 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.114 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.14 -> To Version 7.0.14 (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 d4de2a518..2b9dce13f 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 43bd1cbd7..f34ed98e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 548bea6370da8299abae2fae2c5189cc856e7e26 + 0b9e9a9369deafc905a483db1784a617a10e5235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 548bea6370da8299abae2fae2c5189cc856e7e26 + 0b9e9a9369deafc905a483db1784a617a10e5235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 548bea6370da8299abae2fae2c5189cc856e7e26 + 0b9e9a9369deafc905a483db1784a617a10e5235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 548bea6370da8299abae2fae2c5189cc856e7e26 + 0b9e9a9369deafc905a483db1784a617a10e5235 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3cf1ad1e72ee7a06055165309a5b38081e91d9a1 + f1570f38b63db12bfd8714a942ec33de2275edf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 00ce9eab67537c1e291e8a7699323b86263803ec + 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 5a39499b6..e59d33a91 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23519.17 + 7.0.14-servicing.23520.9 - 7.0.14-servicing.23519.17 + 7.0.14-servicing.23520.2 @@ -70,8 +70,8 @@ 7.0.114 - 7.0.114-servicing.23520.36 - 7.0.114-servicing.23520.36 + 7.0.114-servicing.23520.56 + 7.0.114-servicing.23520.56 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,8 +92,8 @@ - 7.0.14-servicing.23520.4 - 7.0.14-servicing.23520.4 + 7.0.14-servicing.23520.7 + 7.0.14-servicing.23520.7 7.0.14 7.0.14 From 51a1a5b8e42bef78d5961c0e42256b89f9b23e11 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 21 Oct 2023 03:13:18 +0000 Subject: [PATCH 201/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.57 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.14 -> To Version 7.0.14 (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 e36b3ed0c..5845bd0c1 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 9d7878265..5c68a51f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c85c170a95b935a191087db36d021b88a84074 + 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c85c170a95b935a191087db36d021b88a84074 + 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c85c170a95b935a191087db36d021b88a84074 + 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c9c85c170a95b935a191087db36d021b88a84074 + 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3cf1ad1e72ee7a06055165309a5b38081e91d9a1 + f1570f38b63db12bfd8714a942ec33de2275edf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 00ce9eab67537c1e291e8a7699323b86263803ec + 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0e06c3ed3..68fa70689 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23519.17 + 7.0.14-servicing.23520.9 - 7.0.14-servicing.23519.17 + 7.0.14-servicing.23520.2 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23520.35 - 7.0.311-servicing.23520.35 + 7.0.311-servicing.23520.57 + 7.0.311-servicing.23520.57 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23520.4 - 7.0.14-servicing.23520.4 + 7.0.14-servicing.23520.7 + 7.0.14-servicing.23520.7 7.0.14 7.0.14 From e94cfcdac31aab6b1ef22f7f2ebf4ec8c7e411ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 21 Oct 2023 03:13:57 +0000 Subject: [PATCH 202/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231020.58 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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.14 -> To Version 7.0.14 (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 2b8e41269..fdb2f33d6 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 5a8a351b4..39ce28f73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,19 +3,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - cb8b6323cf6e3ce563d955e8fb7c51afc0c3873e + 496fa854ae2f96619af99b5256fde77bc1a58f36 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -100,29 +100,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5910410beeb3891645e1bc49e56317ab1b0c834 + c89bb58ffd933eb85215513a71604f1f3b71456d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5910410beeb3891645e1bc49e56317ab1b0c834 + c89bb58ffd933eb85215513a71604f1f3b71456d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5910410beeb3891645e1bc49e56317ab1b0c834 + c89bb58ffd933eb85215513a71604f1f3b71456d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e5910410beeb3891645e1bc49e56317ab1b0c834 + c89bb58ffd933eb85215513a71604f1f3b71456d - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3cf1ad1e72ee7a06055165309a5b38081e91d9a1 + f1570f38b63db12bfd8714a942ec33de2275edf6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 00ce9eab67537c1e291e8a7699323b86263803ec + 8784c26bc219f5b75f1315e1b6b7c1da924d5e32 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 46efbf5c7..09ff05e50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,11 +37,11 @@ - 7.0.14-servicing.23519.17 + 7.0.14-servicing.23520.9 - 7.0.14-servicing.23519.17 + 7.0.14-servicing.23520.2 @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23520.44 - 7.0.404-servicing.23520.44 + 7.0.404-servicing.23520.58 + 7.0.404-servicing.23520.58 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.14-servicing.23520.4 - 7.0.14-servicing.23520.4 + 7.0.14-servicing.23520.7 + 7.0.14-servicing.23520.7 7.0.14 7.0.14 From 439787a08dfd2e14e8e9bec21179725260da1e57 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 23 Oct 2023 22:43:10 +0000 Subject: [PATCH 203/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 --- 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 fdb2f33d6..199b5af38 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 39ce28f73..29c635bf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c89bb58ffd933eb85215513a71604f1f3b71456d + f3a798e58491389e895d6c28a205588a8e094f8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c89bb58ffd933eb85215513a71604f1f3b71456d + f3a798e58491389e895d6c28a205588a8e094f8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c89bb58ffd933eb85215513a71604f1f3b71456d + f3a798e58491389e895d6c28a205588a8e094f8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c89bb58ffd933eb85215513a71604f1f3b71456d + f3a798e58491389e895d6c28a205588a8e094f8f diff --git a/eng/Versions.props b/eng/Versions.props index 09ff05e50..f6eb24a3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23520.58 - 7.0.404-servicing.23520.58 + 7.0.404-servicing.23523.20 + 7.0.404-servicing.23523.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 187a52457d023bf844b79a233c1c1b00846c48df Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:19:13 +0000 Subject: [PATCH 204/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.39 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.404 -> To Version 7.0.404 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.14 -> To Version 7.0.14 (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 199b5af38..2ea15b3fa 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 29c635bf5..dffc995b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3a798e58491389e895d6c28a205588a8e094f8f + 9c9a004b724e438d299dabbe3e202d03e5eb996b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3a798e58491389e895d6c28a205588a8e094f8f + 9c9a004b724e438d299dabbe3e202d03e5eb996b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3a798e58491389e895d6c28a205588a8e094f8f + 9c9a004b724e438d299dabbe3e202d03e5eb996b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f3a798e58491389e895d6c28a205588a8e094f8f + 9c9a004b724e438d299dabbe3e202d03e5eb996b diff --git a/eng/Versions.props b/eng/Versions.props index f6eb24a3f..2b7df6e89 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.14 7.0.14 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 0.2.0 @@ -70,8 +70,8 @@ 7.0.404 - 7.0.404-servicing.23523.20 - 7.0.404-servicing.23523.20 + 7.0.404-servicing.23523.39 + 7.0.404-servicing.23523.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b37293dece9ad6091d9865437d9b8728871df970 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:19:30 +0000 Subject: [PATCH 205/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.36 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.114 -> To Version 7.0.114 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.14 -> To Version 7.0.14 (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 2b9dce13f..d195ba1ca 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 f34ed98e5..d050c2f90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b9e9a9369deafc905a483db1784a617a10e5235 + 5a4609a27acc779cb68107922b00418cc6b907a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b9e9a9369deafc905a483db1784a617a10e5235 + 5a4609a27acc779cb68107922b00418cc6b907a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b9e9a9369deafc905a483db1784a617a10e5235 + 5a4609a27acc779cb68107922b00418cc6b907a9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0b9e9a9369deafc905a483db1784a617a10e5235 + 5a4609a27acc779cb68107922b00418cc6b907a9 diff --git a/eng/Versions.props b/eng/Versions.props index e59d33a91..c901df531 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.14 7.0.14 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 0.2.0 @@ -70,8 +70,8 @@ 7.0.114 - 7.0.114-servicing.23520.56 - 7.0.114-servicing.23520.56 + 7.0.114-servicing.23523.36 + 7.0.114-servicing.23523.36 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7d8cb778315cc3a6edd42f04718cb0486b8be73b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 24 Oct 2023 02:19:49 +0000 Subject: [PATCH 206/294] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20231023.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.311 -> To Version 7.0.311 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.14 -> To Version 7.0.14 (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 5845bd0c1..6826d6846 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 5c68a51f7..82c91a189 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,32 +54,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 523c17fe7c87ab56a50214d7ed8685ceb8752f30 + 0a715692d8e2536c899faa0bb4f0cec2c2e33e36 https://github.com/dotnet/test-templates @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b + c4047673ed10f28cc58ad806c54e25037b0469d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b + c4047673ed10f28cc58ad806c54e25037b0469d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b + c4047673ed10f28cc58ad806c54e25037b0469d8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1aeeb83bf2bcdf717b8c5258d5da8be46821f80b + c4047673ed10f28cc58ad806c54e25037b0469d8 diff --git a/eng/Versions.props b/eng/Versions.props index 68fa70689..7409139b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -58,11 +58,11 @@ 7.0.14 7.0.14 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 - 7.0.14-servicing.23519.18 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 + 7.0.14-servicing.23523.16 0.2.0 @@ -70,8 +70,8 @@ 7.0.311 - 7.0.311-servicing.23520.57 - 7.0.311-servicing.23520.57 + 7.0.311-servicing.23523.38 + 7.0.311-servicing.23523.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 69ac6e37a24f5f9f7fc52daf0ff97b6d47fadcae Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Tue, 24 Oct 2023 13:50:26 -0700 Subject: [PATCH 207/294] .NET Source-Build 7.0.113 October 2023 Updates (#17619) --- 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 db0d3d0f6..00d2d4fa1 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.112 - 7.0.112 + 7.0.113 + 7.0.113 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index ffceab958..ddd27f661 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.112" + "dotnet": "7.0.113" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From b172abdaa2b06ef09aa0bfd22c1a8006378f0e00 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 26 Oct 2023 12:37:47 +0000 Subject: [PATCH 208/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbfd3a625..6c915ca5c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783b33db9..0f7dd679b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -209,18 +209,18 @@ - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + a57022b44f3ff23de925530ea1d27da9701aed57 - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + a57022b44f3ff23de925530ea1d27da9701aed57 - + https://github.com/dotnet/arcade - 39042b4048580366d35a7c1c4f4ce8fc0dbea4b4 + a57022b44f3ff23de925530ea1d27da9701aed57 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f08343dc9..cb97ca4f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23516.4 + 8.0.0-beta.23525.4 diff --git a/global.json b/global.json index 10f733dd5..687a1eecb 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23516.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23516.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23525.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23525.4" } } From 69e95272a087bc5b7eeaa531e79768d9c60b1207 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 26 Oct 2023 23:06:00 -0700 Subject: [PATCH 209/294] Add dotnet-sdk feed --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 6c915ca5c..834cc6d03 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,6 +18,7 @@ + From 9213b80018e4ac5195565f27c6e1a5d87842f542 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Oct 2023 12:33:40 +0000 Subject: [PATCH 210/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 834cc6d03..6c915ca5c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -18,7 +18,6 @@ - From 25c6126bf73d0e1ab0db801c13599952c3ab57f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Oct 2023 18:15:33 +0000 Subject: [PATCH 211/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From be929940dd9e5cc13c05fa88d5f43b6157650741 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Oct 2023 12:34:31 +0000 Subject: [PATCH 212/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 6c915ca5c..86c66fadb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + From 4a05b3622fce277f0e7c6a18df226043de42f7fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Oct 2023 12:32:48 +0000 Subject: [PATCH 213/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From 3f1748fcbd7fd876404ec85fedb511a97e334873 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Oct 2023 10:32:56 +0000 Subject: [PATCH 214/294] Update dependencies from https://github.com/dotnet/test-templates build 20231030.1 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23417.1 -> To Version 1.1.0-rc.23530.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cefbaee21..c5ddb5608 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - c2c77959527a597caf3d0351ea0d25c085fbb32c + d27a1ffbea55634dfc57156b2d425416cbf1671d - + https://github.com/dotnet/test-templates - c2c77959527a597caf3d0351ea0d25c085fbb32c + d27a1ffbea55634dfc57156b2d425416cbf1671d - + https://github.com/dotnet/test-templates - c2c77959527a597caf3d0351ea0d25c085fbb32c + d27a1ffbea55634dfc57156b2d425416cbf1671d diff --git a/eng/Versions.props b/eng/Versions.props index f036163be..d89f0a639 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23417.1 - 1.1.0-rc.23417.1 - 1.1.0-rc.23417.1 + 1.1.0-rc.23530.1 + 1.1.0-rc.23530.1 + 1.1.0-rc.23530.1 From c4a5756822260bb436d226dab26acc3e83d2e811 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Oct 2023 12:28:26 +0000 Subject: [PATCH 215/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 86c66fadb..db834a348 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + From 38c18560641c8313927c8c0aa28a2fd6f2c5a3cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 31 Oct 2023 12:36:52 +0000 Subject: [PATCH 216/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index db834a348..1364722e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,6 +8,7 @@ + From 9e86ecb94063bbd2640b7de5708b8907d83aafe8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Nov 2023 12:36:27 +0000 Subject: [PATCH 217/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From 2850cac87d198ac6ef63706c317a608aabef49aa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Nov 2023 12:32:17 +0000 Subject: [PATCH 218/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From 186bcd5e4da6a91eb3ca60593393fbe5b2c88f8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 Nov 2023 12:33:22 +0000 Subject: [PATCH 219/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From a28ad7a81b8d2619e1eb2382e4b8299d689fb409 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Nov 2023 12:30:25 +0000 Subject: [PATCH 220/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From 5d0a36c82e14070c55812a6873e3013987efc823 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 Nov 2023 13:24:23 +0000 Subject: [PATCH 221/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From abb65162debd75f495bc1da8b76c8612865d20ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 Nov 2023 13:27:53 +0000 Subject: [PATCH 222/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From 2d699d8862fc81f0c7dba1749b5abcc3a64d5843 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 12:53:59 +0000 Subject: [PATCH 223/294] Update dependencies from https://github.com/dotnet/test-templates build 20231107.2 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23417.1 -> To Version 1.1.0-rc.23557.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5ddb5608..553673afb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - d27a1ffbea55634dfc57156b2d425416cbf1671d + 8f9449f21849b6a10446fe5fa94e708874177dc7 - + https://github.com/dotnet/test-templates - d27a1ffbea55634dfc57156b2d425416cbf1671d + 8f9449f21849b6a10446fe5fa94e708874177dc7 - + https://github.com/dotnet/test-templates - d27a1ffbea55634dfc57156b2d425416cbf1671d + 8f9449f21849b6a10446fe5fa94e708874177dc7 diff --git a/eng/Versions.props b/eng/Versions.props index d89f0a639..e9fe8cfac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23530.1 - 1.1.0-rc.23530.1 - 1.1.0-rc.23530.1 + 1.1.0-rc.23557.2 + 1.1.0-rc.23557.2 + 1.1.0-rc.23557.2 From 4d09393682ff4476972705a2e5a85f3cdd2ef308 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 13:37:01 +0000 Subject: [PATCH 224/294] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23525.4 From bee3cc7bc90d27e56f082e52fb4f3bbced7277ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 13:38:40 +0000 Subject: [PATCH 225/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231106.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23516.4 -> To Version 8.0.0-alpha.1.23556.3 --- NuGet.config | 5 +++-- eng/Version.Details.xml | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index fbfd3a625..1364722e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,9 +8,11 @@ + + + - @@ -19,7 +21,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 783b33db9..4f509615a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - b4fa7f2e1e65ef49881be2ab2df27624280a8c55 + fa4c0e8f53ef2541a23e519af4dfb86cb88e1bae From 32729df81986891f10edbf233942f2fea21d5b5f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 7 Nov 2023 14:52:38 +0000 Subject: [PATCH 226/294] Update dependencies from https://github.com/dotnet/test-templates build 20231107.3 Microsoft.DotNet.Test.ProjectTemplates.5.0 , Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 From Version 1.1.0-rc.23417.1 -> To Version 1.1.0-rc.23557.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 553673afb..f47ebdda4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 8f9449f21849b6a10446fe5fa94e708874177dc7 + 91931e1ccb061b59f965e03d2a76dd9ee4dde387 - + https://github.com/dotnet/test-templates - 8f9449f21849b6a10446fe5fa94e708874177dc7 + 91931e1ccb061b59f965e03d2a76dd9ee4dde387 - + https://github.com/dotnet/test-templates - 8f9449f21849b6a10446fe5fa94e708874177dc7 + 91931e1ccb061b59f965e03d2a76dd9ee4dde387 diff --git a/eng/Versions.props b/eng/Versions.props index e9fe8cfac..475c52473 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23557.2 - 1.1.0-rc.23557.2 - 1.1.0-rc.23557.2 + 1.1.0-rc.23557.3 + 1.1.0-rc.23557.3 + 1.1.0-rc.23557.3 From 933802c1ef17b45883077b42848c41c4c9891cd7 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:20 -0800 Subject: [PATCH 227/294] Update branding to 7.0.115 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 00d2d4fa1..a4aa81641 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 1 - 14 + 15 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 6a527262fc9b1b4831989323fff5f91eda4e0a1f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:24 -0800 Subject: [PATCH 228/294] Update branding to 7.0.312 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7b760e184..54b4ac0ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 3 - 11 + 12 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 624cf7b0445fe18b0375ceb6141f1f49aed1b764 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:28 -0800 Subject: [PATCH 229/294] Update branding to 7.0.405 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f036163be..ad262fa9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing From 0ca5cfe3202f5c3de3316804ce008a5b7945ce73 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Nov 2023 10:59:33 -0800 Subject: [PATCH 230/294] Update branding to 8.0.101 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0594bf69e..6c96107a1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 5942138f873b92224a1ca0535cb0ff6453fc4e69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 20:11:52 +0000 Subject: [PATCH 231/294] [release/7.0.3xx] Update dependencies from dotnet/arcade (#17711) [release/7.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/post-build/common-variables.yml | 1 - global.json | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a250a1bf7..babb88c88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 7b760e184..fc15d751c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23517.4 + 7.0.0-beta.23556.6 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..776bd9700 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,6 +1,5 @@ variables: - group: AzureDevOps-Artifact-Feeds-Pats - - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage - group: Publish-Build-Assets diff --git a/global.json b/global.json index 07e79e2ed..df223f963 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23517.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23517.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23556.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23556.6" } } From b6bcd46109bb9b751b0628477e2d3bbd356c8b36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 Nov 2023 20:11:52 +0000 Subject: [PATCH 232/294] [release/7.0.4xx] Update dependencies from dotnet/arcade (#17710) [release/7.0.4xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/post-build/common-variables.yml | 1 - global.json | 4 ++-- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cefbaee21..76dac7449 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f - + https://github.com/dotnet/arcade - cb3ccc523ed844c82a63898ed3fa269680396f26 + 0cf959c996dd33379cb6e87532c008669e0ae06f https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index f036163be..d563b85b0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23517.4 + 7.0.0-beta.23556.6 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..776bd9700 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,6 +1,5 @@ variables: - group: AzureDevOps-Artifact-Feeds-Pats - - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage - group: Publish-Build-Assets diff --git a/global.json b/global.json index 07e79e2ed..df223f963 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23517.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23517.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23556.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23556.6" } } From 5b89abdd871560b118562e32512e6f108f7d0d89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Nov 2023 13:39:00 +0000 Subject: [PATCH 233/294] Update dependencies from https://github.com/dotnet/arcade build 20231106.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23556.5 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f7dd679b..3d8335612 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -209,18 +209,18 @@ - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index cb97ca4f6..988cbdda9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23525.4 + 8.0.0-beta.23556.5 diff --git a/global.json b/global.json index 687a1eecb..639cb4f44 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23525.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23525.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23556.5" } } From 6c59b20e0df37776b20312fb362f76284da4e60c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 Nov 2023 13:41:20 +0000 Subject: [PATCH 234/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231106.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23516.4 -> To Version 8.0.0-alpha.1.23556.3 From e0edaec9770daee5422fe7706b98f3b62698bb6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 18:16:23 +0000 Subject: [PATCH 235/294] [release/7.0.4xx] Update dependencies from dotnet/test-templates (#17729) [release/7.0.4xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7a3f54a9..2d740d81d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,17 +85,17 @@ https://github.com/dotnet/test-templates 0385265f4d0b6413d64aea0223172366a9b9858c - + https://github.com/dotnet/test-templates - 91931e1ccb061b59f965e03d2a76dd9ee4dde387 + 307b8f538d83a955d8f6dd909eee41a5555f2f4d - + https://github.com/dotnet/test-templates - 91931e1ccb061b59f965e03d2a76dd9ee4dde387 + bd5b705548be896c84c672e2f7a033ed0881f8b7 - + https://github.com/dotnet/test-templates - 91931e1ccb061b59f965e03d2a76dd9ee4dde387 + bd5b705548be896c84c672e2f7a033ed0881f8b7 diff --git a/eng/Versions.props b/eng/Versions.props index 5d3b690c8..e1ab80382 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23557.3 - 1.1.0-rc.23557.3 - 1.1.0-rc.23557.3 + 1.1.0-rc.23558.1 + 1.1.0-rc.23558.2 + 1.1.0-rc.23558.2 From 2a6e1c3f474fe064f088b1ee8b95dc75b4f7b638 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 8 Nov 2023 16:33:51 -0800 Subject: [PATCH 236/294] Update Versions.props --- eng/Versions.props | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6c96107a1..78404717f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -145,8 +145,10 @@ Therefore we stay at last month's version. We also need to special case the 1st patch release, because the incoming SDK version will never be 2 versions behind us in that case. Instead the indicator is that the incoming SDK version is not RTM or greater yet. - Preview releases already use -1 versionining so don't subtract one for that version + Preview releases already use -1 versionining so don't subtract one for that version. + In public builds, we always use the 2 month old version. --> + true true $([MSBuild]::Subtract($(VersionFeature60), 1)) From de66fe5b4bc145419de8537f6b01716bcfc72625 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 8 Nov 2023 16:38:53 -0800 Subject: [PATCH 237/294] Update Versions.props --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 78404717f..aa53d192b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -148,7 +148,7 @@ Preview releases already use -1 versionining so don't subtract one for that version. In public builds, we always use the 2 month old version. --> - true true true $([MSBuild]::Subtract($(VersionFeature60), 1)) From afb8a43b485c0b3d7bf8955a71db6c8c11a97d34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Nov 2023 13:35:30 +0000 Subject: [PATCH 238/294] Update dependencies from https://github.com/dotnet/arcade build 20231106.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23556.5 From 8b32358b917860156e0f9f139d85813aba41fb81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 9 Nov 2023 13:37:23 +0000 Subject: [PATCH 239/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231106.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23516.4 -> To Version 8.0.0-alpha.1.23556.3 From fbdc18b801d6c33472e4eccfe83893bcb5265d61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 9 Nov 2023 21:26:14 +0000 Subject: [PATCH 240/294] [release/7.0.4xx] Update dependencies from dotnet/test-templates (#17748) [release/7.0.4xx] Update dependencies from dotnet/test-templates --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d740d81d..d0a358c59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -89,13 +89,13 @@ https://github.com/dotnet/test-templates 307b8f538d83a955d8f6dd909eee41a5555f2f4d - + https://github.com/dotnet/test-templates - bd5b705548be896c84c672e2f7a033ed0881f8b7 + e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://github.com/dotnet/test-templates - bd5b705548be896c84c672e2f7a033ed0881f8b7 + e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a diff --git a/eng/Versions.props b/eng/Versions.props index c586fbb60..bd48da193 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,8 +47,8 @@ 1.0.2-beta4.22406.1 1.1.0-rc.23558.1 - 1.1.0-rc.23558.2 - 1.1.0-rc.23558.2 + 1.1.0-rc.23559.1 + 1.1.0-rc.23559.1 From fa400ec1b73779883c89dbbb79cbc1c57eef932d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 9 Nov 2023 21:37:03 -0800 Subject: [PATCH 241/294] Add dotnet-sdk feed --- NuGet.config | 1 + 1 file changed, 1 insertion(+) diff --git a/NuGet.config b/NuGet.config index 1364722e7..a80e5f9a1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,6 +21,7 @@ + From 680684c6b55610407dba8bcde969177cb3f50151 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Nov 2023 13:33:02 +0000 Subject: [PATCH 242/294] Update dependencies from https://github.com/dotnet/arcade build 20231106.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23556.5 From 830603fd8ef1d05f9b51ccdd2c0b1a8f7820f92d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Nov 2023 13:34:42 +0000 Subject: [PATCH 243/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231106.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23516.4 -> To Version 8.0.0-alpha.1.23556.3 --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index a80e5f9a1..1364722e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,6 @@ - From 395b82bb19189c1999806f145bba2b6890e0c517 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 10 Nov 2023 11:37:24 -0800 Subject: [PATCH 244/294] Fix the minimum version logic to take into account that we're off-by-one for the 100 release --- src/redist/targets/GenerateMSIs.targets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index dc3555023..5acc61c19 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -321,6 +321,11 @@ + + + $(MinimumVSVersion.Substring(0,$(MinimumVSVersion.LastIndexOf('.')))) + $([MSBuild]::Add($(MinimumVSVersion), .1)) + Date: Fri, 10 Nov 2023 13:44:07 -0800 Subject: [PATCH 245/294] Downgrade implicit version Currently, we are not tracking changes to be released for 6 or 7 in December. Preparing the downgrade of the implicit version in case that ends up being the case. --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index aa53d192b..316862a0b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 25)) - $([MSBuild]::Add($(VersionFeature), 14)) + $([MSBuild]::Add($(VersionFeature), 24)) + $([MSBuild]::Add($(VersionFeature), 13)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From b16a043b13c9caa68503223b426532c1d3cf8159 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Nov 2023 13:32:30 +0000 Subject: [PATCH 246/294] Update dependencies from https://github.com/dotnet/arcade build 20231106.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23556.5 From 97a653316342fc894b2b64f0ee96133042cbcd38 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Nov 2023 13:34:05 +0000 Subject: [PATCH 247/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231106.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23516.4 -> To Version 8.0.0-alpha.1.23556.3 From 17857489510aedfb409134ad3df8dbf480e557bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 Nov 2023 13:26:35 +0000 Subject: [PATCH 248/294] Update dependencies from https://github.com/dotnet/arcade build 20231106.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23556.5 From ed29d3f30e98320ff4d564124a28cc31c4652303 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 12 Nov 2023 13:28:07 +0000 Subject: [PATCH 249/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231106.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23516.4 -> To Version 8.0.0-alpha.1.23556.3 From 662caee5c6aec9f7ad161083ba487c3404632e3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Nov 2023 13:24:42 +0000 Subject: [PATCH 250/294] Update dependencies from https://github.com/dotnet/arcade build 20231106.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23556.5 From b0132c0ce0d22f537af7c3e413bdc8fcc88de45a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Nov 2023 13:26:17 +0000 Subject: [PATCH 251/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231106.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23516.4 -> To Version 8.0.0-alpha.1.23556.3 From 3ae588aa3f66df815e78f9da080fa9116c155901 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Nov 2023 13:34:18 +0000 Subject: [PATCH 252/294] Update dependencies from https://github.com/dotnet/arcade build 20231106.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23516.4 -> To Version 8.0.0-beta.23556.5 From a51c9e212065705d5eaabd9a5e1d3b91cd98d20a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Nov 2023 13:35:39 +0000 Subject: [PATCH 253/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231106.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23516.4 -> To Version 8.0.0-alpha.1.23556.3 From e94d69fbe7754ee3467a0ec947b80ef0a1fa7e45 Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 14 Nov 2023 22:36:29 +0100 Subject: [PATCH 254/294] .NET Source-Build 8.0.100 November 2023 Updates (#17784) --- src/SourceBuild/content/eng/Versions.props | 4 ++-- .../eng/bootstrap/OverrideBootstrapVersions.props | 14 -------------- .../bootstrap/buildBootstrapPreviouslySB.csproj | 2 -- src/SourceBuild/content/global.json | 2 +- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/SourceBuild/content/eng/Versions.props b/src/SourceBuild/content/eng/Versions.props index 4d0c4698e..9f5666494 100644 --- a/src/SourceBuild/content/eng/Versions.props +++ b/src/SourceBuild/content/eng/Versions.props @@ -30,7 +30,7 @@ These URLs can't be composed from their base URL and version as we read them from the prep.sh and pipeline scripts, outside of MSBuild. --> - https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rc.2.23502.1.centos.8-x64.tar.gz - https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-rc.2.23502.1-centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/assets/Private.SourceBuilt.Artifacts.8.0.100-rtm.23551.1.centos.8-x64.tar.gz + https://dotnetcli.azureedge.net/source-built-artifacts/sdks/dotnet-sdk-8.0.100-centos.8-x64.tar.gz diff --git a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props index 358c00140..4da9c2172 100644 --- a/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props +++ b/src/SourceBuild/content/eng/bootstrap/OverrideBootstrapVersions.props @@ -5,19 +5,5 @@ 7.0.4-servicing.23107.6 $(NonshippingRuntimeVersionFor700) - - 8.0.0-rc.2.23479.6 - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) - $(Msft80RC2RuntimeVersion) diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index d85e32ca7..56d828d22 100644 --- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -47,8 +47,6 @@ - - Date: Tue, 14 Nov 2023 23:30:42 +0000 Subject: [PATCH 255/294] Update dependencies from https://github.com/dotnet/arcade build 20231114.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23556.6 -> To Version 7.0.0-beta.23564.5 --- NuGet.config | 18 ++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2ea15b3fa..7b13934dc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,28 @@ + + + + + + + + + + @@ -44,14 +54,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61652a9f6..6ed02abb3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index b9f6e8bec..3506ebb98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23556.6 + 7.0.0-beta.23564.5 diff --git a/global.json b/global.json index df223f963..154f5f035 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.112", + "dotnet": "7.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23556.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23556.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" } } From 98f62919421b5d3ecba18abf412aacaa439110f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 14 Nov 2023 23:30:42 +0000 Subject: [PATCH 256/294] Update dependencies from https://github.com/dotnet/arcade build 20231114.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23556.6 -> To Version 7.0.0-beta.23564.5 --- NuGet.config | 18 ++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 28 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6826d6846..6965e587b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,28 @@ + + + + + + + + + + @@ -44,14 +54,22 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 25023f981..5a3d473a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/arcade - 0cf959c996dd33379cb6e87532c008669e0ae06f + ca53a3149aaedb03e5d79ee0e259d31ac8719290 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 49f88c7d7..e964b522d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23556.6 + 7.0.0-beta.23564.5 diff --git a/global.json b/global.json index df223f963..154f5f035 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.112", + "dotnet": "7.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23556.6", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23556.6" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" } } From c09863189db3c28a552b8a465f06317525e14edd Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Wed, 15 Nov 2023 17:19:55 +0100 Subject: [PATCH 257/294] .NET Source-Build 7.0.114 November 2023 Updates (#17780) --- 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 883ca59e7..79113bc3f 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.113 - 7.0.113 + 7.0.114 + 7.0.114 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index ddd27f661..d508adc5c 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.113" + "dotnet": "7.0.114" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 5ec5ab4feeb32f14a5fa283af75d1aeefc3e777b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Nov 2023 16:47:05 +0000 Subject: [PATCH 258/294] Update dependencies from https://github.com/dotnet/arcade build 20231114.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23556.5 -> To Version 8.0.0-beta.23564.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1a2d386f..b9e8efe31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -209,18 +209,18 @@ - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5d949a221..5570a6c20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23556.5 + 8.0.0-beta.23564.4 diff --git a/global.json b/global.json index 639cb4f44..88256e459 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23556.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4" } } From 9eec423049a6a150a74c93876b16c3d266e3a492 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 15 Nov 2023 18:14:49 +0000 Subject: [PATCH 259/294] [release/8.0.2xx] Update dependencies from dotnet/arcade (#17803) [release/8.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3236b84d..77aed9c29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,18 +205,18 @@ - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 9896a37d2..b677dc4c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23556.5 + 8.0.0-beta.23564.4 diff --git a/global.json b/global.json index 639cb4f44..88256e459 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23556.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4" } } From 121675dfa1aca9c0baf8847062c4d90317aa6754 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Nov 2023 18:33:22 +0000 Subject: [PATCH 260/294] Update dependencies from https://github.com/dotnet/arcade build 20231114.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23511.9 -> To Version 7.0.0-beta.23564.5 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates/post-build/common-variables.yml | 1 - global.json | 6 +++--- 5 files changed, 24 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index d195ba1ca..be7632bd2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,29 @@ - + + + + + + + + @@ -44,14 +51,19 @@ - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d050c2f90..a464c3fa3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -194,18 +194,18 @@ - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + ca53a3149aaedb03e5d79ee0e259d31ac8719290 - + https://github.com/dotnet/arcade - acb831a5b31a3cc4a744a8944b6bd172e6969234 + ca53a3149aaedb03e5d79ee0e259d31ac8719290 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 79113bc3f..a42e5dcf5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23511.9 + 7.0.0-beta.23564.5 diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a4..776bd9700 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,6 +1,5 @@ variables: - group: AzureDevOps-Artifact-Feeds-Pats - - group: DotNet-Blob-Feed - group: DotNet-DotNetCli-Storage - group: DotNet-MSRC-Storage - group: Publish-Build-Assets diff --git a/global.json b/global.json index 07baaa447..154f5f035 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.112", + "dotnet": "7.0.113", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23511.9", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23511.9" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23564.5", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23564.5" } } From a944bbe5821721091fe9f1ec0eef16a768038294 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Nov 2023 13:38:49 +0000 Subject: [PATCH 261/294] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20231115.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23556.3 -> To Version 8.0.0-alpha.1.23565.1 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9e8efe31..944dd7ff4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -234,9 +234,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - fa4c0e8f53ef2541a23e519af4dfb86cb88e1bae + 95f83e27806330fec09edd96e06bba3acabe3f35 From 5e315c84d591089970bb93595fa8903fa974f771 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Thu, 16 Nov 2023 07:48:08 -0600 Subject: [PATCH 262/294] Update .NET 8 GA MAUI baseline manifests (#17794) These are the releases on NuGet.org that shipped on 11/14. --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5570a6c20..7462e095a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -241,13 +241,13 @@ 8.0.100-rc.1 8.0.0-alpha.23471.13 - 8.0.100-rc.2 - 8.0.0-rc.2.9373 - 34.0.0-rc.2.468 - 16.4.8968-net8-rc2 - 16.4.8968-net8-rc2 - 13.3.8968-net8-rc2 - 16.4.8968-net8-rc2 + 8.0.100 + 8.0.3 + 34.0.43 + 17.0.8478 + 17.0.8478 + 14.0.8478 + 17.0.8478 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) From 4e9256ffb434a2c19b917479a8faf782b24c1bb3 Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 16 Nov 2023 11:41:04 -0800 Subject: [PATCH 263/294] Use unique non-stable SDK version for comparison test (#17819) --- .../SourceBuiltArtifactsTests.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index d80eb8e54..7d6278b80 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -56,10 +56,9 @@ public class SourceBuiltArtifactsTests : SdkTests DirectoryInfo sdkDir = new DirectoryInfo(Path.Combine(outputDir, "sdk")); string sdkVersionPath = sdkDir.GetFiles(".version", SearchOption.AllDirectories).Single().FullName; string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath)); - string expectedSdkVersion = sdkVersionLines[1]; + string expectedSdkVersion = sdkVersionLines[3]; // Get the unique, non-stable, SDK version - // Disable due to https://github.com/dotnet/source-build/issues/3693 - // Assert.Equal(expectedSdkVersion, sdkVersion); + Assert.Equal(expectedSdkVersion, sdkVersion); } finally { From 9a20740764d78ac3b7af9a669f4f35cf4dfa1366 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Nov 2023 21:21:06 +0000 Subject: [PATCH 264/294] Update dependencies from https://github.com/dotnet/source-build-externals build 20231116.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23518.1 -> To Version 8.0.0-alpha.1.23566.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b9e8efe31..ae3f68d94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,9 +188,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 3dc05150cf234f76f6936dcb2853d31a0da1f60e + 776b128c95ef681d125adc3eb69f12d480418bb5 From bc60f176c86a6b1a290b3badc509ec86233f9543 Mon Sep 17 00:00:00 2001 From: Ella Hathaway <67609881+ellahathaway@users.noreply.github.com> Date: Fri, 17 Nov 2023 15:38:44 -0800 Subject: [PATCH 265/294] Alpine leg in sdk content test (#17824) --- eng/pipelines/source-build-sdk-diff-tests.yml | 11 +++++++++-- eng/pipelines/templates/jobs/sdk-diff-tests.yml | 11 ++++++++--- src/SourceBuild/content/Directory.Build.props | 1 + 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/eng/pipelines/source-build-sdk-diff-tests.yml b/eng/pipelines/source-build-sdk-diff-tests.yml index daf6afefe..187c4a5cf 100644 --- a/eng/pipelines/source-build-sdk-diff-tests.yml +++ b/eng/pipelines/source-build-sdk-diff-tests.yml @@ -4,8 +4,8 @@ schedules: branches: include: - main - - release/*.0.1xx* - - internal/release/*.0.1xx* + - release/*.0.1xx* + - internal/release/*.0.1xx* pr: none trigger: none @@ -35,6 +35,13 @@ jobs: architecture: x64 dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} +- template: templates/jobs/sdk-diff-tests.yml + parameters: + buildName: Alpine317_Offline_MsftSdk + targetRid: alpine.3.17-x64 + architecture: x64 + dotnetDotnetRunId: ${{ parameters.dotnetDotnetRunId }} + - template: templates/jobs/sdk-diff-tests.yml parameters: buildName: Fedora38_Offline_MsftSdk diff --git a/eng/pipelines/templates/jobs/sdk-diff-tests.yml b/eng/pipelines/templates/jobs/sdk-diff-tests.yml index d79849d66..1102f74ac 100644 --- a/eng/pipelines/templates/jobs/sdk-diff-tests.yml +++ b/eng/pipelines/templates/jobs/sdk-diff-tests.yml @@ -60,7 +60,7 @@ jobs: pipeline: $(INSTALLER_OFFICIAL_CI_PIPELINE_ID) buildId: $(InstallerBuildId) artifact: BlobArtifacts - patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux-${{ parameters.architecture }}.tar.gz' + patterns: '**/dotnet-sdk-+([0-9]).+([0-9]).+([0-9])?(-@(alpha|preview|rc|rtm)*)-linux*-${{ parameters.architecture }}.tar.gz' allowPartiallySucceededBuilds: true allowFailedBuilds: true downloadPath: $(Pipeline.Workspace)/Artifacts @@ -82,7 +82,11 @@ jobs: checkDownloadedFiles: true - script: | - msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-linux-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) + platform="linux" + if [[ ${{ parameters.targetRid }} =~ "alpine" ]]; then + platform="$platform-musl" + fi + msft_sdk_tarball_name=$(find "$(Pipeline.Workspace)/Artifacts" -name "dotnet-sdk-*-$platform-${{ parameters.architecture }}.tar.gz" -exec basename {} \;) if [[ -z "$msft_sdk_tarball_name" ]]; then echo "Microsoft SDK tarball does not exist in '$(Pipeline.Workspace)/Artifacts'. The associated build https://dev.azure.com/dnceng/internal/_build/results?buildId=$(InstallerBuildId) might have failed." @@ -98,6 +102,7 @@ jobs: eng/common/build.sh -bl --projects $(Build.SourcesDirectory)/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/Microsoft.DotNet.SourceBuild.SmokeTests.csproj --restore + echo "##vso[task.setvariable variable=Platform]$platform" echo "##vso[task.setvariable variable=MsftSdkTarballPath]$(Pipeline.Workspace)/Artifacts/$msft_sdk_tarball_name" echo "##vso[task.setvariable variable=SdkTarballPath]$(Pipeline.Workspace)/Artifacts/$sdk_tarball_name" displayName: Prepare Tests @@ -119,7 +124,7 @@ jobs: -e SMOKE_TESTS_WARN_SDK_CONTENT_DIFFS=false -e SMOKE_TESTS_RUNNING_IN_CI=true -e SMOKE_TESTS_TARGET_RID=${{ parameters.targetRid }} - -e SMOKE_TESTS_PORTABLE_RID=linux-${{ parameters.architecture }} + -e SMOKE_TESTS_PORTABLE_RID=$(Platform)-${{ parameters.architecture }} -e SMOKE_TESTS_CUSTOM_PACKAGES_PATH= displayName: Run Tests workingDirectory: $(Build.SourcesDirectory) diff --git a/src/SourceBuild/content/Directory.Build.props b/src/SourceBuild/content/Directory.Build.props index 69262c7a8..c47f4ad02 100644 --- a/src/SourceBuild/content/Directory.Build.props +++ b/src/SourceBuild/content/Directory.Build.props @@ -171,6 +171,7 @@ freebsd-$(Platform) osx-$(Platform) linux-$(Platform) + linux-musl-$(Platform) win-$(Platform) $(PortableRid) From 01598b96bb19110fab5f374b0df8229962c3799b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 Nov 2023 14:23:56 +0000 Subject: [PATCH 266/294] Update dependencies from https://github.com/dotnet/source-build-externals build 20231120.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23566.2 -> To Version 8.0.0-alpha.1.23570.1 --- NuGet.config | 6 ------ eng/Version.Details.xml | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1364722e7..8deb1a440 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,18 +7,12 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91db180a5..be87d69c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,9 +188,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 776b128c95ef681d125adc3eb69f12d480418bb5 + e844aa02a05b90d8cbe499676ec6ee0f19ec4980 From c550e3471045abf45c141e2fec2b57205aec5122 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 21 Nov 2023 11:12:36 -0800 Subject: [PATCH 267/294] Revert "Downgrade implicit version" (#17849) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f5bfd3090..7462e095a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 24)) - $([MSBuild]::Add($(VersionFeature), 13)) + $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 94df731cdcf7d034251f494a1ae60f748a76eb6e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 21 Nov 2023 19:33:07 -0800 Subject: [PATCH 268/294] Update to the November released build implicit version (#17774) Co-authored-by: Jason Zhai --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b677dc4c4..903911f4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - 22 - 11 + 25 + 14 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From f84443f1c6cd7c9c47c7f795c81ca87e7f135fa0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Nov 2023 17:44:48 +0000 Subject: [PATCH 269/294] [release/8.0.1xx] Update dependencies from dotnet/arcade-services (#17866) Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index eddbc806d..1e062a63a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23551.2", + "version": "1.1.0-beta.23577.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be87d69c4..fbfc40db1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -222,13 +222,13 @@ https://github.com/dotnet/arcade 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade-services - 88b0cbb096999d03068ddc9945465a3f5b6ba5da + 2cb9532010eba6a27a7e4d672097c74c79f604d0 - + https://github.com/dotnet/arcade-services - 88b0cbb096999d03068ddc9945465a3f5b6ba5da + 2cb9532010eba6a27a7e4d672097c74c79f604d0 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7462e095a..eb367e89a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.23551.2 + 1.1.0-beta.23577.3 From 769030cd4dfa6beae7e8f22aad3781936442f168 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Mon, 27 Nov 2023 12:04:02 -0800 Subject: [PATCH 270/294] Merging internal commits for release/8.0.1xx (#17785) --- NuGet.config | 13 ++ eng/Version.Details.xml | 153 +++++++++--------- eng/Versions.props | 42 ++--- .../content/repo-projects/aspire.proj | 13 ++ .../content/repo-projects/dotnet.proj | 1 + .../baselines/licenses/Licenses.aspire.json | 3 + src/VirtualMonoRepo/source-mappings.json | 7 + src/redist/targets/BundledManifests.targets | 2 +- 8 files changed, 138 insertions(+), 96 deletions(-) create mode 100644 src/SourceBuild/content/repo-projects/aspire.proj create mode 100644 src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json diff --git a/NuGet.config b/NuGet.config index 8deb1a440..71b75cf38 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,22 @@ + + + + + + + @@ -30,17 +37,23 @@ + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fbfc40db1..67a7a2a3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 544c2e622c03eef94355718e7e671b193b0102d9 + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - b0c12dfb32e70e2c48b1e0a62e9ceb0f5c6a14e1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 - - https://github.com/dotnet/sdk - a08f8900d1b7f4cef2a1077dc4ce90c56cb4ada5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + e9d13cbe7e8c1d52ce276a8655f52a87e1017c46 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - - https://github.com/dotnet/winforms - d77ef3b1a253a99d0be23cec35e84d2fb3317ac5 + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e4ede9b8979b9d2b1b1d4383f30a791414f0625b - - https://github.com/dotnet/wpf - eb2c28846bd06cc11a0cd432d55639a850a829a3 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a https://github.com/dotnet/fsharp @@ -147,12 +147,12 @@ - https://github.com/dotnet/runtime - 488a8a3521610422e8fbe22d5cc66127f3dce3dc + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 12b11685a551e0a6a203dcecb584f610f4df1157 + f43cd10b737b6343956dee421cff8c50b602c788 @@ -170,11 +170,16 @@ https://github.com/dotnet/emsdk - 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed + 2406616d0e3a31d80b326e27c156955bfa41c791 - + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspire + 48e42f59d64d84b404e904996a9ed61f2a17a569 + + + https://github.com/dotnet/emsdk - 51bf18a2e20024dfa89d63e20b0c3b695b5c1eed + 2406616d0e3a31d80b326e27c156955bfa41c791 diff --git a/eng/Versions.props b/eng/Versions.props index eb367e89a..738bfd22c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23531.5 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23531.4 @@ -72,13 +72,13 @@ - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 - 8.0.0-rtm.23524.5 + 8.0.0 + 8.0.0 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 0.2.0 @@ -86,24 +86,24 @@ 8.0.100 - 8.0.100-rtm.23524.25 - 8.0.100-rtm.23524.25 + 8.0.100-rtm.23551.6 + 8.0.100-rtm.23551.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23524.2 + 4.8.0-3.23524.11 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23531.3 - 8.0.0-rtm.23523.12 - 8.0.0-rtm.23523.12 + 8.0.0-rtm.23531.3 + 8.0.0-rtm.23531.3 8.0.0 8.0.0 8.0.0 @@ -112,10 +112,10 @@ - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 - 8.0.0-rtm.23524.1 + 8.0.0-rtm.23551.1 + 8.0.0-rtm.23551.1 + 8.0.0 + 8.0.0 @@ -239,8 +239,8 @@ - 8.0.100-rc.1 - 8.0.0-alpha.23471.13 + 8.0.100 + 8.0.0-preview.1.23557.2 8.0.100 8.0.3 34.0.43 diff --git a/src/SourceBuild/content/repo-projects/aspire.proj b/src/SourceBuild/content/repo-projects/aspire.proj new file mode 100644 index 000000000..7d41e5e5f --- /dev/null +++ b/src/SourceBuild/content/repo-projects/aspire.proj @@ -0,0 +1,13 @@ + + + + + $(StandardSourceBuildCommand) $(StandardSourceBuildArgs) + + + + + + + + \ No newline at end of file diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index 23c5d842a..26ce0941f 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -45,6 +45,7 @@ + diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json new file mode 100644 index 000000000..6941fa698 --- /dev/null +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/baselines/licenses/Licenses.aspire.json @@ -0,0 +1,3 @@ +{ + "files": [] +} \ No newline at end of file diff --git a/src/VirtualMonoRepo/source-mappings.json b/src/VirtualMonoRepo/source-mappings.json index 831fae959..7e6c1ccd5 100644 --- a/src/VirtualMonoRepo/source-mappings.json +++ b/src/VirtualMonoRepo/source-mappings.json @@ -60,6 +60,13 @@ "src/Microsoft.DotNet.SignTool.Tests/*.vsix" ] }, + { + "name": "aspire", + "defaultRemote": "https://github.com/dotnet/aspire", + "exclude": [ + "src/Aspire.Dashboard/**/*" + ] + }, { "name": "aspnetcore", "defaultRemote": "https://github.com/dotnet/aspnetcore", diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index d6db716b9..73402bced 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -4,7 +4,6 @@ - @@ -17,6 +16,7 @@ + From 1799acaa9c830aede6b1c90f2a1499df59eb640f Mon Sep 17 00:00:00 2001 From: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Date: Tue, 28 Nov 2023 13:54:44 +0800 Subject: [PATCH 271/294] Revert "Disable crossgen and zip file creation in the local dev build unless -pack is used" --- eng/AfterSigning.targets | 1 - run-build.ps1 | 8 +++----- run-build.sh | 3 --- src/redist/targets/Crossgen.targets | 3 +-- src/redist/targets/GenerateArchives.targets | 2 -- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets index a2a586db7..b8a08378a 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -4,7 +4,6 @@ diff --git a/run-build.ps1 b/run-build.ps1 index 7b98f2ee5..4f2e1275f 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -8,7 +8,6 @@ param( [string]$Configuration="Debug", [string]$Architecture="x64", [switch]$Sign=$false, - [switch]$Pack=$false, [switch]$PgoInstrument, [bool]$WarnAsError=$true, [Parameter(ValueFromRemainingArguments=$true)][String[]]$ExtraParameters @@ -24,11 +23,10 @@ if ($PgoInstrument) { } if ($Sign) { - $Parameters = "$Parameters -sign" -} + $Parameters = "$Parameters -sign /p:SignCoreSdk=true" -if ($Pack) { - $Parameters = "$Parameters /p:PackInstaller=true" + # Workaround https://github.com/dotnet/arcade/issues/1776 + $WarnAsError = $false } $Parameters = "$Parameters -WarnAsError `$$WarnAsError" diff --git a/run-build.sh b/run-build.sh index e735b79f3..c380d75ce 100755 --- a/run-build.sh +++ b/run-build.sh @@ -45,9 +45,6 @@ while [[ $# > 0 ]]; do --pgoInstrument) args+=("/p:PgoInstrument=true") ;; - --pack) - args+=("/p:PackInstaller=true") - ;; --help) echo "Usage: $0 [--configuration ] [--architecture ] [--docker ] [--help]" echo "" diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index e55047af6..d9f961933 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,8 +1,7 @@ - diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index be8668f85..814abbe71 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -1,7 +1,5 @@ - From 2887ef065d12c10b365ad6f9593a020711ecb445 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 12:40:03 +0000 Subject: [PATCH 272/294] Update dependencies from https://github.com/dotnet/test-templates build 20231128.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23410.2 -> To Version 1.1.0-rc.23578.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77aed9c29..54139871f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a diff --git a/eng/Versions.props b/eng/Versions.props index 903911f4d..458e85e0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 + 1.1.0-rc.23578.1 + 1.1.0-rc.23578.1 + 1.1.0-rc.23578.1 From 822071c28a37cfcbf2b32077b6983e1c666160e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Nov 2023 17:13:43 +0000 Subject: [PATCH 273/294] [release/8.0.1xx] Update dependencies from dotnet/arcade-services (#17881) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Premek Vysoky --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1e062a63a..9394fd31e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23577.3", + "version": "1.1.0-beta.23578.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 67a7a2a3a..0a2d6ca92 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade-services - 2cb9532010eba6a27a7e4d672097c74c79f604d0 + 5263b603d90991a0c200aca8b8892c3d7cfe4751 - + https://github.com/dotnet/arcade-services - 2cb9532010eba6a27a7e4d672097c74c79f604d0 + 5263b603d90991a0c200aca8b8892c3d7cfe4751 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 738bfd22c..b2c7f72dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.23577.3 + 1.1.0-beta.23578.2 From fba9ec68f7bc136c96794c3978cb0ad49bb36404 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 29 Nov 2023 08:27:49 -0600 Subject: [PATCH 274/294] Update Aspire version --- eng/Version.Details.xml | 5 +++++ eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54139871f..53b0cffeb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -173,6 +173,11 @@ 1b7f3a6560f6fb5f32b2758603c0376037f555ea + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspire + 48e42f59d64d84b404e904996a9ed61f2a17a569 + + https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 diff --git a/eng/Versions.props b/eng/Versions.props index 458e85e0a..a4af4b2b8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -239,8 +239,8 @@ - 8.0.100-rc.1 - 8.0.0-alpha.23471.13 + 8.0.100 + 8.0.0-preview.1.23557.2 8.0.100-rc.1 8.0.0-rc.1.9171 34.0.0-rc.1.432 From 48b005c37a3df4f4e0d62b95e8d589e4f590651e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:41:28 +0000 Subject: [PATCH 275/294] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17695) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23520.10 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23520.10 to 8.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23520.14 to 8.0.0-rtm.23531.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23531.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.0-beta.23523.2 to 12.8.0-beta.23579.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23523.2 to 8.0.200-beta.23579.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23519-02 to 17.9.0-preview-23580-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.9.0-1.23520.1 to 4.9.0-2.23562.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.9.0-preview-23523-01 to 17.9.0-preview-23601-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.9.0-preview.1.17 to 6.9.0-preview.1.45 (parent: Microsoft.NET.Sdk) - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Remove 8.0.100 feed from 8.0.200 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Fix the emsdk coherency and rerun the dependency update for the SKD build - Updating the dotnet new output to match current behavior Teams message sent to confirm if this is correct - Fix emsdk Dependency --- NuGet.config | 2 + eng/Version.Details.xml | 174 +++++++++++++++-------------- eng/Versions.props | 54 ++++----- test/EndToEnd/ProjectBuildTests.cs | 2 +- 4 files changed, 119 insertions(+), 113 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fcb5685f..94ab32f7a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b0cffeb..98034b438 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca https://github.com/dotnet/test-templates @@ -124,53 +124,57 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - - https://github.com/dotnet/winforms - abda8e3bfa78319363526b5a5f86863ec979940e + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e4ede9b8979b9d2b1b1d4383f30a791414f0625b - - https://github.com/dotnet/wpf - 0d629281c49061636a8a161bae6fceedd37acff7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 507114e990861aec5444df54de1dc77bfe26a310 + a0396b1cade0e705abd16526f5f165a9894c055d - + https://github.com/dotnet/fsharp - 507114e990861aec5444df54de1dc77bfe26a310 + a0396b1cade0e705abd16526f5f165a9894c055d - + https://github.com/microsoft/vstest - fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 + d6dc5a0343fec142369c744466be1d1fc52fecdb - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/msbuild - 08494c73128451a3f7cfb47a5e9cbd63f5507a1f + 67916dc4592efb2a0bec902aa1a77105859ee245 - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + 707c46e558b2b027d7ae942028c369e26545f10a https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 1b7f3a6560f6fb5f32b2758603c0376037f555ea + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + + + https://github.com/dotnet/emsdk + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 diff --git a/eng/Versions.props b/eng/Versions.props index a4af4b2b8..a43edc3aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23520.14 + 8.0.0-rtm.23531.5 - 8.0.0-rtm.23521.1 + 8.0.0-rtm.23531.4 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 + 8.0.0 + 8.0.0 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 0.2.0 - 8.0.200-preview.23523.30 - 8.0.200-preview.23523.30 - 8.0.200-preview.23523.30 + 8.0.200-preview.23603.4 + 8.0.200-preview.23603.4 + 8.0.200-preview.23603.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23520.1 + 4.9.0-2.23562.2 - 8.0.0-rtm.23520.16 + 8.0.0-rtm.23531.3 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 + 8.0.0-rtm.23531.3 + 8.0.0-rtm.23531.3 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 2.1.0 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 + 8.0.0-rtm.23551.1 + 8.0.0-rtm.23551.1 + 8.0.0 + 8.0.0 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.17 + 6.9.0-preview.1.45 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23519-02 + 17.9.0-preview-23580-01 8.0.0-alpha.1.22557.12 @@ -249,7 +249,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23511.3 + 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 01925eb5f..fa7350c16 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,7 +202,7 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ -[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+ [\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ "; From a75f89274dc7e513f1af200c38a124e60f062ee4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 02:17:30 +0000 Subject: [PATCH 276/294] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17908) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.0-beta.23580.2 to 12.8.0-beta.23604.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23580.2 to 8.0.200-beta.23604.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.9.0-preview-23601-02 to 17.9.0-preview-23604-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.0 to 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.SourceBuild.Intermediate.emsdk: from 8.0.0-rtm.23558.2 to 8.0.0-rtm.23530.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98034b438..badc7e735 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b1fc487a18f8db14a5f71112efeb57c267ba1fca + 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f - + https://github.com/dotnet/sdk - b1fc487a18f8db14a5f71112efeb57c267ba1fca + 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f - + https://github.com/dotnet/sdk - b1fc487a18f8db14a5f71112efeb57c267ba1fca + 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f - + https://github.com/dotnet/sdk - b1fc487a18f8db14a5f71112efeb57c267ba1fca + 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - a0396b1cade0e705abd16526f5f165a9894c055d + 11a521c068d2c3d14798a7970cfcad70f5f05df2 - + https://github.com/dotnet/fsharp - a0396b1cade0e705abd16526f5f165a9894c055d + 11a521c068d2c3d14798a7970cfcad70f5f05df2 @@ -155,9 +155,9 @@ 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/msbuild - 67916dc4592efb2a0bec902aa1a77105859ee245 + f5ae5c6896f934f790fc000b7f3761c3c93aa9a9 https://github.com/nuget/nuget.client @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/emsdk - 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + 2406616d0e3a31d80b326e27c156955bfa41c791 diff --git a/eng/Versions.props b/eng/Versions.props index a43edc3aa..33b4ca481 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23603.4 - 8.0.200-preview.23603.4 - 8.0.200-preview.23603.4 + 8.0.200-preview.23604.16 + 8.0.200-preview.23604.16 + 8.0.200-preview.23604.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d79e6a8a5a004de35b425abce301987130004d43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Dec 2023 21:49:35 +0000 Subject: [PATCH 277/294] Update dependencies from https://github.com/dotnet/sdk build 20231205.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23605.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index badc7e735..0d5c062d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f + cd5005e32d8f289e4f49417411bbee10c8c49217 - + https://github.com/dotnet/sdk - 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f + cd5005e32d8f289e4f49417411bbee10c8c49217 - + https://github.com/dotnet/sdk - 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f + cd5005e32d8f289e4f49417411bbee10c8c49217 - + https://github.com/dotnet/sdk - 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f + cd5005e32d8f289e4f49417411bbee10c8c49217 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 11a521c068d2c3d14798a7970cfcad70f5f05df2 + 05bb885a7119b541816e16ca9980ab685ffbfaa5 - + https://github.com/dotnet/fsharp - 11a521c068d2c3d14798a7970cfcad70f5f05df2 + 05bb885a7119b541816e16ca9980ab685ffbfaa5 - + https://github.com/microsoft/vstest - d6dc5a0343fec142369c744466be1d1fc52fecdb + 3dec0798866b2d16b838d7a78421070b99574861 @@ -155,9 +155,9 @@ 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/msbuild - f5ae5c6896f934f790fc000b7f3761c3c93aa9a9 + 2f3d37672a69142a13a62856b09034a915bedc70 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 33b4ca481..19de1d070 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23604.16 - 8.0.200-preview.23604.16 - 8.0.200-preview.23604.16 + 8.0.200-preview.23605.8 + 8.0.200-preview.23605.8 + 8.0.200-preview.23605.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23580-01 + 17.9.0-preview-23604-01 8.0.0-alpha.1.22557.12 From 2c8e1fbdf4eac90581ef0f211c8ff88b1d2bd8c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Dec 2023 22:57:24 +0000 Subject: [PATCH 278/294] Update dependencies from https://github.com/dotnet/sdk build 20231205.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23605.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d5c062d3..03e920a9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - cd5005e32d8f289e4f49417411bbee10c8c49217 + b61fe9c7553f7407f617d032f6d8414cb54579bf - + https://github.com/dotnet/sdk - cd5005e32d8f289e4f49417411bbee10c8c49217 + b61fe9c7553f7407f617d032f6d8414cb54579bf - + https://github.com/dotnet/sdk - cd5005e32d8f289e4f49417411bbee10c8c49217 + b61fe9c7553f7407f617d032f6d8414cb54579bf - + https://github.com/dotnet/sdk - cd5005e32d8f289e4f49417411bbee10c8c49217 + b61fe9c7553f7407f617d032f6d8414cb54579bf https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 19de1d070..5b1e51410 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23605.8 - 8.0.200-preview.23605.8 - 8.0.200-preview.23605.8 + 8.0.200-preview.23605.18 + 8.0.200-preview.23605.18 + 8.0.200-preview.23605.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2458b279655b35646c07c0401cde27153b3639a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Dec 2023 01:37:02 +0000 Subject: [PATCH 279/294] Update dependencies from https://github.com/dotnet/sdk build 20231205.41 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23605.41 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03e920a9c..08d9ffaf0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b61fe9c7553f7407f617d032f6d8414cb54579bf + 07628a161cc1bed4705f110407fbe86baba323ff - + https://github.com/dotnet/sdk - b61fe9c7553f7407f617d032f6d8414cb54579bf + 07628a161cc1bed4705f110407fbe86baba323ff - + https://github.com/dotnet/sdk - b61fe9c7553f7407f617d032f6d8414cb54579bf + 07628a161cc1bed4705f110407fbe86baba323ff - + https://github.com/dotnet/sdk - b61fe9c7553f7407f617d032f6d8414cb54579bf + 07628a161cc1bed4705f110407fbe86baba323ff https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5b1e51410..a9a5bf126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23605.18 - 8.0.200-preview.23605.18 - 8.0.200-preview.23605.18 + 8.0.200-preview.23605.41 + 8.0.200-preview.23605.41 + 8.0.200-preview.23605.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed1740246bfbb8ab8fd9223c4d57c45eaa528410 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Dec 2023 02:33:37 +0000 Subject: [PATCH 280/294] Update dependencies from https://github.com/dotnet/sdk build 20231205.42 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23605.42 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08d9ffaf0..48b7eaed8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 07628a161cc1bed4705f110407fbe86baba323ff + 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 - + https://github.com/dotnet/sdk - 07628a161cc1bed4705f110407fbe86baba323ff + 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 - + https://github.com/dotnet/sdk - 07628a161cc1bed4705f110407fbe86baba323ff + 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 - + https://github.com/dotnet/sdk - 07628a161cc1bed4705f110407fbe86baba323ff + 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a9a5bf126..d6a296a60 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23605.41 - 8.0.200-preview.23605.41 - 8.0.200-preview.23605.41 + 8.0.200-preview.23605.42 + 8.0.200-preview.23605.42 + 8.0.200-preview.23605.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72c635732f1f55f01a7f02033e6dd1dee074eaa1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Dec 2023 09:38:16 +0000 Subject: [PATCH 281/294] Update dependencies from https://github.com/dotnet/sdk build 20231206.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23606.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48b7eaed8..cea67a378 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 + ccefa68ae7dca3a90697f1b804db41397b78e9a6 - + https://github.com/dotnet/sdk - 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 + ccefa68ae7dca3a90697f1b804db41397b78e9a6 - + https://github.com/dotnet/sdk - 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 + ccefa68ae7dca3a90697f1b804db41397b78e9a6 - + https://github.com/dotnet/sdk - 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 + ccefa68ae7dca3a90697f1b804db41397b78e9a6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d6a296a60..985a11dc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23605.42 - 8.0.200-preview.23605.42 - 8.0.200-preview.23605.42 + 8.0.200-preview.23606.1 + 8.0.200-preview.23606.1 + 8.0.200-preview.23606.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e452d20fdef6d2e5aec9b18d98c240c6a3892e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 00:02:51 +0000 Subject: [PATCH 282/294] Update dependencies from https://github.com/dotnet/sdk build 20231206.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23606.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cea67a378..d324c4529 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - ccefa68ae7dca3a90697f1b804db41397b78e9a6 + e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 - + https://github.com/dotnet/sdk - ccefa68ae7dca3a90697f1b804db41397b78e9a6 + e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 - + https://github.com/dotnet/sdk - ccefa68ae7dca3a90697f1b804db41397b78e9a6 + e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 - + https://github.com/dotnet/sdk - ccefa68ae7dca3a90697f1b804db41397b78e9a6 + e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b diff --git a/eng/Versions.props b/eng/Versions.props index 985a11dc7..2a3b08b3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23606.1 - 8.0.200-preview.23606.1 - 8.0.200-preview.23606.1 + 8.0.200-preview.23606.6 + 8.0.200-preview.23606.6 + 8.0.200-preview.23606.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.45 + 6.9.0-preview.1.49 From df9a956e2514a7e1b94c8dd311d647f839887cc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 01:32:11 +0000 Subject: [PATCH 283/294] Update dependencies from https://github.com/dotnet/sdk build 20231206.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23606.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d324c4529..de03413af 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 + acd780029dbec62701a3644e0f64b1019021ba0b - + https://github.com/dotnet/sdk - e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 + acd780029dbec62701a3644e0f64b1019021ba0b - + https://github.com/dotnet/sdk - e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 + acd780029dbec62701a3644e0f64b1019021ba0b - + https://github.com/dotnet/sdk - e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 + acd780029dbec62701a3644e0f64b1019021ba0b https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e diff --git a/eng/Versions.props b/eng/Versions.props index 2a3b08b3b..4ceb28332 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23606.6 - 8.0.200-preview.23606.6 - 8.0.200-preview.23606.6 + 8.0.200-preview.23606.8 + 8.0.200-preview.23606.8 + 8.0.200-preview.23606.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-2.23562.2 + 4.9.0-3.23605.1 From 3fcf149d2591d0aa56b5ae4cb96b22d1be6114e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 06:35:29 +0000 Subject: [PATCH 284/294] Update dependencies from https://github.com/dotnet/sdk build 20231206.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23606.8 -> To Version 8.0.200-preview.23606.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.200-beta.23605.2 -> To Version 12.8.200-beta.23606.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de03413af..2a84abf4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - acd780029dbec62701a3644e0f64b1019021ba0b + 6779f5d18b815766ff4f6eab474b855e70e10fab - + https://github.com/dotnet/sdk - acd780029dbec62701a3644e0f64b1019021ba0b + 6779f5d18b815766ff4f6eab474b855e70e10fab - + https://github.com/dotnet/sdk - acd780029dbec62701a3644e0f64b1019021ba0b + 6779f5d18b815766ff4f6eab474b855e70e10fab - + https://github.com/dotnet/sdk - acd780029dbec62701a3644e0f64b1019021ba0b + 6779f5d18b815766ff4f6eab474b855e70e10fab https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 05bb885a7119b541816e16ca9980ab685ffbfaa5 + 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 - + https://github.com/dotnet/fsharp - 05bb885a7119b541816e16ca9980ab685ffbfaa5 + 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 diff --git a/eng/Versions.props b/eng/Versions.props index 4ceb28332..968542276 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23606.8 - 8.0.200-preview.23606.8 - 8.0.200-preview.23606.8 + 8.0.200-preview.23606.10 + 8.0.200-preview.23606.10 + 8.0.200-preview.23606.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 50c6a3e7e21e2acfeac8daa7beae8a04c5209ae5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 14:09:20 +0000 Subject: [PATCH 285/294] Update dependencies from https://github.com/dotnet/test-templates build 20231207.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23578.1 -> To Version 1.1.0-rc.23607.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a84abf4e..4571c993e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a + 45226f35518e3152b5a54ed7a90ae66bcae22944 - + https://github.com/dotnet/test-templates - e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a + 45226f35518e3152b5a54ed7a90ae66bcae22944 - + https://github.com/dotnet/test-templates - e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a + 45226f35518e3152b5a54ed7a90ae66bcae22944 diff --git a/eng/Versions.props b/eng/Versions.props index 968542276..6e117c22d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.23578.1 - 1.1.0-rc.23578.1 - 1.1.0-rc.23578.1 + 1.1.0-rc.23607.1 + 1.1.0-rc.23607.1 + 1.1.0-rc.23607.1 From 756a93903dbc04447af864e0489f5c75f434374a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 19:36:42 +0000 Subject: [PATCH 286/294] Update dependencies from https://github.com/dotnet/sdk build 20231207.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23606.10 -> To Version 8.0.200-preview.23607.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a84abf4e..f53f059b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 6779f5d18b815766ff4f6eab474b855e70e10fab + 02f85fd3de9591e69632c0d652c8ff84e3cd3968 - + https://github.com/dotnet/sdk - 6779f5d18b815766ff4f6eab474b855e70e10fab + 02f85fd3de9591e69632c0d652c8ff84e3cd3968 - + https://github.com/dotnet/sdk - 6779f5d18b815766ff4f6eab474b855e70e10fab + 02f85fd3de9591e69632c0d652c8ff84e3cd3968 - + https://github.com/dotnet/sdk - 6779f5d18b815766ff4f6eab474b855e70e10fab + 02f85fd3de9591e69632c0d652c8ff84e3cd3968 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 968542276..6b65af4f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23606.10 - 8.0.200-preview.23606.10 - 8.0.200-preview.23606.10 + 8.0.200-preview.23607.1 + 8.0.200-preview.23607.1 + 8.0.200-preview.23607.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From befe99830698466edbe3361eed5912fbb47aef23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 09:33:45 +0000 Subject: [PATCH 287/294] Update dependencies from https://github.com/dotnet/sdk build 20231208.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23607.1 -> To Version 8.0.200-preview.23608.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 054db7569..625c362cf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 02f85fd3de9591e69632c0d652c8ff84e3cd3968 + 3039c96ce4e81b41a42496306e331d90bab678b1 - + https://github.com/dotnet/sdk - 02f85fd3de9591e69632c0d652c8ff84e3cd3968 + 3039c96ce4e81b41a42496306e331d90bab678b1 - + https://github.com/dotnet/sdk - 02f85fd3de9591e69632c0d652c8ff84e3cd3968 + 3039c96ce4e81b41a42496306e331d90bab678b1 - + https://github.com/dotnet/sdk - 02f85fd3de9591e69632c0d652c8ff84e3cd3968 + 3039c96ce4e81b41a42496306e331d90bab678b1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f5ca2545c..5c44abcba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23607.1 - 8.0.200-preview.23607.1 - 8.0.200-preview.23607.1 + 8.0.200-preview.23608.1 + 8.0.200-preview.23608.1 + 8.0.200-preview.23608.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8e6d7b93face362743700a5f08b5c0fea4f28c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 11:03:20 +0000 Subject: [PATCH 288/294] Update dependencies from https://github.com/dotnet/sdk build 20231208.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.1 -> To Version 8.0.200-preview.23608.2 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.9.0-3.23605.1 -> To Version 4.9.0-3.23606.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 625c362cf..929e69008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 3039c96ce4e81b41a42496306e331d90bab678b1 + 1b12c37feebe58e3ccfce85c972a968f1058eed9 - + https://github.com/dotnet/sdk - 3039c96ce4e81b41a42496306e331d90bab678b1 + 1b12c37feebe58e3ccfce85c972a968f1058eed9 - + https://github.com/dotnet/sdk - 3039c96ce4e81b41a42496306e331d90bab678b1 + 1b12c37feebe58e3ccfce85c972a968f1058eed9 - + https://github.com/dotnet/sdk - 3039c96ce4e81b41a42496306e331d90bab678b1 + 1b12c37feebe58e3ccfce85c972a968f1058eed9 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b https://github.com/dotnet/msbuild 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 diff --git a/eng/Versions.props b/eng/Versions.props index 5c44abcba..3b80cef6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23608.1 - 8.0.200-preview.23608.1 - 8.0.200-preview.23608.1 + 8.0.200-preview.23608.2 + 8.0.200-preview.23608.2 + 8.0.200-preview.23608.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23605.1 + 4.9.0-3.23606.8 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.49 + 6.9.0-preview.1.50 From 888ed9f29e0da6bb2e8d0374fe82fe3dbed8ea3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 11:59:10 +0000 Subject: [PATCH 289/294] Update dependencies from https://github.com/dotnet/sdk build 20231208.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.1 -> To Version 8.0.200-preview.23608.4 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 17.9.0-preview-23604-01 -> To Version 17.9.0-preview-23606-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 929e69008..54219a9d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1b12c37feebe58e3ccfce85c972a968f1058eed9 + 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 - + https://github.com/dotnet/sdk - 1b12c37feebe58e3ccfce85c972a968f1058eed9 + 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 - + https://github.com/dotnet/sdk - 1b12c37feebe58e3ccfce85c972a968f1058eed9 + 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 - + https://github.com/dotnet/sdk - 1b12c37feebe58e3ccfce85c972a968f1058eed9 + 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 - + https://github.com/microsoft/vstest - 3dec0798866b2d16b838d7a78421070b99574861 + 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 diff --git a/eng/Versions.props b/eng/Versions.props index 3b80cef6f..d8927db00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23608.2 - 8.0.200-preview.23608.2 - 8.0.200-preview.23608.2 + 8.0.200-preview.23608.4 + 8.0.200-preview.23608.4 + 8.0.200-preview.23608.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23604-01 + 17.9.0-preview-23606-01 8.0.0-alpha.1.22557.12 From e450950e033bbcd246988e3cd7a8b1013a992571 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 19:24:10 +0000 Subject: [PATCH 290/294] Update dependencies from https://github.com/dotnet/sdk build 20231208.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.4 -> To Version 8.0.200-preview.23608.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23606.1 -> To Version 12.8.200-beta.23607.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54219a9d5..1e3b21e8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 + f0414ab5878979ede3983744237050ba86197763 - + https://github.com/dotnet/sdk - 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 + f0414ab5878979ede3983744237050ba86197763 - + https://github.com/dotnet/sdk - 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 + f0414ab5878979ede3983744237050ba86197763 - + https://github.com/dotnet/sdk - 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 + f0414ab5878979ede3983744237050ba86197763 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 + a57b5e75c970694cd6159f827ffbdd14f87db185 - + https://github.com/dotnet/fsharp - 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 + a57b5e75c970694cd6159f827ffbdd14f87db185 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de diff --git a/eng/Versions.props b/eng/Versions.props index d8927db00..2c58f8a76 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23608.4 - 8.0.200-preview.23608.4 - 8.0.200-preview.23608.4 + 8.0.200-preview.23608.13 + 8.0.200-preview.23608.13 + 8.0.200-preview.23608.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23606.8 + 4.9.0-3.23607.11 From 4548efe441eb71c470f0fb5738b2be20bb3de8a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Dec 2023 00:56:59 +0000 Subject: [PATCH 291/294] Update dependencies from https://github.com/dotnet/sdk build 20231208.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.4 -> To Version 8.0.200-preview.23608.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23606.1 -> To Version 12.8.200-beta.23607.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e3b21e8f..134fe1bd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - f0414ab5878979ede3983744237050ba86197763 + d435a91084a638496c1627648ee6c9486b82255c - + https://github.com/dotnet/sdk - f0414ab5878979ede3983744237050ba86197763 + d435a91084a638496c1627648ee6c9486b82255c - + https://github.com/dotnet/sdk - f0414ab5878979ede3983744237050ba86197763 + d435a91084a638496c1627648ee6c9486b82255c - + https://github.com/dotnet/sdk - f0414ab5878979ede3983744237050ba86197763 + d435a91084a638496c1627648ee6c9486b82255c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2c58f8a76..800e95a8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23608.13 - 8.0.200-preview.23608.13 - 8.0.200-preview.23608.13 + 8.0.200-preview.23608.18 + 8.0.200-preview.23608.18 + 8.0.200-preview.23608.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 56bb481d62fa8ae04da71aec8ad2180123bfb207 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Dec 2023 03:08:22 +0000 Subject: [PATCH 292/294] Update dependencies from https://github.com/dotnet/sdk build 20231210.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.18 -> To Version 8.0.200-preview.23610.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23607.6 -> To Version 12.8.200-beta.23608.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 134fe1bd4..5a7311b86 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - d435a91084a638496c1627648ee6c9486b82255c + 69bb7de8da2b923445d9097247487af5961a2ae2 - + https://github.com/dotnet/sdk - d435a91084a638496c1627648ee6c9486b82255c + 69bb7de8da2b923445d9097247487af5961a2ae2 - + https://github.com/dotnet/sdk - d435a91084a638496c1627648ee6c9486b82255c + 69bb7de8da2b923445d9097247487af5961a2ae2 - + https://github.com/dotnet/sdk - d435a91084a638496c1627648ee6c9486b82255c + 69bb7de8da2b923445d9097247487af5961a2ae2 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - a57b5e75c970694cd6159f827ffbdd14f87db185 + e479cbe697a26f864e60ea49f02c278a8331f7bc - + https://github.com/dotnet/fsharp - a57b5e75c970694cd6159f827ffbdd14f87db185 + e479cbe697a26f864e60ea49f02c278a8331f7bc @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f diff --git a/eng/Versions.props b/eng/Versions.props index 800e95a8a..b3032cb5f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23608.18 - 8.0.200-preview.23608.18 - 8.0.200-preview.23608.18 + 8.0.200-preview.23610.2 + 8.0.200-preview.23610.2 + 8.0.200-preview.23610.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23607.11 + 4.9.0-3.23608.9 From 422bc6ea3c66cf29ac3f41b22ff6e0748fbb7840 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Sun, 10 Dec 2023 23:08:05 -0800 Subject: [PATCH 293/294] Fix failed test --- test/EndToEnd/ProjectBuildTests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index e4a5bf3b8..d27b1ac71 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -213,7 +213,7 @@ namespace EndToEnd.Tests string expectedOutput = @"[\-\s]+ -[\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ [\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ "; From 50b8d8c7e8b158772b76e930aca523c5d5143725 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 11 Dec 2023 12:53:34 -0600 Subject: [PATCH 294/294] Remove references to DotNetHost packages --- .../content/eng/bootstrap/buildBootstrapPreviouslySB.csproj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj index 56d828d22..0052cd99d 100644 --- a/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj +++ b/src/SourceBuild/content/eng/bootstrap/buildBootstrapPreviouslySB.csproj @@ -36,9 +36,6 @@ - - -