Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from dotnet/runtime #41014

Merged
merged 11 commits into from
May 21, 2024
Merged

[main] Update dependencies from dotnet/runtime #41014

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8856e11
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] May 20, 2024
bbf5817
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] May 20, 2024
858a2e7
Update SDK to latest public build
ericstj May 20, 2024
e1e70e8
Fix license header
ericstj May 20, 2024
86c2026
Adding patch to workaround WPF issue
ericstj May 20, 2024
aab8fb5
Add one more WPF patch
ericstj May 21, 2024
34c5479
Delete src/SourceBuild/patches/wpf/0001-Address-CS0656-with-latest-co…
ViktorHofer May 21, 2024
6c888d6
Update dependencies from https://github.com/dotnet/runtime build 2024…
dotnet-maestro[bot] May 21, 2024
29b0e02
Create 0001-more-system-memory-fixes.patch
ViktorHofer May 21, 2024
28281fc
Update 0001-more-system-memory-fixes.patch
ViktorHofer May 21, 2024
3583d8c
Create 0003-even-more-system-memory-cases.patch
ViktorHofer May 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 40 additions & 40 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,42 +15,42 @@
<Sha>b643e665e128bde2810539243e1cefbf12140b1b</Sha>
<SourceBuild RepoName="templating" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.5.24268.2">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.9.0" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.5.24268.2">
<Dependency Name="VS.Redist.Common.NetCore.TargetingPack.x64.9.0" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.NETCore.App.Host.win-x64" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.NETCore.Platforms" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.NET.HostModel" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.runtime.linux-x64" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
<SourceBuild RepoName="runtime" ManagedOnly="false" />
</Dependency>
<!-- Change blob version in GenerateLayout.targets if this is unpinned to service targeting pack -->
Expand Down Expand Up @@ -226,25 +226,25 @@
<Sha>2588f022c1c4a12e159e0ed07f5a5ea3f3c9eaa8</Sha>
<SourceBuild RepoName="vstest" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="9.0.0-preview.5.24268.2">
<Dependency Name="System.CodeDom" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-preview.5.24268.2">
<Dependency Name="System.Security.Cryptography.ProtectedData" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-preview.5.24268.2">
<Dependency Name="System.Text.Encoding.CodePages" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="9.0.0-preview.5.24268.2">
<Dependency Name="System.Resources.Extensions" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="9.0.0-preview.5.24269.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -495,29 +495,29 @@
<SourceBuild RepoName="symreader" ManagedOnly="true" />
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-preview.5.24268.2">
<Dependency Name="Microsoft.Extensions.FileSystemGlobbing" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<!-- Dependency required for flowing correct package version in source-build, using PVP flow. -->
<Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-preview.5.24268.2">
<Dependency Name="System.ServiceProcess.ServiceController" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down Expand Up @@ -551,9 +551,9 @@
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.5.24268.2">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-preview.5.24271.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>5474ab5c50fc639e780e0322cd500b2e43ee9b0d</Sha>
<Sha>2bfd1b44200de244a66b7f4a7604be1f2d5585bc</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24256.1">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand Down
38 changes: 19 additions & 19 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.5.24268.2</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>9.0.0-preview.5.24271.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
<SystemXmlXmlDocumentPackageVersion>4.3.0</SystemXmlXmlDocumentPackageVersion>
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
<SystemTextJsonVersion>7.0.3</SystemTextJsonVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.5.24268.2</SystemReflectionMetadataLoadContextVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-preview.5.24271.1</SystemReflectionMetadataLoadContextVersion>
<SystemManagementPackageVersion>4.6.0</SystemManagementPackageVersion>
<SystemCommandLineVersion>2.0.0-beta4.24209.3</SystemCommandLineVersion>
<SystemCommandLineRenderingVersion>0.4.0-alpha.24209.3</SystemCommandLineRenderingVersion>
Expand Down Expand Up @@ -130,21 +130,21 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24268.2</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.5.24268.2</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.5.24268.2</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.5.24268.2</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreAppRefPackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETCoreAppRefPackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>9.0.0-preview.5.24271.1</VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion>
<MicrosoftNETCoreAppRuntimewinx64PackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETCoreAppRuntimewinx64PackageVersion>
<MicrosoftExtensionsDependencyModelPackageVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsDependencyModelPackageVersion>
<MicrosoftNETHostModelVersion>9.0.0-preview.5.24271.1</MicrosoftNETHostModelVersion>
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
<MicrosoftExtensionsLoggingAbstractionsVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsLoggingAbstractionsVersion>
<MicrosoftExtensionsLoggingConsoleVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsLoggingConsoleVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-preview.5.24271.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETILLinkTasksPackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETILLinkTasksPackageVersion>
<SystemServiceProcessServiceControllerVersion>9.0.0-preview.5.24271.1</SystemServiceProcessServiceControllerVersion>
<MicrosoftNETCoreDotNetHostResolverPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETCoreDotNetHostResolverPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.5.24268.2</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.5.24268.2</MicrosoftNETCoreAppHostwinx64PackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETCorePlatformsPackageVersion>
<VSRedistCommonNetCoreTargetingPackx6490PackageVersion>9.0.0-preview.5.24271.1</VSRedistCommonNetCoreTargetingPackx6490PackageVersion>
<MicrosoftNETCoreAppHostwinx64PackageVersion>9.0.0-preview.5.24271.1</MicrosoftNETCoreAppHostwinx64PackageVersion>
<NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -177,9 +177,9 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/runtime -->
<SystemCodeDomPackageVersion>9.0.0-preview.5.24268.2</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.5.24268.2</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.5.24268.2</SystemResourcesExtensionsPackageVersion>
<SystemCodeDomPackageVersion>9.0.0-preview.5.24271.1</SystemCodeDomPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>9.0.0-preview.5.24271.1</SystemTextEncodingCodePagesPackageVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-preview.5.24271.1</SystemResourcesExtensionsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/roslyn-analyzers -->
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100-preview.5.24225.4",
"dotnet": "9.0.100-preview.5.24269.5",
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
Expand Down
37 changes: 37 additions & 0 deletions src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
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)

* Add missing System.Memory references

* Update WindowsFormsIntegration.csproj
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
---
.../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 src/SourceBuild/patches/wpf/0002-Fix-CS0656-in-UIAutomationProvider.patch
View file
Open in desktop
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" />
5 changes: 2 additions & 3 deletions test/Microsoft.NET.Sdk.Razor.Tests/StaticWebAssets/RewriteCssTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Loading