Skip to content

[release/8.0] Reverting D3D Compiler Pinning #11425

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

Open
dipeshmsft wants to merge 7 commits into
base: release/8.0
Choose a base branch
from
+6 −8
Open

[release/8.0] Reverting D3D Compiler Pinning #11425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5ce8e2d
Reverting D3D Compiler Pinning
dipeshmsft Feb 3, 2026
0bd5af2
Updating Windows SDK version
dipeshmsft Feb 3, 2026
4d93971
Fixing global.json formatting issue
dipeshmsft Feb 4, 2026
044f6d3
Modified pipeline to publish build artifacts
dipeshmsft Feb 5, 2026
ede26aa
Modifying pipeline to publish x86 artifact as well
dipeshmsft Feb 6, 2026
2340b50
Modifying pipelines
dipeshmsft Feb 6, 2026
25e7739
Reverting pipeline changes
dipeshmsft Feb 6, 2026
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,7 @@ ASALocalRun/
/.dotnet
/.packages
/.tools/vswhere/2.5.2
/.tools/vswhere/3.1.7
/.tools/native/iltools

### OSX ###
Expand Down
2 changes: 1 addition & 1 deletion eng/WpfArcadeSdk/Sdk/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<LangVersion Condition="'$(LangVersion)'=='' and ($(PreReleaseVersionLabel.Contains('rc')) or $(PreReleaseVersionLabel.Contains('preview')) or $(PreReleaseVersionLabel.Contains('alpha')))">preview</LangVersion>
<LangVersion Condition="'$(LangVersion)'==''">10</LangVersion>
<CLSCompliant Condition="'$(CLSCompliant)'==''">true</CLSCompliant>
<IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>
<IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute)'==''">true</IncludeDllSafeSearchPathAttribute>

<!--
Properly calculates the RuntimeIdentifier based on the Platform type. We don't want to affect the build by actually setting RuntimeIdentifier.
Expand Down
4 changes: 2 additions & 2 deletions eng/WpfArcadeSdk/tools/Wpf.Cpp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<!-- v143 = Visual Studio 2022 -->
<PlatformToolset>v143</PlatformToolset>

<!-- 17134 is Windows 10 v1903 (19H1) SDK -->
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
<!-- 26100 is Windows 11 SDK -->
<WindowsTargetPlatformVersion>10.0.26100.0</WindowsTargetPlatformVersion>

<ConfigurationType Condition="'$(ConfigurationType)'==''">DynamicLibrary</ConfigurationType>

Expand Down
3 changes: 1 addition & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
},
"native-tools": {
"strawberry-perl": "5.28.1.1-1",
"net-framework-48-ref-assemblies": "0.0.0.1",
"windows-sdk-d3d-redist": "1.0.0"
"net-framework-48-ref-assemblies": "0.0.0.1"
}
}
4 changes: 1 addition & 3 deletions src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup>
<!-- ARM64 will use the windows\system32 version -->
<!-- ISSUE!! https://github.com/dotnet/wpf/issues/9670: An updated D3D Redist is incompatible with Win10, at least when built with the 19041 Windows SDK. This is
a temporary workaround for this issue. We pull from netcore native assets instead. -->
<RedistSourcePath>$(RepositoryToolsDir)native\bin\windows-sdk-d3d-redist\1.0.0\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll</RedistSourcePath>
<RedistSourcePath>$(Windows10SdkPath)Redist\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll</RedistSourcePath>
</PropertyGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
Expand Down