Skip to content

[main] Source code updates from dotnet/dotnet #11087

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

Merged
merged 3 commits into from
Sep 5, 2025
Merged

[main] Source code updates from dotnet/dotnet #11087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
65bfbf3
Backflow from https://github.com/dotnet/dotnet / 3e92251 build 281912
dotnet-maestro[bot] Sep 4, 2025
d68dd61
Update dependencies from https://github.com/dotnet/dotnet build 281912
dotnet-maestro[bot] Sep 4, 2025
75c34a5
Update dependencies from https://github.com/dotnet/dotnet build 282048
dotnet-maestro[bot] Sep 5, 2025
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
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 $@
9 changes: 9 additions & 0 deletions eng/Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>

<!-- Only build the Microsoft.NET.Sdk.WindowsDesktop package on non-Windows. -->
<ItemGroup Condition="'$(OS)' != 'Windows_NT'">
<ProjectToBuild Include="$(RepoRoot)packaging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj" />
<ProjectToBuild Include="$(RepoRoot)packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion eng/Tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<!-- Pre-download vcxproj dependencies as vcxprojs in this repo don't support NuGet package download. -->
<ItemGroup>
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(MicrosoftNETCoreAppRefVersion)]" Condition="'$(MicrosoftNETCoreAppRefVersion)' != ''" />
<PackageDownload Include="Microsoft.NETCore.App.Runtime.$(_RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRefVersion)]" Condition="'$(MicrosoftNETCoreAppRefVersion)' != ''" />
<PackageDownload Include="Microsoft.NETCore.App.Host.$(_RuntimeIdentifier)" Version="[$(MicrosoftNETCoreAppRefVersion)]" Condition="'$(MicrosoftNETCoreAppRefVersion)' != ''" />
Expand Down
49 changes: 26 additions & 23 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is auto-generated by the Maestro dependency flow system.
Do not edit it manually, as it will get overwritten by automation.
Expand All @@ -7,36 +6,40 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>10.0.0-beta.25420.121</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25420.121</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25420.121</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25420.121</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25454.102</MicrosoftDotNetHelixSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rc.1.25454.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25454.102</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25454.102</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rc.1.25454.102</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftSourceLinkAzureReposGitPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkAzureReposGitPackageVersion>
<MicrosoftSourceLinkGitHubPackageVersion>8.0.0-beta.23409.2</MicrosoftSourceLinkGitHubPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25420.121</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25420.121</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25420.121</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25420.121</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25420.121</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25420.121</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25420.121</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25420.121</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25420.121</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25420.121</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25420.121</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25420.121</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25420.121</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25420.121</SystemWindowsExtensionsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0-rc.1.25454.102</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-rc.1.25454.102</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>10.0.0-rc.1.25454.102</SystemDiagnosticsEventLogPackageVersion>
<SystemDirectoryServicesPackageVersion>10.0.0-rc.1.25454.102</SystemDirectoryServicesPackageVersion>
<SystemDrawingCommonPackageVersion>10.0.0-rc.1.25454.102</SystemDrawingCommonPackageVersion>
<SystemFormatsNrbfPackageVersion>10.0.0-rc.1.25454.102</SystemFormatsNrbfPackageVersion>
<SystemIOPackagingPackageVersion>10.0.0-rc.1.25454.102</SystemIOPackagingPackageVersion>
<SystemPrivateWindowsCoreTestUtilitiesPackageVersion>10.0.0-rc.1.25454.102</SystemPrivateWindowsCoreTestUtilitiesPackageVersion>
<SystemReflectionMetadataLoadContextPackageVersion>10.0.0-rc.1.25454.102</SystemReflectionMetadataLoadContextPackageVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-rc.1.25454.102</SystemResourcesExtensionsPackageVersion>
<SystemRuntimeSerializationFormattersPackageVersion>10.0.0-rc.1.25454.102</SystemRuntimeSerializationFormattersPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-rc.1.25454.102</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-rc.1.25454.102</SystemSecurityPermissionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-rc.1.25454.102</SystemWindowsExtensionsPackageVersion>
<!-- _git/dotnet-wpf-int dependencies -->
<MicrosoftDotNetWpfDncEngPackageVersion>10.0.0-preview.7.25317.2</MicrosoftDotNetWpfDncEngPackageVersion>
</PropertyGroup>
<!--Property group for alternate package version names-->
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildFrameworkPackageVersion)</MicrosoftBuildFrameworkVersion>
<MicrosoftBuildUtilitiesCoreVersion>$(MicrosoftBuildUtilitiesCorePackageVersion)</MicrosoftBuildUtilitiesCoreVersion>
<MicrosoftDotNetArcadeSdkVersion>$(MicrosoftDotNetArcadeSdkPackageVersion)</MicrosoftDotNetArcadeSdkVersion>
<MicrosoftDotNetCodeAnalysisVersion>$(MicrosoftDotNetCodeAnalysisPackageVersion)</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>$(MicrosoftDotNetGenAPIPackageVersion)</MicrosoftDotNetGenAPIVersion>
Expand Down
98 changes: 53 additions & 45 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,96 +1,104 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="c4dc56079d959dbdb7fc27ea8ad7f95194885923" BarId="280214" />
<Source Uri="https://github.com/dotnet/dotnet" Mapping="wpf" Sha="9303fa2ba817e93495ead20a93200dfeeff61b23" BarId="282048" />
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25420.121">
<Dependency Name="Microsoft.Private.Winforms" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25420.121">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25420.121">
<Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="10.0.0-preview.7.25317.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
<Sha>8a6c1d81657ef04c040f598cafacf8f5a33abda2</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Runtime.Serialization.Formatters" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25420.121">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.CodeDom" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Configuration.ConfigurationManager" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Diagnostics.EventLog" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.DirectoryServices" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Formats.Nrbf" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.IO.Packaging" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Security.Cryptography.Xml" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Security.Permissions" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Drawing.Common" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Framework" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.Utilities.Core" Version="15.9.20">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>520c71b5277fc1f72dbec14da03ca55205d6c8e5</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25420.121">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="10.0.0-beta.25420.121">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="11.0.0-beta.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25420.121">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="10.0.0-beta.25420.121">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="11.0.0-beta.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
<!-- TODO: Unpin sourcelink dependencies: https://github.com/dotnet/wpf/issues/11042 -->
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2" Pinned="true">
Expand All @@ -101,9 +109,9 @@
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>e9f665e52848a3615736c099e5631af531b66a5c</Sha>
</Dependency>
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25420.121">
<Dependency Name="System.Private.Windows.Core.TestUtilities" Version="10.0.0-rc.1.25454.102">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>c4dc56079d959dbdb7fc27ea8ad7f95194885923</Sha>
<Sha>9303fa2ba817e93495ead20a93200dfeeff61b23</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 0 additions & 2 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
</PropertyGroup>
<!-- Other Packages that require manual updating-->
<PropertyGroup>
<MicrosoftBuildFrameworkPackageVersion>15.9.20</MicrosoftBuildFrameworkPackageVersion>
<MicrosoftBuildUtilitiesCorePackageVersion>15.9.20</MicrosoftBuildUtilitiesCorePackageVersion>
<!--
Also in global.json
Used in Wpf.Cpp.PrivateTools.props/targets
Expand Down
1 change: 1 addition & 0 deletions eng/WpfArcadeSdk/tools/ApiCompat.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<RunNetFrameworkApiCompat Condition="'$(Net48CompatNeededProjects)'!=''
and $(Net48CompatNeededProjects.Contains('$(MSBuildProjectName);'))
and !($(MSBuildProjectName.Contains('_wpftmp')))">true</RunNetFrameworkApiCompat>
<RunNetFrameworkApiCompat Condition="'$(OS)' != 'Windows_NT'">false</RunNetFrameworkApiCompat>
</PropertyGroup>

<!-- Only enable Ref API Compat for the lib projects using hand-crafted reference assemblies,
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/steps/generate-sbom.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/common/sdk-task.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
Expand Down
8 changes: 4 additions & 4 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -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)"
Expand All @@ -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.25454.102",
"Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25454.102",
"Microsoft.Build.NoTargets": "3.7.56"
},
"native-tools": {
Expand Down
4 changes: 4 additions & 0 deletions ...ging/Microsoft.NET.Sdk.WindowsDesktop/Microsoft.NET.Sdk.WindowsDesktop.ArchNeutral.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
<PackagingContent Include="useSharedDesignerContext.txt" SubFolder="root" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="$(RepoRoot)src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/PresentationBuildTasks.csproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
</ItemGroup>

<!-- Windows Forms validation and packaging -->
<Import Project="Microsoft.NET.Sdk.WindowsDesktop.WinForms.Packaging.targets" />

Expand Down
Loading