Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
4cb1ebc2
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,发现更多精彩内容 >>
提交
4cb1ebc2
编写于
11月 07, 2016
作者:
J
Jared Parsons
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix some portable test issues
上级
0301600e
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
40 addition
and
7 deletion
+40
-7
build/Targets/Imports.targets
build/Targets/Imports.targets
+1
-1
src/Scripting/CSharpTest/CSharpScriptingTest.csproj
src/Scripting/CSharpTest/CSharpScriptingTest.csproj
+1
-1
src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj
src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj
+1
-1
src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj
.../DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj
+9
-1
src/Tools/BuildBoss/ProjectCheckerUtil.cs
src/Tools/BuildBoss/ProjectCheckerUtil.cs
+24
-2
src/Tools/BuildBoss/RoslynProjectData.cs
src/Tools/BuildBoss/RoslynProjectData.cs
+4
-1
未找到文件。
build/Targets/Imports.targets
浏览文件 @
4cb1ebc2
...
...
@@ -13,7 +13,7 @@
<OutDir>$(OutDir)UnitTests\$(MSBuildProjectName)\</OutDir>
</PropertyGroup>
</When>
<When Condition="'$(RoslynProjectType)' == 'UnitTestPortable'">
<When Condition="'$(RoslynProjectType)' == 'UnitTestPortable'
or '$(RoslynProjectType)' == 'UnitTestDesktop'
">
<PropertyGroup>
<_CopyReferences>false</_CopyReferences>
<_CopyProjectReferences>false</_CopyProjectReferences>
...
...
src/Scripting/CSharpTest/CSharpScriptingTest.csproj
浏览文件 @
4cb1ebc2
...
...
@@ -14,7 +14,7 @@
<TargetFrameworkProfile></TargetFrameworkProfile>
<TargetFrameworkIdentifier>
.NETPortable
</TargetFrameworkIdentifier>
<ProjectTypeGuids>
{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
</ProjectTypeGuids>
<RoslynProjectType>
UnitTest
</RoslynProjectType>
<RoslynProjectType>
UnitTest
Desktop
</RoslynProjectType>
</PropertyGroup>
<ItemGroup
Label=
"Project References"
>
<ProjectReference
Include=
"..\..\Compilers\Core\Portable\CodeAnalysis.csproj"
>
...
...
src/Scripting/VisualBasicTest/BasicScriptingTest.vbproj
浏览文件 @
4cb1ebc2
...
...
@@ -11,7 +11,7 @@
<TargetFrameworkVersion>
v5.0
</TargetFrameworkVersion>
<TargetFrameworkIdentifier>
.NETPortable
</TargetFrameworkIdentifier>
<ProjectTypeGuids>
{14182A97-F7F0-4C62-8B27-98AA8AE2109A};{F184B08F-C81C-45F6-A57F-5ABD9991F28F}
</ProjectTypeGuids>
<RoslynProjectType>
UnitTest
</RoslynProjectType>
<RoslynProjectType>
UnitTest
Desktop
</RoslynProjectType>
</PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "
></PropertyGroup>
<PropertyGroup
Condition=
" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "
></PropertyGroup>
...
...
src/Test/DeployDesktopTestRuntime/DeployDesktopTestRuntime.csproj
浏览文件 @
4cb1ebc2
...
...
@@ -58,10 +58,18 @@
<Project>
{12a68549-4e8c-42d6-8703-a09335f97997}
</Project>
<Name>
Scripting
</Name>
</ProjectReference>
<ProjectReference
Include=
"..\..\Scripting\CSharpTest\CSharpScriptingTest.csproj"
>
<Project>
{2dae4406-7a89-4b5f-95c3-bc5422ce47ce}
</Project>
<Name>
CSharpScriptingTest
</Name>
</ProjectReference>
<ProjectReference
Include=
"..\..\Scripting\CSharp\CSharpScripting.csproj"
>
<Project>
{066f0dbd-c46c-4c20-afec-99829a172625}
</Project>
<Name>
CSharpScripting
</Name>
</ProjectReference>
<ProjectReference
Include=
"..\..\Scripting\VisualBasicTest\BasicScriptingTest.vbproj"
>
<Project>
{abc7262e-1053-49f3-b846-e3091bb92e8c}
</Project>
<Name>
BasicScriptingTest
</Name>
</ProjectReference>
<ProjectReference
Include=
"..\..\Scripting\VisualBasic\BasicScripting.vbproj"
>
<Project>
{3e7dea65-317b-4f43-a25d-62f18d96cfd7}
</Project>
<Name>
BasicScripting
</Name>
...
...
@@ -76,4 +84,4 @@
</ProjectReference>
</ItemGroup>
<Import
Project=
"..\..\..\build\Targets\Imports.targets"
/>
</Project>
</Project>
\ No newline at end of file
src/Tools/BuildBoss/ProjectCheckerUtil.cs
浏览文件 @
4cb1ebc2
...
...
@@ -304,7 +304,9 @@ private bool IsUnitTestCorrectlySpecified(TextWriter textWriter, RoslynProjectDa
private
bool
CheckTestDeploymentProjects
(
TextWriter
textWriter
)
{
var
fileName
=
Path
.
GetFileNameWithoutExtension
(
_data
.
FileName
);
if
(
fileName
!=
"DeployCoreClrTestRuntime"
&&
fileName
!=
"DeployDesktopTestRuntime"
)
var
isDesktop
=
fileName
==
"DeployDesktopTestRuntime"
;
var
isCoreClr
=
fileName
==
"DeployCoreClrTestRuntime"
;
if
(!
isDesktop
&&
!
isCoreClr
)
{
return
true
;
}
...
...
@@ -321,7 +323,27 @@ private bool CheckTestDeploymentProjects(TextWriter textWriter)
foreach
(
var
projectData
in
_solutionMap
.
Values
)
{
var
rosData
=
projectData
.
ProjectUtil
.
TryGetRoslynProjectData
();
if
(
rosData
?.
DeclaredKind
==
RoslynProjectKind
.
UnitTestPortable
&&
!
set
.
Contains
(
projectData
.
Key
))
if
(
rosData
==
null
)
{
continue
;
}
var
kind
=
rosData
.
Value
.
DeclaredKind
;
bool
include
;
switch
(
kind
)
{
case
RoslynProjectKind
.
UnitTestPortable
:
include
=
true
;
break
;
case
RoslynProjectKind
.
UnitTestDesktop
:
include
=
isDesktop
;
break
;
default
:
include
=
false
;
break
;
}
if
(
include
&&
!
set
.
Contains
(
projectData
.
Key
))
{
textWriter
.
WriteLine
(
$"Portable unit test
{
projectData
.
FileName
}
must be referenced"
);
allGood
=
false
;
...
...
src/Tools/BuildBoss/RoslynProjectData.cs
浏览文件 @
4cb1ebc2
...
...
@@ -13,7 +13,7 @@ internal enum RoslynProjectKind
Exe
,
ExeCoreClr
,
UnitTest
,
UnitTest
Next
,
UnitTest
Desktop
,
UnitTestPortable
,
CompilerGeneratorTool
,
DeploymentCompilerGeneratorTools
,
...
...
@@ -38,6 +38,8 @@ internal static class RoslynProjectKindUtil
return
RoslynProjectKind
.
Exe
;
case
"UnitTestPortable"
:
return
RoslynProjectKind
.
UnitTestPortable
;
case
"UnitTestDesktop"
:
return
RoslynProjectKind
.
UnitTestDesktop
;
case
"UnitTest"
:
return
RoslynProjectKind
.
UnitTest
;
case
"CompilerGeneratorTool"
:
...
...
@@ -63,6 +65,7 @@ internal static bool IsAnyUnitTest(RoslynProjectKind kind)
{
return
kind
==
RoslynProjectKind
.
UnitTest
||
kind
==
RoslynProjectKind
.
UnitTestDesktop
||
kind
==
RoslynProjectKind
.
UnitTestPortable
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录