From 2b1cb59467de25a9b54bbfb738a5ff504bb0fbaf Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:42:18 -0800 Subject: [PATCH 01/22] Branding for 7.0.3xx --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8b3a57153281..b0aa91ba54db 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 7 0 - 2 + 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) preview From d6c8188ab4709d53d5bbab4b56c8281f0365e689 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 13 Jan 2023 15:45:51 -0800 Subject: [PATCH 02/22] Update implicit versions for Jan release --- src/redist/targets/GenerateBundledVersions.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 14f9bc796ab9..5ecb3a19f46d 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -63,7 +63,7 @@ 30 32 17 - 12 + 13 From 21ac75ca743098b72357129d76cdeccf46aed696 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Jan 2023 00:45:09 +0000 Subject: [PATCH 03/22] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20230113.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 7.0.0-alpha.1.22608.2 -> To Version 7.0.0-alpha.1.23063.1 --- eng/Version.Details.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76a6cf0f015f..a738cbcb804b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -201,7 +201,7 @@ https://github.com/dotnet/arcade ac5977ebf05451c1adcf24a15d16263e4d25fd0c - + https://github.com/dotnet/source-build-reference-packages 9964206e0dd215eee4ed199b9041a94e16ba4c45 From 4947b377272c5bb19d025339e5e4b65a363cdc47 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 14 Jan 2023 00:56:52 +0000 Subject: [PATCH 04/22] Update dependencies from https://github.com/dotnet/sdk build 20230113.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23063.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 6 +++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 76a6cf0f015f..6f6e83710a39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + 375cc692d9740d79f3ac3091c5c70611e10ec2f3 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + 375cc692d9740d79f3ac3091c5c70611e10ec2f3 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + 375cc692d9740d79f3ac3091c5c70611e10ec2f3 - + https://github.com/dotnet/sdk - 3605277a9324189c35b0da271e10a2386d6f6d06 + 375cc692d9740d79f3ac3091c5c70611e10ec2f3 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf - + https://github.com/dotnet/fsharp - 1607c540c369f9ae32a48dd72e7952148b084a2a + 9abb456f29f254da028126cb09ad10751a01eebf @@ -138,20 +138,20 @@ be79eb4393631df7c6431ed1c0aa14c1bbaca731 - + https://github.com/dotnet/linker - 8db10f44053ed4cb95a99676ac7b8ccae681b79d + 19fa656d35252ccf926e6a6d783b16a2f094aaef linker - + https://github.com/dotnet/roslyn - 8ad2e6240cb7426d83f1b45241f8f33bddf3d474 + 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - ab3d68e815ba13916d6d3a653445d71ad238c723 + 040e2a90ee794997fc9716487280a54b0ad8fe2a diff --git a/eng/Versions.props b/eng/Versions.props index b0aa91ba54db..e394e6f22e59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 - 7.0.200-preview.23060.2 + 7.0.300-preview.23063.18 + 7.0.300-preview.23063.18 + 7.0.300-preview.23063.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 46b46bcd143d28a35232bf596bba523e1c9ddd20 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 07:07:08 +0000 Subject: [PATCH 05/22] Update dependencies from https://github.com/dotnet/sdk build 20230115.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23065.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23062.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f6e83710a39..5eea736ed423 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 375cc692d9740d79f3ac3091c5c70611e10ec2f3 + c377c4648da3cdfcf61e3618d0b801ae7d55207d - + https://github.com/dotnet/sdk - 375cc692d9740d79f3ac3091c5c70611e10ec2f3 + c377c4648da3cdfcf61e3618d0b801ae7d55207d - + https://github.com/dotnet/sdk - 375cc692d9740d79f3ac3091c5c70611e10ec2f3 + c377c4648da3cdfcf61e3618d0b801ae7d55207d - + https://github.com/dotnet/sdk - 375cc692d9740d79f3ac3091c5c70611e10ec2f3 + c377c4648da3cdfcf61e3618d0b801ae7d55207d @@ -149,9 +149,9 @@ 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - 040e2a90ee794997fc9716487280a54b0ad8fe2a + 0432271a348e62885c16583c9bb451c8d5b9e8d9 diff --git a/eng/Versions.props b/eng/Versions.props index e394e6f22e59..908b3efe17f6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23063.18 - 7.0.300-preview.23063.18 - 7.0.300-preview.23063.18 + 7.0.300-preview.23065.5 + 7.0.300-preview.23065.5 + 7.0.300-preview.23065.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7f3f9f2c189b03f7296a386394cc54bf02d6e276 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 08:29:14 +0000 Subject: [PATCH 06/22] Update dependencies from https://github.com/dotnet/sdk build 20230115.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23065.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.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 5eea736ed423..f36828441082 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - c377c4648da3cdfcf61e3618d0b801ae7d55207d + 0907ee0d8243a06739beb8c322f61e09bd6d84cd - + https://github.com/dotnet/sdk - c377c4648da3cdfcf61e3618d0b801ae7d55207d + 0907ee0d8243a06739beb8c322f61e09bd6d84cd - + https://github.com/dotnet/sdk - c377c4648da3cdfcf61e3618d0b801ae7d55207d + 0907ee0d8243a06739beb8c322f61e09bd6d84cd - + https://github.com/dotnet/sdk - c377c4648da3cdfcf61e3618d0b801ae7d55207d + 0907ee0d8243a06739beb8c322f61e09bd6d84cd @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc - + https://github.com/dotnet/fsharp - 9abb456f29f254da028126cb09ad10751a01eebf + 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc diff --git a/eng/Versions.props b/eng/Versions.props index 908b3efe17f6..d223af4884ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23065.5 - 7.0.300-preview.23065.5 - 7.0.300-preview.23065.5 + 7.0.300-preview.23065.8 + 7.0.300-preview.23065.8 + 7.0.300-preview.23065.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8860d19e4478202ae3e2c881f153d254a2f349f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 09:55:55 +0000 Subject: [PATCH 07/22] Update dependencies from https://github.com/dotnet/sdk build 20230116.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23066.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f36828441082..3a0f28e70f17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0907ee0d8243a06739beb8c322f61e09bd6d84cd + d7c6af36c625491bb06823cbfa9b1e0554f19fc3 - + https://github.com/dotnet/sdk - 0907ee0d8243a06739beb8c322f61e09bd6d84cd + d7c6af36c625491bb06823cbfa9b1e0554f19fc3 - + https://github.com/dotnet/sdk - 0907ee0d8243a06739beb8c322f61e09bd6d84cd + d7c6af36c625491bb06823cbfa9b1e0554f19fc3 - + https://github.com/dotnet/sdk - 0907ee0d8243a06739beb8c322f61e09bd6d84cd + d7c6af36c625491bb06823cbfa9b1e0554f19fc3 @@ -149,9 +149,9 @@ 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - 0432271a348e62885c16583c9bb451c8d5b9e8d9 + 6b6879045dfe421da2a79816bef6688eed4c6075 diff --git a/eng/Versions.props b/eng/Versions.props index d223af4884ee..7ed57c65987b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23065.8 - 7.0.300-preview.23065.8 - 7.0.300-preview.23065.8 + 7.0.300-preview.23066.2 + 7.0.300-preview.23066.2 + 7.0.300-preview.23066.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 901a6db49c2a74029c89daa2f1a76da78d55125c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 16 Jan 2023 18:30:50 +0000 Subject: [PATCH 08/22] Update dependencies from https://github.com/dotnet/sdk build 20230116.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23066.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (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 3a0f28e70f17..65525b4928cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - d7c6af36c625491bb06823cbfa9b1e0554f19fc3 + 7b16096588876d39e63e2525230ea0e4e4b54674 - + https://github.com/dotnet/sdk - d7c6af36c625491bb06823cbfa9b1e0554f19fc3 + 7b16096588876d39e63e2525230ea0e4e4b54674 - + https://github.com/dotnet/sdk - d7c6af36c625491bb06823cbfa9b1e0554f19fc3 + 7b16096588876d39e63e2525230ea0e4e4b54674 - + https://github.com/dotnet/sdk - d7c6af36c625491bb06823cbfa9b1e0554f19fc3 + 7b16096588876d39e63e2525230ea0e4e4b54674 @@ -133,9 +133,9 @@ 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc - + https://github.com/microsoft/vstest - be79eb4393631df7c6431ed1c0aa14c1bbaca731 + eb05f0dec14e85a87ce98d2cd8a92b64d92c99c1 diff --git a/eng/Versions.props b/eng/Versions.props index 7ed57c65987b..c5115f1313b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23066.2 - 7.0.300-preview.23066.2 - 7.0.300-preview.23066.2 + 7.0.300-preview.23066.9 + 7.0.300-preview.23066.9 + 7.0.300-preview.23066.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.5.0-release-20221220-01 + 17.6.0-preview-20230110-03 From 05b55311c9557eeecb8399135ea0fb9cc1d6264a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 11:48:18 +0000 Subject: [PATCH 09/22] Update dependencies from https://github.com/dotnet/sdk build 20230117.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (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 65525b4928cc..2e1fb2795b30 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 7b16096588876d39e63e2525230ea0e4e4b54674 + 0b5ec7053b5a7998369a6774c80dbbafff64dd57 - + https://github.com/dotnet/sdk - 7b16096588876d39e63e2525230ea0e4e4b54674 + 0b5ec7053b5a7998369a6774c80dbbafff64dd57 - + https://github.com/dotnet/sdk - 7b16096588876d39e63e2525230ea0e4e4b54674 + 0b5ec7053b5a7998369a6774c80dbbafff64dd57 - + https://github.com/dotnet/sdk - 7b16096588876d39e63e2525230ea0e4e4b54674 + 0b5ec7053b5a7998369a6774c80dbbafff64dd57 diff --git a/eng/Versions.props b/eng/Versions.props index c5115f1313b2..d7814a8b5e70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23066.9 - 7.0.300-preview.23066.9 - 7.0.300-preview.23066.9 + 7.0.300-preview.23067.2 + 7.0.300-preview.23067.2 + 7.0.300-preview.23067.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 18f77e75eaf06fed2eeabbf1fc56dbd78a408a7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 13:09:34 +0000 Subject: [PATCH 10/22] Update dependencies from https://github.com/dotnet/sdk build 20230117.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e1fb2795b30..d67005fd8326 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 0b5ec7053b5a7998369a6774c80dbbafff64dd57 + ff304dc6cb6920a9a3048b1c61ad20e000e0f00b - + https://github.com/dotnet/sdk - 0b5ec7053b5a7998369a6774c80dbbafff64dd57 + ff304dc6cb6920a9a3048b1c61ad20e000e0f00b - + https://github.com/dotnet/sdk - 0b5ec7053b5a7998369a6774c80dbbafff64dd57 + ff304dc6cb6920a9a3048b1c61ad20e000e0f00b - + https://github.com/dotnet/sdk - 0b5ec7053b5a7998369a6774c80dbbafff64dd57 + ff304dc6cb6920a9a3048b1c61ad20e000e0f00b @@ -149,9 +149,9 @@ 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - 6b6879045dfe421da2a79816bef6688eed4c6075 + 7711999070e51442c3e527f576159828f01cb3bf diff --git a/eng/Versions.props b/eng/Versions.props index d7814a8b5e70..1c3894c2a1d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23067.2 - 7.0.300-preview.23067.2 - 7.0.300-preview.23067.2 + 7.0.300-preview.23067.3 + 7.0.300-preview.23067.3 + 7.0.300-preview.23067.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7c3bbf3ff0982464f0e4fa9b2311d89f74d6255b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Jan 2023 21:13:47 +0000 Subject: [PATCH 11/22] Update dependencies from https://github.com/dotnet/sdk build 20230117.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.200-preview.23060.2 -> To Version 7.0.300-preview.23067.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.5.0-beta.23059.11 -> To Version 12.5.0-beta.23064.1 (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 d67005fd8326..5b88176ad125 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - ff304dc6cb6920a9a3048b1c61ad20e000e0f00b + 73949520b05bad9cd654d25ac126656ebd2707b0 - + https://github.com/dotnet/sdk - ff304dc6cb6920a9a3048b1c61ad20e000e0f00b + 73949520b05bad9cd654d25ac126656ebd2707b0 - + https://github.com/dotnet/sdk - ff304dc6cb6920a9a3048b1c61ad20e000e0f00b + 73949520b05bad9cd654d25ac126656ebd2707b0 - + https://github.com/dotnet/sdk - ff304dc6cb6920a9a3048b1c61ad20e000e0f00b + 73949520b05bad9cd654d25ac126656ebd2707b0 @@ -133,9 +133,9 @@ 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc - + https://github.com/microsoft/vstest - eb05f0dec14e85a87ce98d2cd8a92b64d92c99c1 + 5e9c3debd9d0007c53e7510ac030ea5e8fc483f4 diff --git a/eng/Versions.props b/eng/Versions.props index 1c3894c2a1d9..190877e22abd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23067.3 - 7.0.300-preview.23067.3 - 7.0.300-preview.23067.3 + 7.0.300-preview.23067.10 + 7.0.300-preview.23067.10 + 7.0.300-preview.23067.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230110-03 + 17.6.0-preview-20230117-02 From 6b6a21b4e31e804f1104e554eb0109cce8b798a4 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Tue, 17 Jan 2023 13:40:03 -0800 Subject: [PATCH 12/22] Disable source-build tarball build in CI --- .vsts-ci.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index eb2acb8c9bdd..266784afc126 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -334,10 +334,11 @@ stages: - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml - - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: - - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml - parameters: - dependsOn: Source_Build_Create_Tarball + # For .NET 7.0, source-build currently supports 7.0.1xx. Disable tarball build validation in all other branches. + # - ${{ if in(variables['Build.Reason'], 'PullRequest') }}: + # - template: /src/SourceBuild/Arcade/eng/common/templates/job/source-build-run-tarball-build.yml + # parameters: + # dependsOn: Source_Build_Create_Tarball # https://github.com/dotnet/core-sdk/issues/248 # - template: /eng/build.yml From df86982e14fd8c483336ed754f1f40152b66fdd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Jan 2023 06:58:39 +0000 Subject: [PATCH 13/22] Update dependencies from https://github.com/dotnet/sdk build 20230117.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23067.10 -> To Version 7.0.300-preview.23067.31 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23064.1 -> To Version 12.5.0-beta.23067.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 8b615a72205f..16e5d29dfb72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 73949520b05bad9cd654d25ac126656ebd2707b0 + eb80d061694dc32a282e43c02e8f984e5e7c7f84 - + https://github.com/dotnet/sdk - 73949520b05bad9cd654d25ac126656ebd2707b0 + eb80d061694dc32a282e43c02e8f984e5e7c7f84 - + https://github.com/dotnet/sdk - 73949520b05bad9cd654d25ac126656ebd2707b0 + eb80d061694dc32a282e43c02e8f984e5e7c7f84 - + https://github.com/dotnet/sdk - 73949520b05bad9cd654d25ac126656ebd2707b0 + eb80d061694dc32a282e43c02e8f984e5e7c7f84 @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc + 6ebe669cd147075a2e66699cf4e1b1a338f89fe5 - + https://github.com/dotnet/fsharp - 9f03ca4d15dd50b7592131502bd8cd7fa854b9bc + 6ebe669cd147075a2e66699cf4e1b1a338f89fe5 diff --git a/eng/Versions.props b/eng/Versions.props index 190877e22abd..ae909e818ca1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23067.10 - 7.0.300-preview.23067.10 - 7.0.300-preview.23067.10 + 7.0.300-preview.23067.31 + 7.0.300-preview.23067.31 + 7.0.300-preview.23067.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c905c1d9447874017b330a284798ecc151f5a824 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 18 Jan 2023 11:30:22 +0000 Subject: [PATCH 14/22] Update dependencies from https://github.com/dotnet/sdk build 20230118.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23067.10 -> To Version 7.0.300-preview.23068.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.5.0-beta.23064.1 -> To Version 12.5.0-beta.23067.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16e5d29dfb72..e2d2b72a7e48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - eb80d061694dc32a282e43c02e8f984e5e7c7f84 + b3d3ae6773f6015c1b0713de52bb66d2152c3da9 - + https://github.com/dotnet/sdk - eb80d061694dc32a282e43c02e8f984e5e7c7f84 + b3d3ae6773f6015c1b0713de52bb66d2152c3da9 - + https://github.com/dotnet/sdk - eb80d061694dc32a282e43c02e8f984e5e7c7f84 + b3d3ae6773f6015c1b0713de52bb66d2152c3da9 - + https://github.com/dotnet/sdk - eb80d061694dc32a282e43c02e8f984e5e7c7f84 + b3d3ae6773f6015c1b0713de52bb66d2152c3da9 @@ -149,9 +149,9 @@ 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 - + https://github.com/dotnet/msbuild - 7711999070e51442c3e527f576159828f01cb3bf + 98924b86bbc19aff3360f9cc3a2922df6a5c5d6a diff --git a/eng/Versions.props b/eng/Versions.props index ae909e818ca1..47414d52ba5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23067.31 - 7.0.300-preview.23067.31 - 7.0.300-preview.23067.31 + 7.0.300-preview.23068.2 + 7.0.300-preview.23068.2 + 7.0.300-preview.23068.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9ee490fe01623cc6bd109cba4b9d34ced31ed6ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Jan 2023 20:59:20 +0000 Subject: [PATCH 15/22] Update dependencies from https://github.com/dotnet/arcade build 20230123.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23060.4 -> To Version 7.0.0-beta.23073.6 --- 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 e2d2b72a7e48..973aa491b8dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -188,18 +188,18 @@ - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5f8519337c864af63b8692754ca0fa971bfc55d4 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5f8519337c864af63b8692754ca0fa971bfc55d4 - + https://github.com/dotnet/arcade - ac5977ebf05451c1adcf24a15d16263e4d25fd0c + 5f8519337c864af63b8692754ca0fa971bfc55d4 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 47414d52ba5c..98d291b725c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -27,7 +27,7 @@ - 7.0.0-beta.23060.4 + 7.0.0-beta.23073.6 diff --git a/global.json b/global.json index c4142c60624c..0d15a2c1f147 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.23060.4", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23060.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23073.6", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23073.6" } } From fd189af197de5b9d3811a5beb8cddabea66b8ffc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 14:22:53 -0800 Subject: [PATCH 16/22] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15304) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 8 ++++---- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e2d2b72a7e48..49dd18bf61a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b3d3ae6773f6015c1b0713de52bb66d2152c3da9 + b14a7932d39d902facc5e7894cc08719cf96b5f4 - + https://github.com/dotnet/sdk - b3d3ae6773f6015c1b0713de52bb66d2152c3da9 + b14a7932d39d902facc5e7894cc08719cf96b5f4 - + https://github.com/dotnet/sdk - b3d3ae6773f6015c1b0713de52bb66d2152c3da9 + b14a7932d39d902facc5e7894cc08719cf96b5f4 - + https://github.com/dotnet/sdk - b3d3ae6773f6015c1b0713de52bb66d2152c3da9 + b14a7932d39d902facc5e7894cc08719cf96b5f4 @@ -124,34 +124,34 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 6ebe669cd147075a2e66699cf4e1b1a338f89fe5 + 710fe514a6944d2cfc385ec7ab4f43c6a1a74496 - + https://github.com/dotnet/fsharp - 6ebe669cd147075a2e66699cf4e1b1a338f89fe5 + 710fe514a6944d2cfc385ec7ab4f43c6a1a74496 - + https://github.com/microsoft/vstest - 5e9c3debd9d0007c53e7510ac030ea5e8fc483f4 + e4dc6da9be102b98cce874bccdd3641e1d0e558d - + https://github.com/dotnet/linker - 19fa656d35252ccf926e6a6d783b16a2f094aaef + de8bf14fcdfb55f2bae3db8cfc310ddd8ee921e6 linker - + https://github.com/dotnet/roslyn - 7061c64ddbd931d55b9a97f95243fcf91d04d7b1 + f5987d2c4a3cc6d524e63fc851641545ad05af37 - + https://github.com/dotnet/msbuild - 98924b86bbc19aff3360f9cc3a2922df6a5c5d6a + 7bf511372af6bc80510e1ee6711661c2e0683fe0 diff --git a/eng/Versions.props b/eng/Versions.props index 47414d52ba5c..b88f96c4188e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23068.2 - 7.0.300-preview.23068.2 - 7.0.300-preview.23068.2 + 7.0.300-preview.23101.7 + 7.0.300-preview.23101.7 + 7.0.300-preview.23101.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230117-02 + 17.6.0-preview-20230131-02 From 053418daf6d6d4a6613ff450bf9a6f9ea0ce281f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 16:39:41 -0800 Subject: [PATCH 17/22] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15396) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49dd18bf61a3..038a28308b64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - b14a7932d39d902facc5e7894cc08719cf96b5f4 + 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f - + https://github.com/dotnet/sdk - b14a7932d39d902facc5e7894cc08719cf96b5f4 + 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f - + https://github.com/dotnet/sdk - b14a7932d39d902facc5e7894cc08719cf96b5f4 + 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f - + https://github.com/dotnet/sdk - b14a7932d39d902facc5e7894cc08719cf96b5f4 + 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 710fe514a6944d2cfc385ec7ab4f43c6a1a74496 + b4317096ea3aacdb48505744c9e371d5310464c2 - + https://github.com/dotnet/fsharp - 710fe514a6944d2cfc385ec7ab4f43c6a1a74496 + b4317096ea3aacdb48505744c9e371d5310464c2 @@ -149,9 +149,9 @@ f5987d2c4a3cc6d524e63fc851641545ad05af37 - + https://github.com/dotnet/msbuild - 7bf511372af6bc80510e1ee6711661c2e0683fe0 + 7cfb36cb90d1c9cc34bc4e0910d0c9ef42ee47b6 diff --git a/eng/Versions.props b/eng/Versions.props index b88f96c4188e..bfc8e4e2bc1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23101.7 - 7.0.300-preview.23101.7 - 7.0.300-preview.23101.7 + 7.0.300-preview.23101.10 + 7.0.300-preview.23101.10 + 7.0.300-preview.23101.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8f3b1270b3c951beb723c7bc622e3f86ea775378 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 2 Feb 2023 04:27:26 +0000 Subject: [PATCH 18/22] Update dependencies from https://github.com/dotnet/sdk build 20230201.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23101.10 -> To Version 7.0.300-preview.23101.17 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.6.0-preview-20230131-02 -> To Version 17.6.0-preview-20230201-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 038a28308b64..fafb2bd78bd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f + e8d113abe7e4553e3960c3727d80b1df80225374 - + https://github.com/dotnet/sdk - 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f + e8d113abe7e4553e3960c3727d80b1df80225374 - + https://github.com/dotnet/sdk - 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f + e8d113abe7e4553e3960c3727d80b1df80225374 - + https://github.com/dotnet/sdk - 138adaf6a5bb905c63ab1c1f9b4b918b7144d38f + e8d113abe7e4553e3960c3727d80b1df80225374 @@ -133,9 +133,9 @@ b4317096ea3aacdb48505744c9e371d5310464c2 - + https://github.com/microsoft/vstest - e4dc6da9be102b98cce874bccdd3641e1d0e558d + d978833419256dccf0167561dabf2fca4e837c16 diff --git a/eng/Versions.props b/eng/Versions.props index bfc8e4e2bc1a..de8766a302e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23101.10 - 7.0.300-preview.23101.10 - 7.0.300-preview.23101.10 + 7.0.300-preview.23101.17 + 7.0.300-preview.23101.17 + 7.0.300-preview.23101.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230131-02 + 17.6.0-preview-20230201-01 From 6390db54bd4abc46ada6b651d2dda0949db0009b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 Feb 2023 20:52:48 +0000 Subject: [PATCH 19/22] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15402) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230201-01 to 17.6.0-preview-20230202-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.6.0-1.23081.20 to 4.6.0-1.23101.17 (parent: Microsoft.NET.Sdk) - Remove backported source-build razor patch --- eng/Version.Details.xml | 24 +++++++++---------- eng/Versions.props | 8 +++---- ...-Exclude-Analyzers-from-source-build.patch | 23 ------------------ 3 files changed, 16 insertions(+), 39 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cf836f9a2d2f..97e1050a1cae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - e8d113abe7e4553e3960c3727d80b1df80225374 + 6af89373709c6763fed1870546876cbedecaaf6f - + https://github.com/dotnet/sdk - e8d113abe7e4553e3960c3727d80b1df80225374 + 6af89373709c6763fed1870546876cbedecaaf6f - + https://github.com/dotnet/sdk - e8d113abe7e4553e3960c3727d80b1df80225374 + 6af89373709c6763fed1870546876cbedecaaf6f - + https://github.com/dotnet/sdk - e8d113abe7e4553e3960c3727d80b1df80225374 + 6af89373709c6763fed1870546876cbedecaaf6f @@ -133,9 +133,9 @@ b4317096ea3aacdb48505744c9e371d5310464c2 - + https://github.com/microsoft/vstest - d978833419256dccf0167561dabf2fca4e837c16 + 7bfe4aaae404d53868bb2bdba1082b8a683aba01 @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - f5987d2c4a3cc6d524e63fc851641545ad05af37 + 8da03f9cd0471db81cea9a5d7f7f92d3a746c6de diff --git a/eng/Versions.props b/eng/Versions.props index 68e4cf731fe3..f1baa29d177a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23101.17 - 7.0.300-preview.23101.17 - 7.0.300-preview.23101.17 + 7.0.300-preview.23103.3 + 7.0.300-preview.23103.3 + 7.0.300-preview.23103.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230201-01 + 17.6.0-preview-20230202-01 diff --git a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch b/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch deleted file mode 100644 index 071ca05da493..000000000000 --- a/src/SourceBuild/tarball/patches/razor/0001-Exclude-Analyzers-from-source-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: MichaelSimons -Date: Fri, 16 Dec 2022 03:31:02 +0000 -Subject: [PATCH] Exclude Analyzers from source-build - -Backport: https://github.com/dotnet/razor/issues/8035 ---- - src/Compiler/Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Compiler/Directory.Build.props b/src/Compiler/Directory.Build.props -index e69a99bf3..f70902a08 100644 ---- a/src/Compiler/Directory.Build.props -+++ b/src/Compiler/Directory.Build.props -@@ -37,7 +37,7 @@ - $(WarningsNotAsErrors);xUnit1004 - - -- -+ - - - From 7347226d8065002ca9255d897f5f8ca460aea0cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 4 Feb 2023 00:32:29 +0000 Subject: [PATCH 20/22] [release/7.0.3xx] Update dependencies from dotnet/sdk (#15424) [release/7.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.5.0-beta.23101.1 to 12.5.0-beta.23103.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 7.0.300-beta.23101.1 to 7.0.300-beta.23103.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.6.0-preview-20230202-01 to 17.6.0-preview-20230202-02 (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 97e1050a1cae..4c401821bbc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 6af89373709c6763fed1870546876cbedecaaf6f + 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe - + https://github.com/dotnet/sdk - 6af89373709c6763fed1870546876cbedecaaf6f + 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe - + https://github.com/dotnet/sdk - 6af89373709c6763fed1870546876cbedecaaf6f + 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe - + https://github.com/dotnet/sdk - 6af89373709c6763fed1870546876cbedecaaf6f + 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe @@ -124,18 +124,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - b4317096ea3aacdb48505744c9e371d5310464c2 + 9c1fe2945415867ffb3f46e95bc42e26cb19ad03 - + https://github.com/dotnet/fsharp - b4317096ea3aacdb48505744c9e371d5310464c2 + 9c1fe2945415867ffb3f46e95bc42e26cb19ad03 - + https://github.com/microsoft/vstest - 7bfe4aaae404d53868bb2bdba1082b8a683aba01 + ef449ea49d874b6415c0244d775f5e3a2f4e941f diff --git a/eng/Versions.props b/eng/Versions.props index f1baa29d177a..14f4ae2b374b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23103.3 - 7.0.300-preview.23103.3 - 7.0.300-preview.23103.3 + 7.0.300-preview.23103.9 + 7.0.300-preview.23103.9 + 7.0.300-preview.23103.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -171,7 +171,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.6.0-preview-20230202-01 + 17.6.0-preview-20230202-02 From b95f3d5a4c79bb7b86d490617d5bf83e5d3d6417 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Feb 2023 00:46:42 +0000 Subject: [PATCH 21/22] Update dependencies from https://github.com/dotnet/sdk build 20230203.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23103.9 -> To Version 7.0.300-preview.23103.12 --- 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 4c401821bbc1..594b49b6ed2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe + 734a7183e243edcf541868dff92114fce56626cf - + https://github.com/dotnet/sdk - 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe + 734a7183e243edcf541868dff92114fce56626cf - + https://github.com/dotnet/sdk - 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe + 734a7183e243edcf541868dff92114fce56626cf - + https://github.com/dotnet/sdk - 55fa0152540f86f9fc8c4e65dcd1d9c0943398fe + 734a7183e243edcf541868dff92114fce56626cf diff --git a/eng/Versions.props b/eng/Versions.props index 14f4ae2b374b..583ab58b4250 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23103.9 - 7.0.300-preview.23103.9 - 7.0.300-preview.23103.9 + 7.0.300-preview.23103.12 + 7.0.300-preview.23103.12 + 7.0.300-preview.23103.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 26228c01f3dace6db008cf5625a8a0640d059411 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Feb 2023 02:02:40 +0000 Subject: [PATCH 22/22] Update dependencies from https://github.com/dotnet/sdk build 20230203.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.300-preview.23103.9 -> To Version 7.0.300-preview.23103.15 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23103.1 -> To Version 12.5.0-beta.23103.4 (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 594b49b6ed2b..c882a116b96c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ bb3695688177f5f80eeb3c0498168612e31549d5 - + https://github.com/dotnet/sdk - 734a7183e243edcf541868dff92114fce56626cf + 23cb0983a8605b03c3ce8fd9a5121bd9391340cf - + https://github.com/dotnet/sdk - 734a7183e243edcf541868dff92114fce56626cf + 23cb0983a8605b03c3ce8fd9a5121bd9391340cf - + https://github.com/dotnet/sdk - 734a7183e243edcf541868dff92114fce56626cf + 23cb0983a8605b03c3ce8fd9a5121bd9391340cf - + https://github.com/dotnet/sdk - 734a7183e243edcf541868dff92114fce56626cf + 23cb0983a8605b03c3ce8fd9a5121bd9391340cf @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 636e2b7a00a434a354a126f510a56e16ce3c6bbc - + https://github.com/dotnet/fsharp - 9c1fe2945415867ffb3f46e95bc42e26cb19ad03 + e2af231f075c132622780054de5ce204389683bf - + https://github.com/dotnet/fsharp - 9c1fe2945415867ffb3f46e95bc42e26cb19ad03 + e2af231f075c132622780054de5ce204389683bf diff --git a/eng/Versions.props b/eng/Versions.props index 583ab58b4250..8c3d3b00983f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,9 +63,9 @@ - 7.0.300-preview.23103.12 - 7.0.300-preview.23103.12 - 7.0.300-preview.23103.12 + 7.0.300-preview.23103.15 + 7.0.300-preview.23103.15 + 7.0.300-preview.23103.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)