diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c973cd1ed797..7142d0d1d036 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -15,42 +15,42 @@ d588634504d1db224ece2c502daee24fabd21212 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc @@ -226,25 +226,25 @@ 2588f022c1c4a12e159e0ed07f5a5ea3f3c9eaa8 - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc https://github.com/dotnet/windowsdesktop @@ -495,29 +495,29 @@ - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc @@ -551,9 +551,9 @@ ed14da5934ffb536cff8f41f8b5719334524cbed - + https://github.com/dotnet/runtime - 5474ab5c50fc639e780e0322cd500b2e43ee9b0d + 2bfd1b44200de244a66b7f4a7604be1f2d5585bc https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5afa06e16926..451de81b6e02 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.24271.1 4.3.0 4.3.0 4.0.5 7.0.3 - 9.0.0-preview.5.24268.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.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.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.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.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.24268.2 - 9.0.0-preview.5.24268.2 - 9.0.0-preview.5.24268.2 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 + 9.0.0-preview.5.24271.1 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)" 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..bfacf3e81397 --- /dev/null +++ b/src/SourceBuild/patches/wpf/0001-more-system-memory-fixes.patch @@ -0,0 +1,35 @@ +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) + +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 @@ + + + ++ + + + +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 @@ + + + ++ + + + 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 @@ + + + ++ + + + 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 @@ + + + ++ + + + 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;