From 823a87ea90a16824679ed56e1c61cfd60e130b82 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jul 2023 20:08:54 +0000 Subject: [PATCH 01/16] Update dependencies from https://github.com/dotnet/sdk build 20230713.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.400 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 17.7.0-preview-23317-01 -> To Version 17.7.0-preview-23362-01 (parent: Microsoft.NET.Sdk --- NuGet.config | 5 +++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ac6f6e060a6..2fbf97cabfcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -49,6 +49,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9a0b8a87e52..66d4b75d9556 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://github.com/dotnet/sdk - 6b937a456ee63ecdcf0bd0bfdcc7e0a84dc0e2cc + 651aa1d1eacfacff7110b6075feaa27ddf00a808 - + https://github.com/dotnet/sdk - 6b937a456ee63ecdcf0bd0bfdcc7e0a84dc0e2cc + 651aa1d1eacfacff7110b6075feaa27ddf00a808 - + https://github.com/dotnet/sdk - 6b937a456ee63ecdcf0bd0bfdcc7e0a84dc0e2cc + 651aa1d1eacfacff7110b6075feaa27ddf00a808 - + https://github.com/dotnet/sdk - 6b937a456ee63ecdcf0bd0bfdcc7e0a84dc0e2cc + 651aa1d1eacfacff7110b6075feaa27ddf00a808 @@ -133,9 +133,9 @@ 521a4efba79d9afcfb18bc946d3dda5133252939 - + https://github.com/microsoft/vstest - 919ec8358820228cc5fa77ef000051c1d6875399 + d7f4faa42b22ba20d697b530dd6809a0c02e6278 @@ -144,18 +144,18 @@ linker - + https://github.com/dotnet/roslyn - 7c338f34cdccae85b80dc56a60a9e5733f82cfb4 + 91c9c05370d84a902010c9e1f80aebcc3a467792 - + https://github.com/dotnet/msbuild - 5785ed5c22cebcbf3a7c79dc8c91c3ce7954b2f5 + 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 - + https://github.com/dotnet/msbuild - 5785ed5c22cebcbf3a7c79dc8c91c3ce7954b2f5 + 971bf70db73ebd5d5e1dde5eb27b8265be9f3169 diff --git a/eng/Versions.props b/eng/Versions.props index 8064bfcfb26f..8a181ce38ab3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,15 +70,15 @@ 7.0.400 - 7.0.400-rtm.23361.22 - 7.0.400-rtm.23361.22 + 7.0.400-rtm.23363.6 + 7.0.400-rtm.23363.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23360.7 + 4.7.0-3.23361.9 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview-23317-01 + 17.7.0-preview-23362-01 From ae53b8aa72aa60bdff73165074651bafab511537 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 17 Jul 2023 20:31:04 +0000 Subject: [PATCH 02/16] Merged PR 32699: [internal/release/7.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 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.7.0**: from 7.0.9-servicing.23321.11 to 7.0.10-servicing.23364.4 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.7.0**: from 7.0.9-servicing.23321.11 to 7.0.10-servicing.23364.4 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.7.0**: from 7.0.9-servicing.23320.18 to 7.0.10-servicing.23363.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.7.0**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 7.0.9-servicing.23321.10 to 7.0.10-servicing.23364.39 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.9-servicing.23321.6 to 7.0.10-servicing.23363.13 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 7.0.9 to 7.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 7.0.9-servicing.23321.9 to 7.0.10-servicing.23364.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.9-servicing.23320.18 to 7.0.10-servicing.23363.12 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100**: from 7.0.9 to 7.0.10... --- NuGet.config | 20 ++++---- eng/Version.Details.xml | 106 ++++++++++++++++++++-------------------- eng/Versions.props | 46 ++++++++--------- 3 files changed, 85 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2fbf97cabfcb..c445d0b71ab4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,19 @@ + - - - + + - + - - - + @@ -46,15 +44,15 @@ + + - + - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 66d4b75d9556..7dbbad6b11d5 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 @@ -99,30 +99,30 @@ - https://github.com/dotnet/sdk - 651aa1d1eacfacff7110b6075feaa27ddf00a808 + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 01d38c0069d298539d4b9ab7977bb040aa3858c4 - - https://github.com/dotnet/sdk - 651aa1d1eacfacff7110b6075feaa27ddf00a808 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 01d38c0069d298539d4b9ab7977bb040aa3858c4 - - https://github.com/dotnet/sdk - 651aa1d1eacfacff7110b6075feaa27ddf00a808 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 01d38c0069d298539d4b9ab7977bb040aa3858c4 - - https://github.com/dotnet/sdk - 651aa1d1eacfacff7110b6075feaa27ddf00a808 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 01d38c0069d298539d4b9ab7977bb040aa3858c4 - + 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 @@ -167,13 +167,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d - + https://github.com/dotnet/emsdk - 9b227c1606a01920839873f840f6b76f7b492a66 + 96ba1fedbcfb742d0d154532f6ac3c30d14a5f7d https://github.com/dotnet/deployment-tools diff --git a/eng/Versions.props b/eng/Versions.props index 8a181ce38ab3..be9e10310c9c 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,13 +56,13 @@ - 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 @@ -70,8 +70,8 @@ 7.0.400 - 7.0.400-rtm.23363.6 - 7.0.400-rtm.23363.6 + 7.0.400-rtm.23367.7 + 7.0.400-rtm.23367.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -86,20 +86,20 @@ - 7.0.9-servicing.23320.18 - 7.0.9-servicing.23320.18 - 7.0.9 - 7.0.9 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23363.12 + 7.0.10-servicing.23363.12 + 7.0.10 + 7.0.10 + 7.0.10 + 7.0.10 2.1.0 - 7.0.9-servicing.23321.11 - 7.0.9-servicing.23321.11 - 7.0.9 - 7.0.9 + 7.0.10-servicing.23364.4 + 7.0.10-servicing.23364.4 + 7.0.10 + 7.0.10 @@ -233,8 +233,8 @@ 12.3.2372 16.0.1478 $(MicrosoftNETCoreAppRefPackageVersion) - 7.0.9 - 7.0.9 + 7.0.10 + 7.0.10 $(MicrosoftNETWorkloadEmscriptennet7Manifest70100Version) From 79bfb91009f487bebf48d15132868f932785df2d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jul 2023 21:11:18 +0000 Subject: [PATCH 03/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230717.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.400 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 c445d0b71ab4..69cd3b0af89a 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 7dbbad6b11d5..52b6cc001b80 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 - 01d38c0069d298539d4b9ab7977bb040aa3858c4 + 9f9d6fed9c294ab1689c274616ef1e969b32d34a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 01d38c0069d298539d4b9ab7977bb040aa3858c4 + 9f9d6fed9c294ab1689c274616ef1e969b32d34a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 01d38c0069d298539d4b9ab7977bb040aa3858c4 + 9f9d6fed9c294ab1689c274616ef1e969b32d34a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 01d38c0069d298539d4b9ab7977bb040aa3858c4 + 9f9d6fed9c294ab1689c274616ef1e969b32d34a - + 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 be9e10310c9c..106d720178ea 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.400 - 7.0.400-rtm.23367.7 - 7.0.400-rtm.23367.7 + 7.0.400-rtm.23367.20 + 7.0.400-rtm.23367.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -96,8 +96,8 @@ - 7.0.10-servicing.23364.4 - 7.0.10-servicing.23364.4 + 7.0.10-servicing.23367.2 + 7.0.10-servicing.23367.2 7.0.10 7.0.10 From ad6ee0fd850b6f7c5e47ecc9e560b3f23960c558 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 19 Jul 2023 09:56:46 -0700 Subject: [PATCH 04/16] Update implicit version for August release --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8064bfcfb26f..9c32dca07c22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,7 +23,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 20)) + $([MSBuild]::Add($(VersionFeature), 21)) From c45da053b37e0115f41a59014b4f1a45a93da244 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 19 Jul 2023 22:56:15 +0000 Subject: [PATCH 05/16] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20230719.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400 -> To Version 7.0.400 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.7.0-beta.23328.4 -> To Version 12.7.0-beta.23364.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 30 +++++++++++++++--------------- eng/Versions.props | 8 ++++---- 3 files changed, 28 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69cd3b0af89a..9bf5ba918ae9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,18 +11,22 @@ + + + - + + @@ -44,14 +48,17 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52b6cc001b80..4e7a1168a429 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -100,20 +100,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9d6fed9c294ab1689c274616ef1e969b32d34a + 8e1f76c1f41ecd37935288c617c53342533db704 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9d6fed9c294ab1689c274616ef1e969b32d34a + 8e1f76c1f41ecd37935288c617c53342533db704 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9d6fed9c294ab1689c274616ef1e969b32d34a + 8e1f76c1f41ecd37935288c617c53342533db704 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9f9d6fed9c294ab1689c274616ef1e969b32d34a + 8e1f76c1f41ecd37935288c617c53342533db704 @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 9a9892f5204f1a1b31ab2c81b025d6e35e0f3693 - + https://github.com/dotnet/fsharp - 521a4efba79d9afcfb18bc946d3dda5133252939 + 159a701477f5ca1e2d960e9bf79ce05769b3c671 - + https://github.com/dotnet/fsharp - 521a4efba79d9afcfb18bc946d3dda5133252939 + 159a701477f5ca1e2d960e9bf79ce05769b3c671 - + https://github.com/microsoft/vstest - d7f4faa42b22ba20d697b530dd6809a0c02e6278 + bc17bb9693cfc4778ded51aa0ab7f1065433f989 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 91c9c05370d84a902010c9e1f80aebcc3a467792 + dad7898acd6372d4380612b9f225db0c2cbfa1e9 diff --git a/eng/Versions.props b/eng/Versions.props index 8f03a0c6c25b..a2e0d7bc665a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -70,15 +70,15 @@ 7.0.400 - 7.0.400-rtm.23367.20 - 7.0.400-rtm.23367.20 + 7.0.400-rtm.23369.15 + 7.0.400-rtm.23369.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-3.23361.9 + 4.7.0-3.23366.1 @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview-23362-01 + 17.7.0-preview-23364-03 From f28324a7b5335b96ca1954acb6f1af4a6ab55b1f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 19 Jul 2023 19:28:24 -0700 Subject: [PATCH 06/16] remove patch --- ...explicit-System.Text.Json-dependency.patch | 31 ------------------- 1 file changed, 31 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 74e217fbe550..000000000000 --- a/src/SourceBuild/tarball/patches/sdk/0001-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:02:20 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/sdk/pull/33618 ---- - src/BuiltInTools/dotnet-watch/dotnet-watch.csproj | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -index 065f750f72..13d2c1ed99 100644 ---- a/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -+++ b/src/BuiltInTools/dotnet-watch/dotnet-watch.csproj -@@ -23,6 +23,13 @@ - - - -+ -+ -+ -+ - - - From 0e25cdd13e7a301e9488754894f67a5ef38f7d8c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jul 2023 18:02:22 +0000 Subject: [PATCH 07/16] Update dependencies from https://github.com/dotnet/arcade build 20230720.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23361.2 -> To Version 7.0.0-beta.23370.3 --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ac6f6e060a6..befa727e3cd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,9 +12,6 @@ - - - @@ -22,9 +19,6 @@ - - - @@ -51,9 +45,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9a0b8a87e52..7cabfbd1c750 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 - + https://github.com/dotnet/arcade - cae11bc40b691f546d788f7ab37f7eaf0e24ded8 + c9c125ccc43361cd94433c2d7f7069d465ad11a5 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9c32dca07c22..5e62375640ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23361.2 + 7.0.0-beta.23370.3 diff --git a/global.json b/global.json index d20ab25699d0..0df69a962dd2 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.23361.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23361.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23370.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23370.3" } } From 20d8a77dc1360d48e583e3ad730e9aefd9bd810b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Jul 2023 10:21:12 +0000 Subject: [PATCH 08/16] Update dependencies from https://github.com/dotnet/test-templates build 20230731.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.23330.2 -> To Version 1.1.0-rc.23381.1 --- NuGet.config | 9 --------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 18 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5ac6f6e060a6..befa727e3cd7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,9 +12,6 @@ - - - @@ -22,9 +19,6 @@ - - - @@ -51,9 +45,6 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9a0b8a87e52..f5ffb28dedd0 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 - 86fd4cd1c57057f920678e29d6ecbba491abd142 + 0b5cd2fb118d04da9b8719f681d215fab1bab7a5 - + https://github.com/dotnet/test-templates - 86fd4cd1c57057f920678e29d6ecbba491abd142 + 0b5cd2fb118d04da9b8719f681d215fab1bab7a5 - + https://github.com/dotnet/test-templates - 86fd4cd1c57057f920678e29d6ecbba491abd142 + 0b5cd2fb118d04da9b8719f681d215fab1bab7a5 diff --git a/eng/Versions.props b/eng/Versions.props index 9c32dca07c22..7fd390c1b464 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23330.2 - 1.1.0-rc.23330.2 - 1.1.0-rc.23330.2 + 1.1.0-rc.23381.1 + 1.1.0-rc.23381.1 + 1.1.0-rc.23381.1 From cc7a0a9c176518ea9a18c3ecdaf28f9b156378cc Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Aug 2023 11:01:19 -0700 Subject: [PATCH 09/16] Update branding to 7.0.401 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9c32dca07c22..6e2929381a5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 7 0 4 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) rtm From 67833da15932858adcffa8b73c769fac43964895 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 1 Aug 2023 14:41:26 -0700 Subject: [PATCH 10/16] Switch to servicing branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6e2929381a5e..46cd2d3a94dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,7 +10,7 @@ 4 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + servicing $(VersionMajor).$(VersionMinor) From cc23f14dad968bc8a43a14137dd8787e28476893 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 1 Aug 2023 15:50:24 -0700 Subject: [PATCH 11/16] Temporarily subtract two from the web templates --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 46cd2d3a94dc..d8ecf167ff9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -129,7 +129,7 @@ --> true true - $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(VersionFeature60), 2)) $(VersionFeature60) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From de957516edda8d1e9901b8417d89be4e2687fdc5 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 8 Aug 2023 10:50:33 -0700 Subject: [PATCH 12/16] Revert template version subtraction --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 62c3b6b9599b..75eba8dd19ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -129,7 +129,7 @@ --> true true - $([MSBuild]::Subtract($(VersionFeature60), 2)) + $([MSBuild]::Subtract($(VersionFeature60), 1)) $(VersionFeature60) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From e9940734b95b6045f02e324a37e55d385c7bae2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 17:50:43 +0000 Subject: [PATCH 13/16] [release/7.0.4xx] Update dependencies from dotnet/test-templates (#17133) [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 94e8e7ba3fec..d95ccbaa3465 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 - 0b5cd2fb118d04da9b8719f681d215fab1bab7a5 + 066365870a8273233a00b394f43987bc21a8c9e2 - + https://github.com/dotnet/test-templates - 0b5cd2fb118d04da9b8719f681d215fab1bab7a5 + 066365870a8273233a00b394f43987bc21a8c9e2 - + https://github.com/dotnet/test-templates - 0b5cd2fb118d04da9b8719f681d215fab1bab7a5 + 066365870a8273233a00b394f43987bc21a8c9e2 diff --git a/eng/Versions.props b/eng/Versions.props index e6c93333abf6..6db8c9821de9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23381.1 - 1.1.0-rc.23381.1 - 1.1.0-rc.23381.1 + 1.1.0-rc.23408.2 + 1.1.0-rc.23408.2 + 1.1.0-rc.23408.2 From 1a3b7c0d492a17d9ba070880516cae854312755a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 8 Aug 2023 23:59:03 +0000 Subject: [PATCH 14/16] Update dependencies from https://github.com/dotnet/arcade build 20230808.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23370.3 -> To Version 7.0.0-beta.23408.3 --- 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 9bf5ba918ae9..83b691f4f2ca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,21 +11,31 @@ + + + + + + + + + + @@ -49,16 +59,24 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a034a4d27e30..c8620c487e93 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,18 @@ - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 - + https://github.com/dotnet/arcade - c9c125ccc43361cd94433c2d7f7069d465ad11a5 + 3b8f3de4606c338f99e8ce85cfb6f960f6a428c8 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 2c3e8ec81525..abbfa4d01a14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23370.3 + 7.0.0-beta.23408.3 diff --git a/global.json b/global.json index 0df69a962dd2..bf1732f0896f 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "7.0.109", + "dotnet": "7.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23370.3", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23370.3" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23408.3", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23408.3" } } From 683e2d9b57877fd89731d46715f17d700b9bc69d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 08:44:20 -0700 Subject: [PATCH 15/16] [release/7.0.4xx] Update dependencies from dotnet/test-templates (#17154) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 14 -------------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 3 files changed, 9 insertions(+), 23 deletions(-) diff --git a/NuGet.config b/NuGet.config index 83b691f4f2ca..cc5c95362822 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,15 +22,8 @@ - - - - - - - @@ -64,14 +57,7 @@ - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8620c487e93..21a61ec0bc0f 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 - 066365870a8273233a00b394f43987bc21a8c9e2 + 81e0a39fcf0321e38debc165803390d070c29d18 - + https://github.com/dotnet/test-templates - 066365870a8273233a00b394f43987bc21a8c9e2 + 81e0a39fcf0321e38debc165803390d070c29d18 - + https://github.com/dotnet/test-templates - 066365870a8273233a00b394f43987bc21a8c9e2 + 81e0a39fcf0321e38debc165803390d070c29d18 diff --git a/eng/Versions.props b/eng/Versions.props index abbfa4d01a14..3efb42e469cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23408.2 - 1.1.0-rc.23408.2 - 1.1.0-rc.23408.2 + 1.1.0-rc.23409.1 + 1.1.0-rc.23409.1 + 1.1.0-rc.23409.1 From 1349348f8de1b92e89875d306a3cad7257642693 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Aug 2023 21:39:28 +0000 Subject: [PATCH 16/16] Update dependencies from https://github.com/dotnet/test-templates build 20230809.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.23409.1 -> To Version 1.1.0-rc.23409.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 21a61ec0bc0f..40b8870dd546 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 - 81e0a39fcf0321e38debc165803390d070c29d18 + 3337ce19e6fb3365f80f69df56c77c87d308db1d - + https://github.com/dotnet/test-templates - 81e0a39fcf0321e38debc165803390d070c29d18 + 3337ce19e6fb3365f80f69df56c77c87d308db1d - + https://github.com/dotnet/test-templates - 81e0a39fcf0321e38debc165803390d070c29d18 + 3337ce19e6fb3365f80f69df56c77c87d308db1d diff --git a/eng/Versions.props b/eng/Versions.props index 3efb42e469cd..3bce6f43eba5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -46,9 +46,9 @@ 1.0.2-beta4.22406.1 - 1.1.0-rc.23409.1 - 1.1.0-rc.23409.1 - 1.1.0-rc.23409.1 + 1.1.0-rc.23409.2 + 1.1.0-rc.23409.2 + 1.1.0-rc.23409.2