From 8856e1175e9aec1e03a2073b39ad4203085f3ac2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 May 2024 09:20:27 +0000 Subject: [PATCH 01/11] Update dependencies from https://github.com/dotnet/runtime build 20240519.2 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0-preview.5.24268.2 -> To Version 9.0.0-preview.5.24269.2 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++++---------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a3ee3020fe6f..242309d0e663 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ b643e665e128bde2810539243e1cefbf12140b1b - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 @@ -226,25 +226,25 @@ 2588f022c1c4a12e159e0ed07f5a5ea3f3c9eaa8 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 https://github.com/dotnet/windowsdesktop @@ -495,29 +495,29 @@ - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 @@ -551,9 +551,9 @@ ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 5f067ce8b50087e032d13a1b97ae5ec39fc54739 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6a19d7ba3bb5..25dabf35a6e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,12 +79,12 @@ 8.0.0 4.0.0 8.0.0 - 9.0.0-preview.5.24268.2 + 9.0.0-preview.5.24269.2 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-preview.5.24268.2 + 9.0.0-preview.5.24269.2 4.6.0 2.0.0-beta4.24209.3 0.4.0-alpha.24209.3 @@ -130,21 +130,21 @@ - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 8.0.0-rc.1.23414.4 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 2.1.0 @@ -177,9 +177,9 @@ - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24269.2 From bbf58177b002163b15b9992e959194f896bb0249 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 20 May 2024 16:15:21 +0000 Subject: [PATCH 02/11] Update dependencies from https://github.com/dotnet/runtime build 20240520.2 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0-preview.5.24268.2 -> To Version 9.0.0-preview.5.24270.2 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++++---------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 242309d0e663..573393648cbc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ b643e665e128bde2810539243e1cefbf12140b1b - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 @@ -226,25 +226,25 @@ 2588f022c1c4a12e159e0ed07f5a5ea3f3c9eaa8 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 https://github.com/dotnet/windowsdesktop @@ -495,29 +495,29 @@ - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 @@ -551,9 +551,9 @@ ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/runtime - 5f067ce8b50087e032d13a1b97ae5ec39fc54739 + 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 25dabf35a6e6..e2ab11d83d0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,12 +79,12 @@ 8.0.0 4.0.0 8.0.0 - 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24270.2 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24270.2 4.6.0 2.0.0-beta4.24209.3 0.4.0-alpha.24209.3 @@ -130,21 +130,21 @@ - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 8.0.0-rc.1.23414.4 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 2.1.0 @@ -177,9 +177,9 @@ - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 - 9.0.0-preview.5.24269.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24270.2 From 858a2e77175308ace1f4729dcb1cb73dfcc1e446 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 20 May 2024 09:27:14 -0700 Subject: [PATCH 03/11] Update SDK to latest public build --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 04e25bfe7478..36061bf19ef2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "9.0.100-preview.5.24225.4", + "dotnet": "9.0.100-preview.5.24269.5", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)" From e1e70e85157c0312532ff13f41a991fd004824c4 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 20 May 2024 11:27:29 -0700 Subject: [PATCH 04/11] Fix license header --- .../StaticWebAssets/RewriteCssTest.cs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/RewriteCssTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/RewriteCssTest.cs index 1ff5d39020a5..084cb68dbece 100644 --- a/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/RewriteCssTest.cs +++ b/test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/RewriteCssTest.cs @@ -1,6 +1,5 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. -// +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. using Microsoft.AspNetCore.StaticWebAssets.Tasks; From 86c2026b49433ef1d726bb2d0788ff439e4273f5 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 20 May 2024 16:15:48 -0700 Subject: [PATCH 05/11] Adding patch to workaround WPF issue --- ...ess-CS0656-with-latest-compiler-9135.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch diff --git a/src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch b/src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch new file mode 100644 index 000000000000..ccb84873c4a2 --- /dev/null +++ b/src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch @@ -0,0 +1,37 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eric StJohn +Date: Mon, 20 May 2024 14:50:51 -0700 +Subject: [PATCH] Address CS0656 with latest compiler (#9135) + +* Update System.Windows.Input.Manipulations.csproj + +* Update UIAutomationTypes.csproj +--- + .../System.Windows.Input.Manipulations.csproj | 1 + + .../src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj +index fefa52423..f7fc1f1a6 100644 +--- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj ++++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj +@@ -40,6 +40,7 @@ + + + ++ + + + +diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj +index f6fc49fef..c0c8e5222 100644 +--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj ++++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj +@@ -94,6 +94,7 @@ + + + ++ + + + From aab8fb500d1cc06049c1ce3ce0550708ccdd0761 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 20 May 2024 19:03:03 -0700 Subject: [PATCH 06/11] Add one more WPF patch --- ...2-Fix-CS0656-in-UIAutomationProvider.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 src/SourceBuild/patches/wpf/0002-Fix-CS0656-in-UIAutomationProvider.patch diff --git a/src/SourceBuild/patches/wpf/0002-Fix-CS0656-in-UIAutomationProvider.patch b/src/SourceBuild/patches/wpf/0002-Fix-CS0656-in-UIAutomationProvider.patch new file mode 100644 index 000000000000..42304f43bbe7 --- /dev/null +++ b/src/SourceBuild/patches/wpf/0002-Fix-CS0656-in-UIAutomationProvider.patch @@ -0,0 +1,30 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Eric StJohn +Date: Mon, 20 May 2024 18:58:54 -0700 +Subject: [PATCH 2/2] Fix CS0656 in UIAutomationProvider + +--- + .../UIAutomationProvider/UIAutomationProvider.csproj | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj +index f9928c367..bd0c444e4 100644 +--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj ++++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj +@@ -7,7 +7,7 @@ + + + +- ++ + false + + +@@ -52,6 +52,7 @@ + + + ++ + + + From 34c5479af76cf196fd52f70d6775af0f83965d05 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 21 May 2024 11:55:54 +0200 Subject: [PATCH 07/11] Delete src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch --- ...ess-CS0656-with-latest-compiler-9135.patch | 37 ------------------- 1 file changed, 37 deletions(-) delete mode 100644 src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch diff --git a/src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch b/src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch deleted file mode 100644 index ccb84873c4a2..000000000000 --- a/src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-compiler-9135.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Eric StJohn -Date: Mon, 20 May 2024 14:50:51 -0700 -Subject: [PATCH] Address CS0656 with latest compiler (#9135) - -* Update System.Windows.Input.Manipulations.csproj - -* Update UIAutomationTypes.csproj ---- - .../System.Windows.Input.Manipulations.csproj | 1 + - .../src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj -index fefa52423..f7fc1f1a6 100644 ---- a/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj -+++ b/src/Microsoft.DotNet.Wpf/src/System.Windows.Input.Manipulations/System.Windows.Input.Manipulations.csproj -@@ -40,6 +40,7 @@ - - - -+ - - - -diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj -index f6fc49fef..c0c8e5222 100644 ---- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj -+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationTypes/UIAutomationTypes.csproj -@@ -94,6 +94,7 @@ - - - -+ - - - From 6c888d6a584ed543c7ed1945559b8bf7ccb31e6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 21 May 2024 11:43:52 +0000 Subject: [PATCH 08/11] Update dependencies from https://github.com/dotnet/runtime build 20240521.1 Microsoft.Extensions.DependencyModel , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Console , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.Platforms , System.CodeDom , System.Reflection.MetadataLoadContext , System.Resources.Extensions , System.Security.Cryptography.ProtectedData , System.ServiceProcess.ServiceController , System.Text.Encoding.CodePages , VS.Redist.Common.NetCore.SharedFramework.x64.9.0 , VS.Redist.Common.NetCore.TargetingPack.x64.9.0 , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 9.0.0-preview.5.24268.2 -> To Version 9.0.0-preview.5.24271.1 --- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 38 ++++++++++---------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 573393648cbc..455ebb97c2d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ b643e665e128bde2810539243e1cefbf12140b1b - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc @@ -226,25 +226,25 @@ 2588f022c1c4a12e159e0ed07f5a5ea3f3c9eaa8 - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc https://github.com/dotnet/windowsdesktop @@ -495,29 +495,29 @@ - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc @@ -551,9 +551,9 @@ ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/runtime - 794b0c2a9e83ee098a294c1b7e67ce580ccc2fb2 + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index e2ab11d83d0d..b95047b55691 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,12 +79,12 @@ 8.0.0 4.0.0 8.0.0 - 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24271.1 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24271.1 4.6.0 2.0.0-beta4.24209.3 0.4.0-alpha.24209.3 @@ -130,21 +130,21 @@ - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 8.0.0-rc.1.23414.4 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 2.1.0 @@ -177,9 +177,9 @@ - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 - 9.0.0-preview.5.24270.2 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 From 29b0e0261e59c7ce082cee8e7a19bfd25ab6204a Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 21 May 2024 14:37:06 +0200 Subject: [PATCH 09/11] Create 0001-more-system-memory-fixes.patch --- .../wpf/0001-more-system-memory-fixes.patch | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch diff --git a/src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch b/src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch new file mode 100644 index 000000000000..07ac3696086b --- /dev/null +++ b/src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch @@ -0,0 +1,37 @@ +From f704647788c026d99652b5b3716fab92486841d9 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Tue, 21 May 2024 13:50:09 +0200 +Subject: [PATCH] Add missing System.Memory references (#9140) + +* Add missing System.Memory references + +* Update WindowsFormsIntegration.csproj +--- + .../UIAutomation/UIAutomationClient/UIAutomationClient.csproj | 1 + + .../src/WindowsFormsIntegration/WindowsFormsIntegration.csproj | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj +index c4e5ad37a38..e640afd9283 100644 +--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj ++++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj +@@ -113,6 +113,7 @@ + + + ++ + + + +diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj +index 8cd65be871e..f8a6ad01de7 100644 +--- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj ++++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj +@@ -65,6 +65,7 @@ + + + ++ + + + From 28281fc898a1273b06898ac50b8c8360bbd2ad61 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 21 May 2024 14:42:44 +0200 Subject: [PATCH 10/11] Update 0001-more-system-memory-fixes.patch --- .../patches/wpf/0001-more-system-memory-fixes.patch | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch b/src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch index 07ac3696086b..bfacf3e81397 100644 --- a/src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch +++ b/src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch @@ -3,9 +3,7 @@ From: Viktor Hofer Date: Tue, 21 May 2024 13:50:09 +0200 Subject: [PATCH] Add missing System.Memory references (#9140) -* Add missing System.Memory references - -* Update WindowsFormsIntegration.csproj +Backport: https://github.com/dotnet/wpf/commit/f704647788c026d99652b5b3716fab92486841d9 --- .../UIAutomation/UIAutomationClient/UIAutomationClient.csproj | 1 + .../src/WindowsFormsIntegration/WindowsFormsIntegration.csproj | 1 + From 3583d8cc48824d1e4fbfb2d8b1c3f95635ddb535 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 21 May 2024 16:20:47 +0200 Subject: [PATCH 11/11] Create 0003-even-more-system-memory-cases.patch --- .../0003-even-more-system-memory-cases.patch | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/SourceBuild/patches/wpf/0003-even-more-system-memory-cases.patch diff --git a/src/SourceBuild/patches/wpf/0003-even-more-system-memory-cases.patch b/src/SourceBuild/patches/wpf/0003-even-more-system-memory-cases.patch new file mode 100644 index 000000000000..f7c1b8de95c7 --- /dev/null +++ b/src/SourceBuild/patches/wpf/0003-even-more-system-memory-cases.patch @@ -0,0 +1,25 @@ +From dc68abb93b33b002324c366cf1235a6ae1977969 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Tue, 21 May 2024 16:05:44 +0200 +Subject: [PATCH] Add missing System.Memory references (part 4) + +Continuation of https://github.com/dotnet/wpf/commit/f704647788c026d99652b5b3716fab92486841d9 + +Backport: https://github.com/dotnet/wpf/pull/9143 + +--- + .../UIAutomationClientSideProviders.csproj | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj +index f13ff83a098..83473c0a568 100644 +--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj ++++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj +@@ -122,6 +122,7 @@ + + + ++ + + +