From 3be11c26508356dcaad4460f5e281de5f65edb35 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Apr 2023 23:16:57 +0000 Subject: [PATCH 01/10] Update dependencies from https://github.com/dotnet/sdk build 20230420.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23220.8 -> To Version 8.0.100-preview.4.23220.9 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.0-preview.4.23218.3 -> To Version 8.0.0-preview.4.23220.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 40 ++++++++++++++++++++-------------------- eng/Versions.props | 18 +++++++++--------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 86285f4e0..1da6f3645 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/windowsdesktop - ccda873ce237812c455471f2a392ebc661aabc01 + a1560d26f14f486768d9b314cb6656b4c2296ada - + https://github.com/dotnet/windowsdesktop - ccda873ce237812c455471f2a392ebc661aabc01 + a1560d26f14f486768d9b314cb6656b4c2296ada - + https://github.com/dotnet/windowsdesktop - ccda873ce237812c455471f2a392ebc661aabc01 + a1560d26f14f486768d9b314cb6656b4c2296ada - + https://github.com/dotnet/windowsdesktop - ccda873ce237812c455471f2a392ebc661aabc01 + a1560d26f14f486768d9b314cb6656b4c2296ada https://github.com/dotnet/runtime @@ -102,31 +102,31 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - d10b3542facf2c12b82eb470df661be903354f0f + d28920593ed3e30ee503cda6193be4cf73e1c877 - + https://github.com/dotnet/sdk - d10b3542facf2c12b82eb470df661be903354f0f + d28920593ed3e30ee503cda6193be4cf73e1c877 - + https://github.com/dotnet/sdk - d10b3542facf2c12b82eb470df661be903354f0f + d28920593ed3e30ee503cda6193be4cf73e1c877 - + https://github.com/dotnet/sdk - d10b3542facf2c12b82eb470df661be903354f0f + d28920593ed3e30ee503cda6193be4cf73e1c877 - + https://github.com/dotnet/winforms - f3a6aa1d4313472705cf3f00515a496c44552b10 + b3a0efc78e82ab0deba0d25d6f196f996e13bab5 - + https://github.com/dotnet/wpf - 1d410ee10c6ab3add926e47c08c5b4bd722a7968 + 7a3f888caee3d69148ae9ecd9a6fae41d710f43c https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 6b31e9e45..fce5a0e38 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -41,11 +41,11 @@ - 8.0.0-preview.4.23213.11 + 8.0.0-preview.4.23218.5 - 8.0.0-preview.5.23218.2 + 8.0.0-preview.5.23219.1 @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23220.8 - 8.0.100-preview.4.23220.8 - 8.0.100-preview.4.23220.8 + 8.0.100-preview.4.23220.9 + 8.0.100-preview.4.23220.9 + 8.0.100-preview.4.23220.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.0-preview.4.23218.3 - 8.0.0-preview.4.23218.3 - 8.0.0-preview.4.23218.3 - 8.0.0-preview.4.23218.3 + 8.0.0-preview.4.23220.1 + 8.0.0-preview.4.23220.1 + 8.0.0-preview.4.23220.1 + 8.0.0-preview.4.23220.1 From a91d891467dc8507d6bbaa2d75084524002c4398 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Apr 2023 23:23:50 +0000 Subject: [PATCH 02/10] Update dependencies from https://github.com/dotnet/sdk build 20230420.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23220.8 -> To Version 8.0.100-preview.4.23220.10 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23218.3 -> To Version 8.0.0-preview.4.23220.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++++--------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1da6f3645..b5a9ac7f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://github.com/dotnet/windowsdesktop a1560d26f14f486768d9b314cb6656b4c2296ada - + https://github.com/dotnet/runtime - 6887fc439b2d211608ed7665f795069555ae6df4 + bd37436f887c48554f401014573fd58076f1db87 - + https://github.com/dotnet/runtime - 6887fc439b2d211608ed7665f795069555ae6df4 + bd37436f887c48554f401014573fd58076f1db87 - + https://github.com/dotnet/runtime - 6887fc439b2d211608ed7665f795069555ae6df4 + bd37436f887c48554f401014573fd58076f1db87 - + https://github.com/dotnet/runtime - 6887fc439b2d211608ed7665f795069555ae6df4 + bd37436f887c48554f401014573fd58076f1db87 - + https://github.com/dotnet/runtime - 6887fc439b2d211608ed7665f795069555ae6df4 + bd37436f887c48554f401014573fd58076f1db87 - + https://github.com/dotnet/runtime - 6887fc439b2d211608ed7665f795069555ae6df4 + bd37436f887c48554f401014573fd58076f1db87 @@ -48,9 +48,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 6887fc439b2d211608ed7665f795069555ae6df4 + bd37436f887c48554f401014573fd58076f1db87 https://github.com/dotnet/aspnetcore @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - d28920593ed3e30ee503cda6193be4cf73e1c877 + bbf8621ef66febe6d67d40e4fc3ae40307293c92 - + https://github.com/dotnet/sdk - d28920593ed3e30ee503cda6193be4cf73e1c877 + bbf8621ef66febe6d67d40e4fc3ae40307293c92 - + https://github.com/dotnet/sdk - d28920593ed3e30ee503cda6193be4cf73e1c877 + bbf8621ef66febe6d67d40e4fc3ae40307293c92 - + https://github.com/dotnet/sdk - d28920593ed3e30ee503cda6193be4cf73e1c877 + bbf8621ef66febe6d67d40e4fc3ae40307293c92 @@ -142,9 +142,9 @@ 1541fc31ead99a358c649e7e9fa203e0dd4d20a5 - + https://github.com/dotnet/runtime - 6887fc439b2d211608ed7665f795069555ae6df4 + bd37436f887c48554f401014573fd58076f1db87 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index fce5a0e38..78407afb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23220.9 - 8.0.100-preview.4.23220.9 - 8.0.100-preview.4.23220.9 + 8.0.100-preview.4.23220.10 + 8.0.100-preview.4.23220.10 + 8.0.100-preview.4.23220.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.0-preview.4.23220.2 + 8.0.0-preview.4.23220.4 - 8.0.0-preview.4.23220.2 - 8.0.0-preview.4.23220.2 - 8.0.0-preview.4.23220.2 - 8.0.0-preview.4.23220.2 - 8.0.0-preview.4.23220.2 - 8.0.0-preview.4.23220.2 + 8.0.0-preview.4.23220.4 + 8.0.0-preview.4.23220.4 + 8.0.0-preview.4.23220.4 + 8.0.0-preview.4.23220.4 + 8.0.0-preview.4.23220.4 + 8.0.0-preview.4.23220.4 2.1.0 From 143e985ae939625e27e94ab6e1695a8af1574726 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 00:06:28 +0000 Subject: [PATCH 03/10] Update dependencies from https://github.com/dotnet/sdk build 20230420.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23220.8 -> To Version 8.0.100-preview.4.23220.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23218.3 -> To Version 8.0.0-preview.4.23220.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 b5a9ac7f7..46f06984d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - bbf8621ef66febe6d67d40e4fc3ae40307293c92 + 26dad01213a50c6d66bc66d9fcce1115b66e40a1 - + https://github.com/dotnet/sdk - bbf8621ef66febe6d67d40e4fc3ae40307293c92 + 26dad01213a50c6d66bc66d9fcce1115b66e40a1 - + https://github.com/dotnet/sdk - bbf8621ef66febe6d67d40e4fc3ae40307293c92 + 26dad01213a50c6d66bc66d9fcce1115b66e40a1 - + https://github.com/dotnet/sdk - bbf8621ef66febe6d67d40e4fc3ae40307293c92 + 26dad01213a50c6d66bc66d9fcce1115b66e40a1 diff --git a/eng/Versions.props b/eng/Versions.props index 78407afb9..a362abe73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23220.10 - 8.0.100-preview.4.23220.10 - 8.0.100-preview.4.23220.10 + 8.0.100-preview.4.23220.12 + 8.0.100-preview.4.23220.12 + 8.0.100-preview.4.23220.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1fa93166f7e9b17fc23534f6b1d4d7a565d34bc3 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 21 Apr 2023 00:35:15 +0000 Subject: [PATCH 04/10] Resolve roslyn-analyzers patch conflict --- ...iminate-pre-built-assets-during-source-build-for-r.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch b/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch index 37152b13a..e86f6d864 100644 --- a/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch +++ b/src/SourceBuild/patches/roslyn-analyzers/0001-Eliminate-pre-built-assets-during-source-build-for-r.patch @@ -94,7 +94,7 @@ index 114e30a43..e38f8549f 100644 *$(MSBuildProjectFile)* -- 3.9.0 +- 4.0.1 @@ -106,7 +106,7 @@ index a44df8a50..cba084cd5 100644 *$(MSBuildProjectFile)* -- 3.9.0 +- 4.0.1 @@ -118,7 +118,7 @@ index 46a4fca6b..c9fa15584 100644 *$(MSBuildProjectFile)* -- 3.9.0 +- 4.0.1 From 3fb15259c3fc1ab54a1deca4025c39d132b1bedc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 01:35:12 +0000 Subject: [PATCH 05/10] Update dependencies from https://github.com/dotnet/sdk build 20230420.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23220.8 -> To Version 8.0.100-preview.4.23220.14 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23218.3 -> To Version 8.0.0-preview.4.23220.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 46f06984d..efd6bad63 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 26dad01213a50c6d66bc66d9fcce1115b66e40a1 + 61359c8608de659623afd46e077ba17c7c3a76a9 - + https://github.com/dotnet/sdk - 26dad01213a50c6d66bc66d9fcce1115b66e40a1 + 61359c8608de659623afd46e077ba17c7c3a76a9 - + https://github.com/dotnet/sdk - 26dad01213a50c6d66bc66d9fcce1115b66e40a1 + 61359c8608de659623afd46e077ba17c7c3a76a9 - + https://github.com/dotnet/sdk - 26dad01213a50c6d66bc66d9fcce1115b66e40a1 + 61359c8608de659623afd46e077ba17c7c3a76a9 @@ -146,9 +146,9 @@ https://github.com/dotnet/runtime bd37436f887c48554f401014573fd58076f1db87 - + https://github.com/dotnet/roslyn - a6a78dd64fc1eb466113ece272747a72d497aad7 + 3b400f4933ea373d2654aaed1e8d1225e7a88ab8 diff --git a/eng/Versions.props b/eng/Versions.props index a362abe73..713f20902 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.100-preview.4.23220.12 - 8.0.100-preview.4.23220.12 - 8.0.100-preview.4.23220.12 + 8.0.100-preview.4.23220.14 + 8.0.100-preview.4.23220.14 + 8.0.100-preview.4.23220.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.7.0-1.23219.11 + 4.7.0-1.23220.4 From d1ee91a0ed9d834f9b3b8ae1d916278ba1bd7954 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 21 Apr 2023 03:09:55 +0000 Subject: [PATCH 06/10] Re-enable dotnet/format in source-build --- .../content/repo-projects/dotnet.proj | 3 +- .../content/repo-projects/sdk.proj | 3 +- ...etCompilersToolsetVersion-instead-of.patch | 61 +++++++++++++++++++ 3 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch diff --git a/src/SourceBuild/content/repo-projects/dotnet.proj b/src/SourceBuild/content/repo-projects/dotnet.proj index bca5010dc..f3b4b1807 100644 --- a/src/SourceBuild/content/repo-projects/dotnet.proj +++ b/src/SourceBuild/content/repo-projects/dotnet.proj @@ -32,8 +32,7 @@ - - + diff --git a/src/SourceBuild/content/repo-projects/sdk.proj b/src/SourceBuild/content/repo-projects/sdk.proj index e5d60dd8c..050dabf28 100644 --- a/src/SourceBuild/content/repo-projects/sdk.proj +++ b/src/SourceBuild/content/repo-projects/sdk.proj @@ -26,8 +26,7 @@ - - + diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch new file mode 100644 index 000000000..4b35b4adc --- /dev/null +++ b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch @@ -0,0 +1,61 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Michael Simons +Date: Fri, 21 Apr 2023 03:07:28 +0000 +Subject: [PATCH] Use MicrosoftNetCompilersToolsetVersion instead of + MicrosoftNetCompilersToolsetPackageVersion + +Temporary fix for https://github.com/dotnet/source-build/issues/3392 +--- + Directory.Packages.props | 16 ++++++++-------- + eng/Versions.props | 4 ++-- + 2 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/Directory.Packages.props b/Directory.Packages.props +index c9041493..83f3d877 100644 +--- a/Directory.Packages.props ++++ b/Directory.Packages.props +@@ -13,14 +13,14 @@ + + + +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ + + + +diff --git a/eng/Versions.props b/eng/Versions.props +index 2d325ec6..e1bc7022 100644 +--- a/eng/Versions.props ++++ b/eng/Versions.props +@@ -21,7 +21,7 @@ + 3.3.4 + 7.0.0-rc.1.22426.10 + +- 4.5.0-3.22602.7 ++ 4.5.0-3.22602.7 + + 2.0.0-beta4.22564.1 + 0.4.0-alpha.22564.1 +@@ -35,7 +35,7 @@ + + 6.6.0-preview.3.61 + +- 4.5.0-3.22602.7 ++ 4.5.0-3.22602.7 + + 1.1.2-beta1.22216.1 + From 3be71b06677745064da0ceb977efb351072c89b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 04:15:10 +0000 Subject: [PATCH 07/10] Update dependencies from https://github.com/dotnet/sdk build 20230420.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23220.8 -> To Version 8.0.100-preview.4.23220.15 --- 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 efd6bad63..df4635cb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 61359c8608de659623afd46e077ba17c7c3a76a9 + dda4ae4e1866f98daea6b8421d65e273ce25ce80 - + https://github.com/dotnet/sdk - 61359c8608de659623afd46e077ba17c7c3a76a9 + dda4ae4e1866f98daea6b8421d65e273ce25ce80 - + https://github.com/dotnet/sdk - 61359c8608de659623afd46e077ba17c7c3a76a9 + dda4ae4e1866f98daea6b8421d65e273ce25ce80 - + https://github.com/dotnet/sdk - 61359c8608de659623afd46e077ba17c7c3a76a9 + dda4ae4e1866f98daea6b8421d65e273ce25ce80 diff --git a/eng/Versions.props b/eng/Versions.props index 713f20902..f25dc669e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23220.14 - 8.0.100-preview.4.23220.14 - 8.0.100-preview.4.23220.14 + 8.0.100-preview.4.23220.15 + 8.0.100-preview.4.23220.15 + 8.0.100-preview.4.23220.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b45f6b90211860c06ab2b7396749e4d007370f8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 04:15:17 +0000 Subject: [PATCH 08/10] Update dependencies from https://github.com/dotnet/sdk build 20230420.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23220.15 -> To Version 8.0.100-preview.4.23220.16 --- 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 df4635cb8..0450da20d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - dda4ae4e1866f98daea6b8421d65e273ce25ce80 + 94d333d84fcbaf3c0722180dd0257224156bf086 - + https://github.com/dotnet/sdk - dda4ae4e1866f98daea6b8421d65e273ce25ce80 + 94d333d84fcbaf3c0722180dd0257224156bf086 - + https://github.com/dotnet/sdk - dda4ae4e1866f98daea6b8421d65e273ce25ce80 + 94d333d84fcbaf3c0722180dd0257224156bf086 - + https://github.com/dotnet/sdk - dda4ae4e1866f98daea6b8421d65e273ce25ce80 + 94d333d84fcbaf3c0722180dd0257224156bf086 diff --git a/eng/Versions.props b/eng/Versions.props index f25dc669e..a986ce80a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23220.15 - 8.0.100-preview.4.23220.15 - 8.0.100-preview.4.23220.15 + 8.0.100-preview.4.23220.16 + 8.0.100-preview.4.23220.16 + 8.0.100-preview.4.23220.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0a9c209b527c72b3bdda66f358c8187717734feb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 04:15:23 +0000 Subject: [PATCH 09/10] Update dependencies from https://github.com/dotnet/sdk build 20230420.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-preview.4.23220.16 -> To Version 8.0.100-preview.4.23220.18 --- 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 0450da20d..bab112de8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -102,22 +102,22 @@ https://github.com/dotnet/test-templates 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 94d333d84fcbaf3c0722180dd0257224156bf086 + ecdf8c3517aafa86af103e432fd817138b8e7687 - + https://github.com/dotnet/sdk - 94d333d84fcbaf3c0722180dd0257224156bf086 + ecdf8c3517aafa86af103e432fd817138b8e7687 - + https://github.com/dotnet/sdk - 94d333d84fcbaf3c0722180dd0257224156bf086 + ecdf8c3517aafa86af103e432fd817138b8e7687 - + https://github.com/dotnet/sdk - 94d333d84fcbaf3c0722180dd0257224156bf086 + ecdf8c3517aafa86af103e432fd817138b8e7687 diff --git a/eng/Versions.props b/eng/Versions.props index a986ce80a..d7c882547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.100-preview.4.23220.16 - 8.0.100-preview.4.23220.16 - 8.0.100-preview.4.23220.16 + 8.0.100-preview.4.23220.18 + 8.0.100-preview.4.23220.18 + 8.0.100-preview.4.23220.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dd22909fe1e49d2686940e5b917819095812b085 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 04:15:31 +0000 Subject: [PATCH 10/10] Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.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,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.0-preview.4.23218.3 -> To Version 8.0.0-preview.4.23220.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 16 ++++++++-------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bab112de8..2962832a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,34 +52,34 @@ https://github.com/dotnet/runtime bd37436f887c48554f401014573fd58076f1db87 - + https://github.com/dotnet/aspnetcore - 03e670f9854651b9995d57f8e87cef16022e739a + 845994758371423380e4cf35a333f2b23530b5eb - + https://github.com/dotnet/aspnetcore - 03e670f9854651b9995d57f8e87cef16022e739a + 845994758371423380e4cf35a333f2b23530b5eb - + https://github.com/dotnet/aspnetcore - 03e670f9854651b9995d57f8e87cef16022e739a + 845994758371423380e4cf35a333f2b23530b5eb - + https://github.com/dotnet/aspnetcore - 03e670f9854651b9995d57f8e87cef16022e739a + 845994758371423380e4cf35a333f2b23530b5eb - + https://github.com/dotnet/aspnetcore - 03e670f9854651b9995d57f8e87cef16022e739a + 845994758371423380e4cf35a333f2b23530b5eb - + https://github.com/dotnet/aspnetcore - 03e670f9854651b9995d57f8e87cef16022e739a + 845994758371423380e4cf35a333f2b23530b5eb - + https://github.com/dotnet/aspnetcore - 03e670f9854651b9995d57f8e87cef16022e739a + 845994758371423380e4cf35a333f2b23530b5eb https://github.com/dotnet/test-templates @@ -146,14 +146,14 @@ https://github.com/dotnet/runtime bd37436f887c48554f401014573fd58076f1db87 - + https://github.com/dotnet/roslyn - 3b400f4933ea373d2654aaed1e8d1225e7a88ab8 + 281de15d8e915793688eeac757aa4b3f08596d08 https://github.com/dotnet/msbuild - cc55017f88688cbe3f9aa810cdf44273adea76ea + 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 diff --git a/eng/Versions.props b/eng/Versions.props index d7c882547..067cc6885 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,13 +65,13 @@ - 8.0.0-preview.4.23219.8 - 8.0.0-preview.4.23219.8 - 8.0.0-preview.4.23219.8 - 8.0.0-preview.4.23219.8 - 8.0.0-preview.4.23219.8 - 8.0.0-preview.4.23219.8 - 8.0.0-preview.4.23219.8 + 8.0.0-preview.4.23220.5 + 8.0.0-preview.4.23220.5 + 8.0.0-preview.4.23220.5 + 8.0.0-preview.4.23220.5 + 8.0.0-preview.4.23220.5 + 8.0.0-preview.4.23220.5 + 8.0.0-preview.4.23220.5 0.2.0 @@ -87,7 +87,7 @@ - 4.7.0-1.23220.4 + 4.7.0-1.23220.5