-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[main] Update dependencies from dotnet/runtime (#41014)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Eric StJohn <ericstj@microsoft.com> Co-authored-by: Viktor Hofer <viktor.hofer@microsoft.com>
- Loading branch information
4 people
authored
May 21, 2024
1 parent
a4787a0
commit a543ce7
Showing
7 changed files
with
152 additions
and
63 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| From f704647788c026d99652b5b3716fab92486841d9 Mon Sep 17 00:00:00 2001 | ||
| From: Viktor Hofer <viktor.hofer@microsoft.com> | ||
| Date: Tue, 21 May 2024 13:50:09 +0200 | ||
| Subject: [PATCH] Add missing System.Memory references (#9140) | ||
|
|
||
| Backport: https://github.com/dotnet/wpf/commit/f704647788c026d99652b5b3716fab92486841d9 | ||
| --- | ||
| .../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 @@ | ||
| <NetCoreReference Include="System.Diagnostics.Process" /> | ||
| <NetCoreReference Include="System.Diagnostics.StackTrace" /> | ||
| <NetCoreReference Include="System.Diagnostics.Tools" /> | ||
| + <NetCoreReference Include="System.Memory" /> | ||
| <NetCoreReference Include="System.Resources.ResourceManager" /> | ||
| <NetCoreReference Include="System.Runtime" /> | ||
| <NetCoreReference Include="System.Resources.ResourceManager" /> | ||
| 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 @@ | ||
| <NetCoreReference Include="System.Diagnostics.TraceSource" /> | ||
| <NetCoreReference Include="System.Drawing" /> | ||
| <NetCoreReference Include="System.Drawing.Primitives" /> | ||
| + <NetCoreReference Include="System.Memory" /> | ||
| <NetCoreReference Include="System.Resources.ResourceManager" /> | ||
| <NetCoreReference Include="System.Runtime" /> | ||
| <NetCoreReference Include="System.Runtime.Extensions" /> |
30 changes: 30 additions & 0 deletions
30
src/SourceBuild/patches/wpf/0002-Fix-CS0656-in-UIAutomationProvider.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | ||
| From: Eric StJohn <ericstj@microsoft.com> | ||
| 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 @@ | ||
| </PropertyGroup> | ||
|
|
||
| <PropertyGroup> | ||
| - | ||
| + | ||
| <EnableDefaultItems>false</EnableDefaultItems> | ||
| </PropertyGroup> | ||
|
|
||
| @@ -52,6 +52,7 @@ | ||
| <NetCoreReference Include="Microsoft.Win32.Primitives" /> | ||
| <NetCoreReference Include="System" /> | ||
| <NetCoreReference Include="System.Drawing.Primitives" /> | ||
| + <NetCoreReference Include="System.Memory" /> | ||
| <NetCoreReference Include="System.Runtime" /> | ||
| <NetCoreReference Include="System.Resources.ResourceManager" /> | ||
| <NetCoreReference Include="System.Runtime.InteropServices" /> |
Oops, something went wrong.