Skip to content

[release/10.0] Source code updates from dotnet/dotnet #5354

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
Oct 20, 2025
Merged

[release/10.0] Source code updates from dotnet/dotnet #5354

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
f737529
Backflow from https://github.com/dotnet/dotnet / d499f9c build 287756
dotnet-maestro[bot] Oct 20, 2025
debafe7
Merge release/10.0 into darc-release/10.0-b227105d-a416-499d-87be-af3…
dotnet-maestro[bot] Oct 20, 2025
3f0eaa7
Update dependencies from https://github.com/dotnet/dotnet build 287756
dotnet-maestro[bot] Oct 20, 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.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<ItemGroup>
<!-- Microsoft.WindowsDesktop.App shared framework -->
<ProjectReference Include="src\windowsdesktop\src\sfx\**\*.sfxproj" />
<!-- Windows Desktop Runtime Bundle -->
<!-- Windows Desktop Runtime Bundle -->
<ProjectReference Include="src\windowsdesktop\src\bundle\**\*.wixproj" />
<ProjectReference Include="src\windowsdesktop\tests\**\*.Tests.csproj" />

Expand Down
39 changes: 1 addition & 38 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<Project>
<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

<PropertyGroup>
<!-- WiX v5 Configuration -->
<UseWix5>true</UseWix5>
Expand All @@ -9,42 +8,8 @@
<WixToolsetCompilerPdbType>full</WixToolsetCompilerPdbType>
<WixToolsetLinkerPdbType>full</WixToolsetLinkerPdbType>

<!-- Force sequential builds to prevent file locking issues -->
<!-- Override MSBuild's default /m flag behavior -->
<BuildInParallel>false</BuildInParallel>
<MaxCpuCount>1</MaxCpuCount>

<!-- Additional sequential build enforcement -->
<MSBuildDisableNodeReuse>true</MSBuildDisableNodeReuse>
<UseSharedCompilation>false</UseSharedCompilation>

<!-- Ensure Wixpack generation is enabled for all build types -->
<WixCreateWixPackOutput Condition="'$(OutputType)' == 'Bundle'">true</WixCreateWixPackOutput>

<!-- Ensure Wixpack targets run in CI/PR builds and local builds -->
<RunWixpackTargets Condition="'$(TF_BUILD)' == 'true' OR '$(CI)' == 'true' OR '$(ContinuousIntegrationBuild)' == 'true'">true</RunWixpackTargets>
<RunWixpackTargets Condition="'$(RunWixpackTargets)' == ''">true</RunWixpackTargets>

<!-- Project-level parallelism controls -->
<BuildProjectReferences>true</BuildProjectReferences>
<BuildInParallel Condition="'$(BuildingInstallers)' == 'true'">false</BuildInParallel>
<MaxCpuCount Condition="'$(BuildingInstallers)' == 'true'">1</MaxCpuCount>
<MaxCpuCount Condition="'$(PlatformPackageType)' == 'RuntimePack'">1</MaxCpuCount>

<!-- CI build stability measures -->
<BuildInParallel Condition="'$(TF_BUILD)' == 'true' OR '$(CI)' == 'true'">false</BuildInParallel>
<MaxCpuCount Condition="'$(TF_BUILD)' == 'true' OR '$(CI)' == 'true'">1</MaxCpuCount>

<!-- WindowsDesktop uses transport packages with pre-compiled R2R assemblies -->
<!-- Local CrossGen2 compilation settings removed - rely on transport packages -->

<!-- Disable parallel builds entirely for RuntimePack to prevent all file conflicts -->
<ContinueOnError Condition="'$(PlatformPackageType)' == 'RuntimePack'">false</ContinueOnError>

<!-- Process timeout settings to prevent hanging builds -->
<MSBuildNodeAndChildProcessTimeout>600000</MSBuildNodeAndChildProcessTimeout>
<MSBuildProcessTimeout>600000</MSBuildProcessTimeout>
<TaskTimeout>600</TaskTimeout>
<RunWixpackTargets>true</RunWixpackTargets>

<!-- Packaging properties -->
<RepositoryUrl>https://github.com/dotnet/windowsdesktop</RepositoryUrl>
Expand All @@ -58,8 +23,6 @@
<PackageThirdPartyNoticesFile>$(MSBuildThisFileDirectory)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
<PackageReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</PackageReleaseNotes>



<!-- Set up handling of build warnings -->
<WarningLevel>4</WarningLevel>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
Expand Down
2 changes: 1 addition & 1 deletion NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-c737522" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-c737522b/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-d499f9c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-d499f9cd/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand Down
45 changes: 0 additions & 45 deletions build-all-architectures.ps1
View file
Open in desktop

This file was deleted.

17 changes: 0 additions & 17 deletions build-sequential.cmd
View file
Open in desktop

This file was deleted.

72 changes: 0 additions & 72 deletions build-sequential.ps1
View file
Open in desktop

This file was deleted.

26 changes: 13 additions & 13 deletions eng/Version.Details.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25517.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25517.104</MicrosoftDotNetBuildTasksArchivesPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25517.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25517.104</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25517.104</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25517.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25517.104</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfGitHubPackageVersion>10.0.0-rtm.25517.104</MicrosoftDotNetWpfGitHubPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-rtm.25517.104</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftInternalRuntimeWindowsDesktopTransportPackageVersion>10.0.0-rtm.25517.104</MicrosoftInternalRuntimeWindowsDesktopTransportPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-rtm.25517.104</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksArchivesPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetBuildTasksArchivesPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25519.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>10.0.0-rtm.25519.102</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
<MicrosoftDotNetWpfGitHubPackageVersion>10.0.0-rtm.25519.102</MicrosoftDotNetWpfGitHubPackageVersion>
<MicrosoftDotNetWpfProjectTemplatesPackageVersion>10.0.0-rtm.25519.102</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
<MicrosoftInternalRuntimeWindowsDesktopTransportPackageVersion>10.0.0-rtm.25519.102</MicrosoftInternalRuntimeWindowsDesktopTransportPackageVersion>
<MicrosoftNETSdkWindowsDesktopPackageVersion>10.0.0-rtm.25519.102</MicrosoftNETSdkWindowsDesktopPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.0</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25517.104</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25517.104</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftNETCorePlatformsPackageVersion>10.0.0-rtm.25519.102</MicrosoftNETCorePlatformsPackageVersion>
<MicrosoftPrivateWinformsPackageVersion>10.0.0-rtm.25519.102</MicrosoftPrivateWinformsPackageVersion>
<MicrosoftWin32RegistryAccessControlPackageVersion>10.0.0</MicrosoftWin32RegistryAccessControlPackageVersion>
<MicrosoftWin32SystemEventsPackageVersion>10.0.0</MicrosoftWin32SystemEventsPackageVersion>
<SystemCodeDomPackageVersion>10.0.0</SystemCodeDomPackageVersion>
Expand Down
Loading