Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
6211e10f
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
6211e10f
编写于
4月 23, 2018
作者:
T
Tomáš Matoušek
提交者:
GitHub
4月 23, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix path to Microsoft.Build.Tasks.CodeAnalysis.dll in Microsoft.Managed.Core.targets (#26298)
上级
9e2a3769
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
12 addition
and
5 deletion
+12
-5
src/Compilers/Core/MSBuildTask/Microsoft.Managed.Core.targets
...Compilers/Core/MSBuildTask/Microsoft.Managed.Core.targets
+1
-1
src/Compilers/Core/MSBuildTaskTests/TestUtilities/DotNetSdkTestBase.cs
.../Core/MSBuildTaskTests/TestUtilities/DotNetSdkTestBase.cs
+11
-4
未找到文件。
src/Compilers/Core/MSBuildTask/Microsoft.Managed.Core.targets
浏览文件 @
6211e10f
...
...
@@ -4,7 +4,7 @@
<!--
Common targets for managed compilers.
-->
<UsingTask
TaskName=
"Microsoft.CodeAnalysis.BuildTasks.MapSourceRoots"
AssemblyFile=
"$(
RoslynTargetsPath)\Microsoft.Build.Tasks.CodeAnalysis.dll"
Condition=
"'$(MSBuildAssemblyVersion)' != ''
"
/>
<UsingTask
TaskName=
"Microsoft.CodeAnalysis.BuildTasks.MapSourceRoots"
AssemblyFile=
"$(
MSBuildThisFileDirectory)Microsoft.Build.Tasks.CodeAnalysis.dll
"
/>
<Target
Name=
"ShimReferencePathsWhenCommonTargetsDoesNotUnderstandReferenceAssemblies"
BeforeTargets=
"CoreCompile"
...
...
src/Compilers/Core/MSBuildTaskTests/TestUtilities/DotNetSdkTestBase.cs
浏览文件 @
6211e10f
...
...
@@ -153,12 +153,16 @@ public DotNetSdkTestBase()
ProjectDir
.
CreateFile
(
"Directory.Build.targets"
).
WriteAllText
(
"<Project/>"
);
ProjectDir
.
CreateFile
(
".editorconfig"
).
WriteAllText
(
"root = true"
);
Assert
.
True
(
File
.
Exists
(
Path
.
Combine
(
testBinDirectory
,
"Microsoft.CSharp.Core.targets"
)));
Assert
.
True
(
File
.
Exists
(
Path
.
Combine
(
testBinDirectory
,
"Microsoft.VisualBasic.Core.targets"
)));
var
csharpCoreTargets
=
Path
.
Combine
(
testBinDirectory
,
"Microsoft.CSharp.Core.targets"
);
var
visualBasicCoreTargets
=
Path
.
Combine
(
testBinDirectory
,
"Microsoft.VisualBasic.Core.targets"
);
Assert
.
True
(
File
.
Exists
(
csharpCoreTargets
));
Assert
.
True
(
File
.
Exists
(
visualBasicCoreTargets
));
EnvironmentVariables
=
new
Dictionary
<
string
,
string
>()
{
{
"RoslynTargetsPath"
,
testBinDirectory
},
{
"CSharpCoreTargetsPath"
,
csharpCoreTargets
},
{
"VisualBasicCoreTargetsPath"
,
visualBasicCoreTargets
},
{
"MSBuildSDKsPath"
,
sdksDir
},
{
"DOTNET_MSBUILD_SDK_RESOLVER_SDKS_DIR"
,
sdksDir
}
};
...
...
@@ -185,7 +189,10 @@ protected void VerifyValues(string props, string[] targets, string[] expressions
var
testBinDirectory
=
Path
.
GetDirectoryName
(
typeof
(
DotNetSdkTests
).
Assembly
.
Location
);
var
binLog
=
Path
.
Combine
(
ProjectDir
.
Path
,
$"build
{
_logIndex
++}
.binlog"
);
var
buildResult
=
ProcessUtilities
.
Run
(
DotNetPath
,
$@"msbuild ""
{
Project
.
Path
}
"" /t:
{
targetsArg
}
/p:Configuration=
{
Configuration
}
/p:RoslynTargetsPath=""
{
testBinDirectory
}
"" /bl:""
{
binLog
}
"""
,
// RoslynTargetsPath is a path to the built-in Roslyn compilers in the .NET SDK.
// For testing we are using compilers from custom location (this emulates usage of Microsoft.Net.Compilers package.
// The core targets should be imported from CSharpCoreTargetsPath and VisualBasicCoreTargetsPath and the compiler tasks from the same location.
var
buildResult
=
ProcessUtilities
.
Run
(
DotNetPath
,
$@"msbuild ""
{
Project
.
Path
}
"" /t:
{
targetsArg
}
/p:RoslynTargetsPath=""<nonexistent directory>"" /p:Configuration=
{
Configuration
}
/bl:""
{
binLog
}
"""
,
additionalEnvironmentVars
:
EnvironmentVariables
);
Assert
.
True
(
buildResult
.
ExitCode
==
0
,
$"Failed with exit code
{
buildResult
.
ExitCode
}
:
{
buildResult
.
Output
}
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录