From 9951eb4f66aa88c2c68ee8160c3ace0ce5a64012 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 11:50:33 +0000 Subject: [PATCH 1/5] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240620.1 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-preview.6.24318.1 -> To Version 9.0.0-preview.6.24320.1 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-preview.6.24317.1 -> To Version 9.0.0-preview.7.24320.2 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af96a6433e32..84c06d3820ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -246,26 +246,26 @@ https://github.com/dotnet/runtime 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/windowsdesktop - 2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581 + fd4882363adaf9e2c883de99c3993199a3dfcf29 - + https://github.com/dotnet/windowsdesktop - 2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581 + fd4882363adaf9e2c883de99c3993199a3dfcf29 - + https://github.com/dotnet/windowsdesktop - 2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581 + fd4882363adaf9e2c883de99c3993199a3dfcf29 - + https://github.com/dotnet/windowsdesktop - 2eaeedd24bd1ac0f0dbe79379f83f2476b0f5581 + fd4882363adaf9e2c883de99c3993199a3dfcf29 - + https://github.com/dotnet/wpf - d5d26f90bf937e6fa60e5ef7f78a527515452069 + 4093a1649f50d767671a58b8a2a0f738480e51ff https://github.com/dotnet/aspnetcore @@ -382,13 +382,13 @@ - + https://github.com/dotnet/winforms - 8cbf7ea9a86cb42828fdc5af826f986bce3d2e98 + 77be8127d323f322a9c168acaf5920d84271096c - + https://github.com/dotnet/wpf - d5d26f90bf937e6fa60e5ef7f78a527515452069 + 4093a1649f50d767671a58b8a2a0f738480e51ff https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 1d474b8971cc..623df5db5f27 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -119,7 +119,7 @@ - 9.0.0-preview.6.24317.1 + 9.0.0-preview.6.24319.5 @@ -149,10 +149,10 @@ - 9.0.0-preview.6.24318.1 - 9.0.0-preview.6.24318.1 - 9.0.0-preview.6.24318.1 - 9.0.0-preview.6.24318.1 + 9.0.0-preview.6.24320.1 + 9.0.0-preview.6.24320.1 + 9.0.0-preview.6.24320.1 + 9.0.0-preview.6.24320.1 @@ -257,8 +257,8 @@ - 9.0.0-preview.6.24317.1 - 9.0.0-preview.6.24317.1 + 9.0.0-preview.7.24320.2 + 9.0.0-preview.7.24320.2 From 965e7d3d26e894ad626e849a939a21dea01926a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 18:01:16 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240620.2 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-preview.6.24320.1 -> To Version 9.0.0-preview.6.24320.2 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-preview.7.24320.2 -> To Version 9.0.0-preview.7.24320.5 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84c06d3820ae..ffe44d76e912 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -246,26 +246,26 @@ https://github.com/dotnet/runtime 8fac5af2b11dc98fa0504f6fd06df790164ec958 - + https://github.com/dotnet/windowsdesktop - fd4882363adaf9e2c883de99c3993199a3dfcf29 + 56421ba461425b5528ef74414942b4f57ad8d1e7 - + https://github.com/dotnet/windowsdesktop - fd4882363adaf9e2c883de99c3993199a3dfcf29 + 56421ba461425b5528ef74414942b4f57ad8d1e7 - + https://github.com/dotnet/windowsdesktop - fd4882363adaf9e2c883de99c3993199a3dfcf29 + 56421ba461425b5528ef74414942b4f57ad8d1e7 - + https://github.com/dotnet/windowsdesktop - fd4882363adaf9e2c883de99c3993199a3dfcf29 + 56421ba461425b5528ef74414942b4f57ad8d1e7 - + https://github.com/dotnet/wpf - 4093a1649f50d767671a58b8a2a0f738480e51ff + 5d665cda688edd091afd8ba95e7c8503f1c11a91 https://github.com/dotnet/aspnetcore @@ -382,13 +382,13 @@ - + https://github.com/dotnet/winforms - 77be8127d323f322a9c168acaf5920d84271096c + 5a34c71ca7414f5dcfccde4b2a7ba61e6758062d - + https://github.com/dotnet/wpf - 4093a1649f50d767671a58b8a2a0f738480e51ff + 5d665cda688edd091afd8ba95e7c8503f1c11a91 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 623df5db5f27..e5cf9da61146 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -119,7 +119,7 @@ - 9.0.0-preview.6.24319.5 + 9.0.0-preview.6.24320.2 @@ -149,10 +149,10 @@ - 9.0.0-preview.6.24320.1 - 9.0.0-preview.6.24320.1 - 9.0.0-preview.6.24320.1 - 9.0.0-preview.6.24320.1 + 9.0.0-preview.6.24320.2 + 9.0.0-preview.6.24320.2 + 9.0.0-preview.6.24320.2 + 9.0.0-preview.6.24320.2 @@ -257,8 +257,8 @@ - 9.0.0-preview.7.24320.2 - 9.0.0-preview.7.24320.2 + 9.0.0-preview.7.24320.5 + 9.0.0-preview.7.24320.5 From 03c30005c5e668c05db345d6d3798cd85dd3c496 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 20 Jun 2024 20:19:48 +0200 Subject: [PATCH 3/5] Delete src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch --- .../0002-versionsprops-and-details.patch | 93 ------------------- 1 file changed, 93 deletions(-) delete mode 100644 src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch diff --git a/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch b/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch deleted file mode 100644 index 31286b95da58..000000000000 --- a/src/SourceBuild/patches/roslyn/0002-versionsprops-and-details.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 642134215a2c7285e958dfc8aa6fb058a836c6da Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Wed, 19 Jun 2024 10:32:23 +0000 -Subject: [PATCH] Correctly define versions for runtime dependencies - -System.ComponentModel.Composition and -System.IO.Hashing were missing Versions.props and -Version.Details.xml entries. - -This is necessary so that the VMR can upgrade -the dependencies when building all dependencies -live. - -Similar to c74b31bd8313865fa3becf0d8f91f00d528ca5ad -Unblocks runtime dependency flow: -https://github.com/dotnet/sdk/pull/41616 - -Backport PR: https://github.com/dotnet/roslyn/pull/74060 - ---- - eng/Directory.Packages.props | 4 ++-- - eng/Version.Details.xml | 8 ++++++++ - eng/Versions.props | 2 ++ - .../Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj | 2 +- - 4 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/eng/Directory.Packages.props b/eng/Directory.Packages.props -index 83ab7a5601433..e93b49fa24c55 100644 ---- a/eng/Directory.Packages.props -+++ b/eng/Directory.Packages.props -@@ -190,10 +190,10 @@ - - - -- -+ - - -- -+ - - - -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index 0e070103b4b0c..7852558f7c3e6 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -64,10 +64,18 @@ - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 - -+ -+ https://github.com/dotnet/runtime -+ 5535e31a712343a63f5d7d796cd874e563e5ac14 -+ - - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 - -+ -+ https://github.com/dotnet/runtime -+ 5535e31a712343a63f5d7d796cd874e563e5ac14 -+ - - https://github.com/dotnet/runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 -diff --git a/eng/Versions.props b/eng/Versions.props -index 0f39e2822c158..1f9c7b8d08ec2 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -25,7 +25,9 @@ - 8.0.0 - 8.0.0 - 8.0.0 -+ 8.0.0 - 8.0.0 -+ 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 -diff --git a/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj b/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -index 8a011c5f82948..4310078bf9b32 100644 ---- a/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -+++ b/src/Tools/ExternalAccess/Xaml/Microsoft.CodeAnalysis.ExternalAccess.Xaml.csproj -@@ -27,7 +27,7 @@ - - - -- -+ - - - From b2af98fba7140e518c7a3b364d20e6d894202009 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 19:19:18 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240620.5 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-preview.6.24320.1 -> To Version 9.0.0-preview.7.24320.5 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-preview.7.24320.2 -> To Version 9.0.0-preview.7.24320.5 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2bb5d721e917..3684999b490e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -246,22 +246,22 @@ https://github.com/dotnet/runtime 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/windowsdesktop - 56421ba461425b5528ef74414942b4f57ad8d1e7 + 59c2204e894b0f833de39241b8c657bb696c2a28 - + https://github.com/dotnet/windowsdesktop - 56421ba461425b5528ef74414942b4f57ad8d1e7 + 59c2204e894b0f833de39241b8c657bb696c2a28 - + https://github.com/dotnet/windowsdesktop - 56421ba461425b5528ef74414942b4f57ad8d1e7 + 59c2204e894b0f833de39241b8c657bb696c2a28 - + https://github.com/dotnet/windowsdesktop - 56421ba461425b5528ef74414942b4f57ad8d1e7 + 59c2204e894b0f833de39241b8c657bb696c2a28 https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index 5d87ebe97b5c..87e478284809 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,10 +149,10 @@ - 9.0.0-preview.6.24320.2 - 9.0.0-preview.6.24320.2 - 9.0.0-preview.6.24320.2 - 9.0.0-preview.6.24320.2 + 9.0.0-preview.7.24320.5 + 9.0.0-preview.7.24320.5 + 9.0.0-preview.7.24320.5 + 9.0.0-preview.7.24320.5 From c4571f6e3deb1fec302f8c25f840b13b4f600d36 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Jun 2024 19:50:06 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/windowsdesktop build 20240620.3 Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.9.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.9.0 From Version 9.0.0-preview.6.24320.1 -> To Version 9.0.0-preview.6.24320.3 Dependency coherency updates Microsoft.NET.Sdk.WindowsDesktop,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.DotNet.Wpf.ProjectTemplates From Version 9.0.0-preview.7.24320.2 -> To Version 9.0.0-preview.7.24320.5 (parent: Microsoft.WindowsDesktop.App.Ref --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3684999b490e..e26ac914a9cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -246,22 +246,22 @@ https://github.com/dotnet/runtime 117cfccdd71abc164e6b933ca7602b509a1365dd - + https://github.com/dotnet/windowsdesktop - 59c2204e894b0f833de39241b8c657bb696c2a28 + 16bd64088c359e88d8d17fe08bf135f43efdc5b6 - + https://github.com/dotnet/windowsdesktop - 59c2204e894b0f833de39241b8c657bb696c2a28 + 16bd64088c359e88d8d17fe08bf135f43efdc5b6 - + https://github.com/dotnet/windowsdesktop - 59c2204e894b0f833de39241b8c657bb696c2a28 + 16bd64088c359e88d8d17fe08bf135f43efdc5b6 - + https://github.com/dotnet/windowsdesktop - 59c2204e894b0f833de39241b8c657bb696c2a28 + 16bd64088c359e88d8d17fe08bf135f43efdc5b6 https://github.com/dotnet/wpf diff --git a/eng/Versions.props b/eng/Versions.props index 87e478284809..ff0f3dd98e1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,10 +149,10 @@ - 9.0.0-preview.7.24320.5 - 9.0.0-preview.7.24320.5 - 9.0.0-preview.7.24320.5 - 9.0.0-preview.7.24320.5 + 9.0.0-preview.6.24320.3 + 9.0.0-preview.6.24320.3 + 9.0.0-preview.6.24320.3 + 9.0.0-preview.6.24320.3