Skip to content
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

Jump to bottom

Don't include d3dcompiler_47.dll on ARM64. #5747

Merged
merged 1 commit into from
Dec 16, 2021
Merged

Don't include d3dcompiler_47.dll on ARM64. #5747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 0 additions & 2 deletions Microsoft.Dotnet.Wpf.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,7 +1259,6 @@ Global
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|Any CPU.Build.0 = Debug|Win32
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|Any CPU.Deploy.0 = Debug|Win32
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|ARM64.ActiveCfg = Debug|ARM64
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|ARM64.Build.0 = Debug|ARM64
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.ActiveCfg = Debug|x64
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.Build.0 = Debug|x64
{60E8E057-79E1-4860-A015-23C9587434F7}.Debug|x64.Deploy.0 = Debug|x64
Expand All @@ -1270,7 +1269,6 @@ Global
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|Any CPU.Build.0 = Release|Win32
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|Any CPU.Deploy.0 = Release|Win32
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|ARM64.ActiveCfg = Release|ARM64
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|ARM64.Build.0 = Release|ARM64
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.ActiveCfg = Release|x64
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.Build.0 = Release|x64
{60E8E057-79E1-4860-A015-23C9587434F7}.Release|x64.Deploy.0 = Release|x64
Expand Down
21 changes: 3 additions & 18 deletions src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|ARM64">
<Configuration>Debug</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|ARM64">
<Configuration>Release</Configuration>
<Platform>ARM64</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
Expand All @@ -32,25 +24,18 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<Import Project="$(WpfCppProps)" />
<PropertyGroup Condition="'$(Architecture)'!='arm64'">
<PropertyGroup>
<!--
Target assembly will be a privatized copy of D3DCompiler, like
d3dcompiler_47_cor3.dll
-->
<TargetName>$(D3DCompilerDllBaseName)$(D3DCompilerVersion)$(WpfVersionSuffix)</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Architecture)'=='arm64'">
<TargetName>$(D3DCompilerDllBaseName)$(D3DCompilerVersion)</TargetName>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<PropertyGroup Condition="'$(Architecture)'!='arm64'">
<!-- ARM64 Port - need to exclude this logic for arm64 builds. Instead we will be using the windows\system32 version -->
<PropertyGroup>
<!-- ARM64 will use the windows\system32 version -->
<RedistSourcePath>$(Windows10SdkPath)Redist\D3D\$(Architecture)\$(D3DCompilerDllBaseName)$(D3DCompilerVersion).dll</RedistSourcePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Architecture)'=='arm64'">
<!-- ARM64 Port - turn off the copy operation -->
<IsRedistProject>False</IsRedistProject>
</PropertyGroup>
<PropertyGroup Label="Globals">
<VCProjectVersion>16.0</VCProjectVersion>
<ProjectGuid>{60E8E057-79E1-4860-A015-23C9587434F7}</ProjectGuid>
Expand Down