From 65bfbf31d479c06ccdddf0f93d5241bdce4c2424 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Sep 2025 12:03:58 +0000 Subject: [PATCH 1/3] Backflow from https://github.com/dotnet/dotnet / 3e92251 build 281912 [[ commit created by automation ]] --- build.sh | 2 +- eng/Build.props | 9 +++++++++ eng/Tools.props | 2 +- eng/Versions.props | 2 -- eng/WpfArcadeSdk/tools/ApiCompat.targets | 1 + .../Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj | 4 ++++ .../PresentationBuildTasks/PresentationBuildTasks.csproj | 9 +++++---- 7 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 eng/Build.props diff --git a/build.sh b/build.sh index 8477d5af881..84a7478bfa5 100755 --- a/build.sh +++ b/build.sh @@ -13,4 +13,4 @@ while [[ -h $source ]]; do done scriptroot="$( cd -P "$( dirname "$source" )" && pwd )" -"$scriptroot/eng/common/build.sh" --build --restore $@ +"$scriptroot/eng/common/build.sh" --restore --build $@ diff --git a/eng/Build.props b/eng/Build.props new file mode 100644 index 00000000000..25dd1f9d38b --- /dev/null +++ b/eng/Build.props @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/eng/Tools.props b/eng/Tools.props index 6d65666f935..e8cd72a378c 100644 --- a/eng/Tools.props +++ b/eng/Tools.props @@ -6,7 +6,7 @@ - + diff --git a/eng/Versions.props b/eng/Versions.props index b4e81997d15..0f9facda358 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,8 +39,6 @@ - 15.9.20 - 15.9.20 diff --git a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj index 0feda021e68..dd20b37919b 100644 --- a/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj +++ b/src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj @@ -1,6 +1,7 @@  net472;net10.0 + false true @@ -121,11 +122,11 @@ WindowsBase\MS\Internal\IO\Packaging\CompoundFile\ContainerUtilities.cs - - PresentationCore\MS\Internal\Media\XamlSerializationHelper.cs + + PresentationCore\MS\internal\Media\XamlSerializationHelper.cs - - PresentationCore\MS\Internal\Media\ParserStreamGeometryContext.cs + + PresentationCore\MS\internal\Media\ParserStreamGeometryContext.cs PresentationCore\System\Windows\Media\StreamGeometryContext.cs From d68dd61ee7cb01122cbc1406cab1a2746f9a4806 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Sep 2025 12:03:59 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/dotnet build 281912 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25420.121 -> 11.0.0-beta.25453.110) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25420.121 -> 10.0.0-rc.1.25453.110) Added Dependencies: Microsoft.Build.Framework, Microsoft.Build.Utilities.Core (Version 15.9.20) --- eng/Version.Details.props | 49 +++++----- eng/Version.Details.xml | 98 ++++++++++--------- .../core-templates/steps/generate-sbom.yml | 2 +- eng/common/sdk-task.sh | 2 +- global.json | 8 +- 5 files changed, 85 insertions(+), 74 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d6a76b28bf4..7e4322ce857 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1,4 +1,3 @@ - - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-beta.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 + 15.9.20 + 15.9.20 + 11.0.0-beta.25453.110 + 11.0.0-beta.25453.110 + 11.0.0-beta.25453.110 + 11.0.0-beta.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 - 10.0.0-rc.1.25420.121 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25453.110 10.0.0-preview.7.25317.2 + $(MicrosoftBuildFrameworkPackageVersion) + $(MicrosoftBuildUtilitiesCorePackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetCodeAnalysisPackageVersion) $(MicrosoftDotNetGenAPIPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c708871a207..4bd133fa982 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,96 +1,104 @@ - + - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf + + + https://github.com/dotnet/dotnet + 520c71b5277fc1f72dbec14da03ca55205d6c8e5 + + + https://github.com/dotnet/dotnet + 520c71b5277fc1f72dbec14da03ca55205d6c8e5 - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf @@ -101,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - c4dc56079d959dbdb7fc27ea8ad7f95194885923 + 3e92251978ce669b493f159048932e690306a3bf diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index c05f6502797..003f7eae0fa 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 10.0.0 + PackageVersion: 11.0.0 BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 0c92f81d74f..3270f83fa9a 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -10,7 +10,7 @@ show_usage() { echo "Advanced settings:" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" - echo " --noWarnAsError Do not warn as error + echo " --noWarnAsError Do not warn as error" echo "" echo "Command line arguments not listed above are passed thru to msbuild." } diff --git a/global.json b/global.json index 4090ed9c499..7e4793d381c 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25411.109", + "version": "10.0.100-rc.1.25420.111", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.1.25411.109", + "dotnet": "10.0.100-rc.1.25420.111", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.121", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.121", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25453.110", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25453.110", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 75c34a52b031c4c25875b2ef0438d74d51467e59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Sep 2025 02:24:36 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/dotnet build 282048 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 11.0.0-beta.25453.110 -> 11.0.0-beta.25454.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.1.25453.110 -> 10.0.0-rc.1.25454.102) --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7e4322ce857..38908392650 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25453.110 - 11.0.0-beta.25453.110 - 11.0.0-beta.25453.110 - 11.0.0-beta.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 11.0.0-beta.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 - 10.0.0-rc.1.25453.110 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 + 10.0.0-rc.1.25454.102 10.0.0-preview.7.25317.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4bd133fa982..62e360c1cfa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 8a6c1d81657ef04c040f598cafacf8f5a33abda2 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - 3e92251978ce669b493f159048932e690306a3bf + 9303fa2ba817e93495ead20a93200dfeeff61b23 diff --git a/global.json b/global.json index 7e4793d381c..94220abbc67 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25453.110", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25453.110", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25454.102", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25454.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {