Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
a80b76e3
W
wpf
项目概览
dotNET Platform
/
wpf
12 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wpf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
a80b76e3
编写于
12月 16, 2021
作者:
A
Ashish Kumar Singh
提交者:
GitHub
12月 16, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #5747 from singhashish-wpf/d3dcompiler
Don't include d3dcompiler_47.dll on ARM64.
上级
ba81724c
eaee9fea
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
3 addition
and
20 deletion
+3
-20
Microsoft.Dotnet.Wpf.sln
Microsoft.Dotnet.Wpf.sln
+0
-2
src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj
...crosoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj
+3
-18
未找到文件。
Microsoft.Dotnet.Wpf.sln
浏览文件 @
a80b76e3
...
...
@@ -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
...
...
@@ -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
...
...
src/Microsoft.DotNet.Wpf/redist/D3DCompiler/D3DCompiler.vcxproj
浏览文件 @
a80b76e3
<?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>
...
...
@@ -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>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录