Skip to content

Commit 36f3469

Browse files
authored
[release/10.0] Reverting D3D Compiler Pinning (#11433)
* Reverting D3D Compiler Pinning * Fixing global.json formatting issue
1 parent a744de9 commit 36f3469

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

eng/WpfArcadeSdk/Sdk/Sdk.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<LangVersion Condition="'$(LangVersion)'=='' and ($(PreReleaseVersionLabel.Contains('rc')) or $(PreReleaseVersionLabel.Contains('preview')) or $(PreReleaseVersionLabel.Contains('alpha')))">preview</LangVersion>
1818
<LangVersion Condition="'$(LangVersion)'==''">14</LangVersion>
1919
<CLSCompliant Condition="'$(CLSCompliant)'==''">true</CLSCompliant>
20-
<IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute )'==''">true</IncludeDllSafeSearchPathAttribute>
20+
<IncludeDllSafeSearchPathAttribute Condition="'$(IncludeDllSafeSearchPathAttribute)'==''">true</IncludeDllSafeSearchPathAttribute>
2121

2222
<!--
2323
Properly calculates the RuntimeIdentifier based on the Platform type. We don't want to affect the build by actually setting RuntimeIdentifier.

global.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
},
3131
"native-tools": {
3232
"strawberry-perl": "5.38.0.1",
33-
"net-framework-48-ref-assemblies": "0.0.0.1",
34-
"windows-sdk-d3d-redist": "1.0.0"
33+
"net-framework-48-ref-assemblies": "0.0.0.1"
3534
}
3635
}

src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@
3434
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3535
<PropertyGroup>
3636
<!-- ARM64 will use the windows\system32 version -->
37-
<!-- 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
38-
a temporary workaround for this issue. We pull from netcore native assets instead. -->
39-
<RedistSourcePath>$(RepositoryToolsDir)native\bin\windows-sdk-d3d-redist\1.0.0\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll</RedistSourcePath>
37+
<RedistSourcePath>$(Windows10SdkPath)Redist\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll</RedistSourcePath>
4038
</PropertyGroup>
4139
<PropertyGroup Label="Globals">
4240
<VCProjectVersion>16.0</VCProjectVersion>

0 commit comments

Comments
 (0)