Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
517114f7
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,发现更多精彩内容 >>
提交
517114f7
编写于
8月 24, 2017
作者:
J
Jared Parsons
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix CoreClr Windows tests
上级
2d138a8d
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
24 addition
and
3 deletion
+24
-3
build/Targets/Packages.props
build/Targets/Packages.props
+2
-0
build/ToolsetPackages/CoreToolset.csproj
build/ToolsetPackages/CoreToolset.csproj
+10
-0
build/scripts/build-utils.ps1
build/scripts/build-utils.ps1
+2
-0
build/scripts/build.ps1
build/scripts/build.ps1
+9
-2
src/Tools/BuildBoss/ProjectCheckerUtil.cs
src/Tools/BuildBoss/ProjectCheckerUtil.cs
+1
-1
未找到文件。
build/Targets/Packages.props
浏览文件 @
517114f7
...
...
@@ -7,6 +7,7 @@
<CommandLineParserVersion>
2.0.273-beta
</CommandLineParserVersion>
<EnvDTEVersion>
8.0.1
</EnvDTEVersion>
<EnvDTE80Version>
8.0.0
</EnvDTE80Version>
<dotnetxunitVersion>
2.3.0-beta4-build3742
</dotnetxunitVersion>
<FakeSignVersion>
0.9.2
</FakeSignVersion>
<GitLinkVersion>
3.0.0
</GitLinkVersion>
<LibGit2SharpVersion>
0.22.0
</LibGit2SharpVersion>
...
...
@@ -228,6 +229,7 @@
<xunitVersion>
2.2.0
</xunitVersion>
<xunitanalyzersVersion>
0.5.0
</xunitanalyzersVersion>
<xunitassertVersion>
2.2.0
</xunitassertVersion>
<xunitextensibilityexecution>
2.2.0
</xunitextensibilityexecution>
<xunitrunnerconsoleVersion>
2.2.0
</xunitrunnerconsoleVersion>
<xunitrunnervisualstudioVersion>
2.2.0
</xunitrunnervisualstudioVersion>
<xunitrunnerwpfVersion>
1.0.41
</xunitrunnerwpfVersion>
...
...
build/ToolsetPackages/CoreToolset.csproj
0 → 100644
浏览文件 @
517114f7
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(MSBuildThisFileDirectory)..\Targets\Packages.props" />
<Import Project="$(MSBuildThisFileDirectory)..\Targets\FixedPackages.props" />
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="dotnet-xunit" Version="$(dotnetxunitVersion)" />
</ItemGroup>
</Project>
build/scripts/build-utils.ps1
浏览文件 @
517114f7
...
...
@@ -248,6 +248,7 @@ function Create-Directory([string]$dir) {
# Return the version of the NuGet package as used in this repo
function
Get-PackageVersion
([
string
]
$name
)
{
$name
=
$name
.
Replace
(
"."
,
""
)
$name
=
$name
.
Replace
(
"-"
,
""
)
$deps
=
Join-Path
$repoDir
"build\Targets\Packages.props"
$nodeName
=
"
$(
$name
)
Version"
$x
=
[
xml
](
Get-Content
-raw
$deps
)
...
...
@@ -418,6 +419,7 @@ function Restore-Packages([string]$msbuildDir = "", [string]$project = "") {
else
{
$all
=
@(
"Base Toolset:build\ToolsetPackages\BaseToolset.csproj"
,
"CoreClr Toolset:build\ToolsetPackages\CoreToolset.csproj"
,
"Roslyn:Roslyn.sln"
,
"Samples:src\Samples\Samples.sln"
,
"Templates:src\Setup\Templates\Templates.sln"
,
...
...
build/scripts/build.ps1
浏览文件 @
517114f7
...
...
@@ -292,8 +292,8 @@ function Test-XUnitCoreClr() {
$runtimeIdentifier
=
"win7-x64"
$tf
=
"netcoreapp2.0"
$logDir
=
Join-Path
$unitDir
"xUnitResults"
$logFile
=
Join-Path
$logDir
"TestResults.xml"
Create-Directory
$logDir
$xunitConsole
=
Join-Path
(
Get-PackageDir
"dotnet-xunit"
)
"tools\
$tf
\xunit.console.dll"
# A number of our tests need to be published before they can be executed in order to get some
# runtime assets.
...
...
@@ -321,9 +321,16 @@ function Test-XUnitCoreClr() {
$dllName
=
Get-ChildItem
-name
"*.UnitTests.dll"
-path
$testDir
$dllPath
=
Join-Path
$testDir
$dllName
$args
=
"exec"
$args
+=
" --depsfile "
+
[
IO.Path
]::
ChangeExtension
(
$dllPath
,
".deps.json"
)
$args
+=
" --runtimeconfig "
+
[
IO.Path
]::
ChangeExtension
(
$dllPath
,
".runtimeconfig.json"
)
$args
+=
"
$xunitConsole
"
$args
+=
"
$dllPath
"
$args
+=
" -xml "
+
(
Join-Path
$logDir
([
IO.Path
]::
ChangeExtension
(
$dllName
,
".xml"
)))
try
{
Write-Host
"Running
$dllName
"
Exec-Console
$dotnet
"vstest
$dllPath
"
Exec-Console
$dotnet
$args
}
catch
{
Write-Host
"Failed"
...
...
src/Tools/BuildBoss/ProjectCheckerUtil.cs
浏览文件 @
517114f7
...
...
@@ -217,7 +217,7 @@ private bool CheckPackageReferences(TextWriter textWriter)
var
allGood
=
true
;
foreach
(
var
packageRef
in
_projectUtil
.
GetPackageReferences
())
{
var
name
=
packageRef
.
Name
.
Replace
(
"."
,
""
);
var
name
=
packageRef
.
Name
.
Replace
(
"."
,
""
)
.
Replace
(
"-"
,
""
)
;
var
floatingName
=
$"$(
{
name
}
Version)"
;
var
fixedName
=
$"$(
{
name
}
FixedVersion)"
;
if
(
packageRef
.
Version
!=
floatingName
&&
packageRef
.
Version
!=
fixedName
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录