Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
fc4649cc
W
wpf
项目概览
dotNET Platform
/
wpf
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
fc4649cc
编写于
2月 08, 2022
作者:
T
ThomasGoulet73
提交者:
GitHub
2月 08, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Pull release/6.0 into main (#6071)
上级
41c55369
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
4 addition
and
8 deletion
+4
-8
eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
+2
-2
global.json
global.json
+1
-1
src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
...ft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
+1
-5
未找到文件。
eng/WpfArcadeSdk/tools/ReferenceAssembly.targets
浏览文件 @
fc4649cc
...
@@ -46,13 +46,13 @@
...
@@ -46,13 +46,13 @@
Outputs="$(IntellisenseXmlDir)$(AssemblyName).xml">
Outputs="$(IntellisenseXmlDir)$(AssemblyName).xml">
<PropertyGroup>
<PropertyGroup>
<!-- Also in global.json -->
<!-- Also in global.json -->
<DotNetApiDocsNet
50>0.0.0.3</DotNetApiDocsNet5
0>
<DotNetApiDocsNet
60>0.0.0.4</DotNetApiDocsNet6
0>
<!--
<!--
This blob lives in Azure storage at https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/dotnet-api-docs_net6.0/
This blob lives in Azure storage at https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/dotnet-api-docs_net6.0/
Instructions for updating these artifacts are at https://github.com/dotnet/wpf/blob/master/docs/intellisense.md
Instructions for updating these artifacts are at https://github.com/dotnet/wpf/blob/master/docs/intellisense.md
-->
-->
<IntellisenseXmlDir>$(CommonLibrary_NativeInstallDir)\bin\dotnet-api-docs_net
5.0\$(DotNetApiDocsNet50)\_intellisense\net-5
.0\</IntellisenseXmlDir>
<IntellisenseXmlDir>$(CommonLibrary_NativeInstallDir)\bin\dotnet-api-docs_net
6.0\$(DotNetApiDocsNet60)\_intellisense\net-6
.0\</IntellisenseXmlDir>
</PropertyGroup>
</PropertyGroup>
<Error Condition="!Exists('$(IntellisenseXmlDir)')"
<Error Condition="!Exists('$(IntellisenseXmlDir)')"
...
...
global.json
浏览文件 @
fc4649cc
...
@@ -21,6 +21,6 @@
...
@@ -21,6 +21,6 @@
"native-tools"
:
{
"native-tools"
:
{
"strawberry-perl"
:
"5.28.1.1-1"
,
"strawberry-perl"
:
"5.28.1.1-1"
,
"net-framework-48-ref-assemblies"
:
"0.0.0.1"
,
"net-framework-48-ref-assemblies"
:
"0.0.0.1"
,
"dotnet-api-docs_net
5.0"
:
"0.0.0.3
"
"dotnet-api-docs_net
6.0"
:
"0.0.0.4
"
}
}
}
}
src/Microsoft.DotNet.Wpf/src/PresentationBuildTasks/Microsoft/Build/Tasks/Windows/GenerateTemporaryTargetAssembly.cs
浏览文件 @
fc4649cc
...
@@ -281,15 +281,11 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport()
...
@@ -281,15 +281,11 @@ private bool ExecuteGenerateTemporaryTargetAssemblyWithPackageReferenceSupport()
// Save the xmlDocument content into the temporary project file.
// Save the xmlDocument content into the temporary project file.
xmlProjectDoc
.
Save
(
TemporaryTargetAssemblyProjectName
);
xmlProjectDoc
.
Save
(
TemporaryTargetAssemblyProjectName
);
// Disable conflicting Arcade SDK workaround that imports NuGet props/targets
Hashtable
globalProperties
=
new
Hashtable
(
1
);
globalProperties
[
"_WpfTempProjectNuGetFilePathNoExt"
]
=
""
;
//
//
// Compile the temporary target assembly project
// Compile the temporary target assembly project
//
//
Dictionary
<
string
,
ITaskItem
[
]>
targetOutputs
=
new
Dictionary
<
string
,
ITaskItem
[
]>
();
Dictionary
<
string
,
ITaskItem
[
]>
targetOutputs
=
new
Dictionary
<
string
,
ITaskItem
[
]>
();
retValue
=
BuildEngine
.
BuildProjectFile
(
TemporaryTargetAssemblyProjectName
,
new
string
[]
{
CompileTargetName
},
globalProperties
,
targetOutputs
);
retValue
=
BuildEngine
.
BuildProjectFile
(
TemporaryTargetAssemblyProjectName
,
new
string
[]
{
CompileTargetName
},
null
,
targetOutputs
);
// If the inner build succeeds, retrieve the path to the local type assembly from the task's TargetOutputs.
// If the inner build succeeds, retrieve the path to the local type assembly from the task's TargetOutputs.
if
(
retValue
)
if
(
retValue
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录