Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a543ce7

Browse files
dotnet-maestro[bot]ericstjViktorHofer
authoredMay 21, 2024
[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>
1 parent a4787a0 commit a543ce7

File tree

7 files changed

+152
-63
lines changed

7 files changed

+152
-63
lines changed
 

‎eng/Version.Details.xml

+40-40
Original file line numberDiff line numberDiff line change
@@ -15,42 +15,42 @@
1515
<Sha>d588634504d1db224ece2c502daee24fabd21212</Sha>
1616
<SourceBuild RepoName="templating" ManagedOnly="true" />
1717
</Dependency>
18-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24268.2">
18+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24271.1">
1919
<Uri>https://github.com/dotnet/runtime</Uri>
20-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
20+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
2121
</Dependency>
22-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.5.24268.2">
22+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.5.24271.1">
2323
<Uri>https://github.com/dotnet/runtime</Uri>
24-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
24+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
2525
</Dependency>
26-
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.5.24268.2">
26+
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.5.24271.1">
2727
<Uri>https://github.com/dotnet/runtime</Uri>
28-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
28+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
2929
</Dependency>
30-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.5.24268.2">
30+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.5.24271.1">
3131
<Uri>https://github.com/dotnet/runtime</Uri>
32-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
32+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
3333
</Dependency>
34-
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.5.24268.2">
34+
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.5.24271.1">
3535
<Uri>https://github.com/dotnet/runtime</Uri>
36-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
36+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
3737
</Dependency>
38-
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.5.24268.2">
38+
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.5.24271.1">
3939
<Uri>https://github.com/dotnet/runtime</Uri>
40-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
40+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
4141
</Dependency>
42-
<Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-preview.5.24268.2">
42+
<Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-preview.5.24271.1">
4343
<Uri>https://github.com/dotnet/runtime</Uri>
44-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
44+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
4545
</Dependency>
46-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.5.24268.2">
46+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.5.24271.1">
4747
<Uri>https://github.com/dotnet/runtime</Uri>
48-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
48+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
4949
</Dependency>
5050
<!-- Intermediate is necessary for source build. -->
51-
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.5.24268.2">
51+
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.5.24271.1">
5252
<Uri>https://github.com/dotnet/runtime</Uri>
53-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
53+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
5454
<SourceBuild RepoName="runtime" ManagedOnly="false" />
5555
</Dependency>
5656
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
@@ -226,25 +226,25 @@
226226
<Sha>2588f022c1c4a12e159e0ed07f5a5ea3f3c9eaa8</Sha>
227227
<SourceBuild RepoName="vstest" ManagedOnly="true" />
228228
</Dependency>
229-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.5.24268.2">
229+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.5.24271.1">
230230
<Uri>https://github.com/dotnet/runtime</Uri>
231-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
231+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
232232
</Dependency>
233-
<Dependency Name="System.CodeDom" Version="9.0.0-preview.5.24268.2">
233+
<Dependency Name="System.CodeDom" Version="9.0.0-preview.5.24271.1">
234234
<Uri>https://github.com/dotnet/runtime</Uri>
235-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
235+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
236236
</Dependency>
237-
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-preview.5.24268.2">
237+
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-preview.5.24271.1">
238238
<Uri>https://github.com/dotnet/runtime</Uri>
239-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
239+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
240240
</Dependency>
241-
<Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-preview.5.24268.2">
241+
<Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-preview.5.24271.1">
242242
<Uri>https://github.com/dotnet/runtime</Uri>
243-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
243+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
244244
</Dependency>
245-
<Dependency Name="System.Resources.Extensions" Version="9.0.0-preview.5.24268.2">
245+
<Dependency Name="System.Resources.Extensions" Version="9.0.0-preview.5.24271.1">
246246
<Uri>https://github.com/dotnet/runtime</Uri>
247-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
247+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
248248
</Dependency>
249249
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.5.24270.18">
250250
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
@@ -495,29 +495,29 @@
495495
<SourceBuild RepoName="symreader" ManagedOnly="true" />
496496
</Dependency>
497497
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
498-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.5.24268.2">
498+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.5.24271.1">
499499
<Uri>https://github.com/dotnet/runtime</Uri>
500-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
500+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
501501
</Dependency>
502502
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
503-
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.5.24268.2">
503+
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.5.24271.1">
504504
<Uri>https://github.com/dotnet/runtime</Uri>
505-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
505+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
506506
</Dependency>
507507
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
508-
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.5.24268.2">
508+
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.5.24271.1">
509509
<Uri>https://github.com/dotnet/runtime</Uri>
510-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
510+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
511511
</Dependency>
512512
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
513-
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-preview.5.24268.2">
513+
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-preview.5.24271.1">
514514
<Uri>https://github.com/dotnet/runtime</Uri>
515-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
515+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
516516
</Dependency>
517517
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
518-
<Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-preview.5.24268.2">
518+
<Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-preview.5.24271.1">
519519
<Uri>https://github.com/dotnet/runtime</Uri>
520-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
520+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
521521
</Dependency>
522522
</ProductDependencies>
523523
<ToolsetDependencies>
@@ -551,9 +551,9 @@
551551
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
552552
<SourceBuild RepoName="arcade" ManagedOnly="true" />
553553
</Dependency>
554-
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.5.24268.2">
554+
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.5.24271.1">
555555
<Uri>https://github.com/dotnet/runtime</Uri>
556-
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
556+
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
557557
</Dependency>
558558
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24256.1">
559559
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

+19-19
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,12 @@
7979
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
8080
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
8181
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
82-
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.5.24268.2</SystemSecurityCryptographyProtectedDataPackageVersion>
82+
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.5.24271.1</SystemSecurityCryptographyProtectedDataPackageVersion>
8383
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
8484
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
8585
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
8686
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
87-
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.5.24268.2</SystemReflectionMetadataLoadContextVersion>
87+
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.5.24271.1</SystemReflectionMetadataLoadContextVersion>
8888
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
8989
<SystemCommandLineVersion>2.0.0-beta4.24209.3</SystemCommandLineVersion>
9090
<SystemCommandLineRenderingVersion>0.4.0-alpha.24209.3</SystemCommandLineRenderingVersion>
@@ -130,21 +130,21 @@
130130
</PropertyGroup>
131131
<PropertyGroup>
132132
<!-- Dependencies from https://github.com/dotnet/runtime -->
133-
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETCoreAppRefPackageVersion>
134-
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24268.2</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
135-
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
136-
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsDependencyModelPackageVersion>
137-
<MicrosoftNETHostModelVersion>9.0.0-preview.5.24268.2</MicrosoftNETHostModelVersion>
138-
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
139-
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsLoggingAbstractionsVersion>
140-
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsLoggingConsoleVersion>
141-
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsLoggingVersion>
142-
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETILLinkTasksPackageVersion>
143-
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.5.24268.2</SystemServiceProcessServiceControllerVersion>
133+
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETCoreAppRefPackageVersion>
134+
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24271.1</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
135+
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
136+
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsDependencyModelPackageVersion>
137+
<MicrosoftNETHostModelVersion>9.0.0-preview.5.24271.1</MicrosoftNETHostModelVersion>
138+
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
139+
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsLoggingAbstractionsVersion>
140+
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsLoggingConsoleVersion>
141+
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsLoggingVersion>
142+
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETILLinkTasksPackageVersion>
143+
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.5.24271.1</SystemServiceProcessServiceControllerVersion>
144144
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
145-
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETCorePlatformsPackageVersion>
146-
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.5.24268.2</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
147-
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
145+
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETCorePlatformsPackageVersion>
146+
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.5.24271.1</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
147+
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
148148
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
149149
</PropertyGroup>
150150
<PropertyGroup>
@@ -177,9 +177,9 @@
177177
</PropertyGroup>
178178
<PropertyGroup>
179179
<!-- Dependencies from https://github.com/dotnet/runtime -->
180-
<SystemCodeDomPackageVersion>9.0.0-preview.5.24268.2</SystemCodeDomPackageVersion>
181-
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.5.24268.2</SystemTextEncodingCodePagesPackageVersion>
182-
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.5.24268.2</SystemResourcesExtensionsPackageVersion>
180+
<SystemCodeDomPackageVersion>9.0.0-preview.5.24271.1</SystemCodeDomPackageVersion>
181+
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.5.24271.1</SystemTextEncodingCodePagesPackageVersion>
182+
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.5.24271.1</SystemResourcesExtensionsPackageVersion>
183183
</PropertyGroup>
184184
<PropertyGroup>
185185
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-preview.5.24225.4",
3+
"dotnet": "9.0.100-preview.5.24269.5",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"

‎src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
From f704647788c026d99652b5b3716fab92486841d9 Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <viktor.hofer@microsoft.com>
3+
Date: Tue, 21 May 2024 13:50:09 +0200
4+
Subject: [PATCH] Add missing System.Memory references (#9140)
5+
6+
Backport: https://github.com/dotnet/wpf/commit/f704647788c026d99652b5b3716fab92486841d9
7+
---
8+
.../UIAutomation/UIAutomationClient/UIAutomationClient.csproj | 1 +
9+
.../src/WindowsFormsIntegration/WindowsFormsIntegration.csproj | 1 +
10+
2 files changed, 2 insertions(+)
11+
12+
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj
13+
index c4e5ad37a38..e640afd9283 100644
14+
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj
15+
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClient/UIAutomationClient.csproj
16+
@@ -113,6 +113,7 @@
17+
<NetCoreReference Include="System.Diagnostics.Process" />
18+
<NetCoreReference Include="System.Diagnostics.StackTrace" />
19+
<NetCoreReference Include="System.Diagnostics.Tools" />
20+
+ <NetCoreReference Include="System.Memory" />
21+
<NetCoreReference Include="System.Resources.ResourceManager" />
22+
<NetCoreReference Include="System.Runtime" />
23+
<NetCoreReference Include="System.Resources.ResourceManager" />
24+
diff --git a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj
25+
index 8cd65be871e..f8a6ad01de7 100644
26+
--- a/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj
27+
+++ b/src/Microsoft.DotNet.Wpf/src/WindowsFormsIntegration/WindowsFormsIntegration.csproj
28+
@@ -65,6 +65,7 @@
29+
<NetCoreReference Include="System.Diagnostics.TraceSource" />
30+
<NetCoreReference Include="System.Drawing" />
31+
<NetCoreReference Include="System.Drawing.Primitives" />
32+
+ <NetCoreReference Include="System.Memory" />
33+
<NetCoreReference Include="System.Resources.ResourceManager" />
34+
<NetCoreReference Include="System.Runtime" />
35+
<NetCoreReference Include="System.Runtime.Extensions" />

‎src/SourceBuild/patches/wpf/0002-Fix-CS0656-in-UIAutomationProvider.patch

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2+
From: Eric StJohn <ericstj@microsoft.com>
3+
Date: Mon, 20 May 2024 18:58:54 -0700
4+
Subject: [PATCH 2/2] Fix CS0656 in UIAutomationProvider
5+
6+
---
7+
.../UIAutomationProvider/UIAutomationProvider.csproj | 3 ++-
8+
1 file changed, 2 insertions(+), 1 deletion(-)
9+
10+
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj
11+
index f9928c367..bd0c444e4 100644
12+
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj
13+
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationProvider/UIAutomationProvider.csproj
14+
@@ -7,7 +7,7 @@
15+
</PropertyGroup>
16+
17+
<PropertyGroup>
18+
-
19+
+
20+
<EnableDefaultItems>false</EnableDefaultItems>
21+
</PropertyGroup>
22+
23+
@@ -52,6 +52,7 @@
24+
<NetCoreReference Include="Microsoft.Win32.Primitives" />
25+
<NetCoreReference Include="System" />
26+
<NetCoreReference Include="System.Drawing.Primitives" />
27+
+ <NetCoreReference Include="System.Memory" />
28+
<NetCoreReference Include="System.Runtime" />
29+
<NetCoreReference Include="System.Resources.ResourceManager" />
30+
<NetCoreReference Include="System.Runtime.InteropServices" />

‎src/SourceBuild/patches/wpf/0003-even-more-system-memory-cases.patch

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From dc68abb93b33b002324c366cf1235a6ae1977969 Mon Sep 17 00:00:00 2001
2+
From: Viktor Hofer <viktor.hofer@microsoft.com>
3+
Date: Tue, 21 May 2024 16:05:44 +0200
4+
Subject: [PATCH] Add missing System.Memory references (part 4)
5+
6+
Continuation of https://github.com/dotnet/wpf/commit/f704647788c026d99652b5b3716fab92486841d9
7+
8+
Backport: https://github.com/dotnet/wpf/pull/9143
9+
10+
---
11+
.../UIAutomationClientSideProviders.csproj | 1 +
12+
1 file changed, 1 insertion(+)
13+
14+
diff --git a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj
15+
index f13ff83a098..83473c0a568 100644
16+
--- a/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj
17+
+++ b/src/Microsoft.DotNet.Wpf/src/UIAutomation/UIAutomationClientSideProviders/UIAutomationClientSideProviders.csproj
18+
@@ -122,6 +122,7 @@
19+
<NetCoreReference Include="System.Diagnostics.Process" />
20+
<NetCoreReference Include="System.Diagnostics.StackTrace" />
21+
<NetCoreReference Include="System.Diagnostics.Tools" />
22+
+ <NetCoreReference Include="System.Memory" />
23+
<NetCoreReference Include="System.Net.Primitives" />
24+
<NetCoreReference Include="System.Resources.ResourceManager" />
25+
<NetCoreReference Include="System.Runtime" />

‎test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/RewriteCssTest.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2-
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3-
//
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
43

54
using Microsoft.AspNetCore.StaticWebAssets.Tasks;
65

0 commit comments

Comments
 (0)
Please sign in to comment.