Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
878f0751
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,发现更多精彩内容 >>
未验证
提交
878f0751
编写于
3月 20, 2018
作者:
J
Jared Parsons
浏览文件
操作
浏览文件
下载
差异文件
Merge remote-tracking branch 'dotnet/dev15.6.x' into fix-merge
上级
1419a343
635fdb86
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
13 deletion
+11
-13
build/scripts/build.ps1
build/scripts/build.ps1
+11
-13
未找到文件。
build/scripts/build.ps1
浏览文件 @
878f0751
...
...
@@ -146,9 +146,7 @@ function Run-MSBuild([string]$projectFilePath, [string]$buildArgs = "", [string]
$logFileName
=
[
IO.Path
]::
GetFileNameWithoutExtension
(
$projectFilePath
)
}
$logFileName
=
[
IO.Path
]::
ChangeExtension
(
$logFileName
,
".binlog"
)
$logDir
=
Join-Path
$binariesDir
"Logs"
Create-Directory
$logDir
$logFilePath
=
Join-Path
$logDir
$logFileName
$logFilePath
=
Join-Path
$logsDir
$logFileName
$args
+=
" /bl:
$logFilePath
"
}
...
...
@@ -191,12 +189,10 @@ function Make-BootstrapBuild() {
Create-Directory
$dir
if
(
$buildCoreClr
)
{
$bootstrapFramework
=
"netcoreapp2.0"
$logDir
=
Join-Path
$binariesDir
"Logs"
Create-Directory
$logDir
Exec-Console
"dotnet"
"publish --no-restore src/Compilers/CSharp/csc -o
`"
$dir
/bincore
`"
--framework
$bootstrapFramework
$bootstrapArgs
-bl:
$logDir
/BootstrapCsc.binlog"
Exec-Console
"dotnet"
"publish --no-restore src/Compilers/VisualBasic/vbc -o
`"
$dir
/bincore
`"
--framework
$bootstrapFramework
$bootstrapArgs
-bl:
$logDir
/BootstrapVbc.binlog"
Exec-Console
"dotnet"
"publish --no-restore src/Compilers/Server/VBCSCompiler -o
`"
$dir
/bincore
`"
--framework
$bootstrapFramework
$bootstrapArgs
-bl:
$logDir
/BootstrapVBCSCompiler.binlog"
Exec-Console
"dotnet"
"publish --no-restore src/Compilers/Core/MSBuildTask -o
`"
$dir
`"
--framework
$bootstrapFramework
$bootstrapArgs
-bl:
$binariesDir
/BootstrapMSBuildTask.binlog"
Exec-Console
"dotnet"
"publish --no-restore src/Compilers/CSharp/csc -o
`"
$dir
/bincore
`"
--framework
$bootstrapFramework
$bootstrapArgs
-bl:
$logsDir
/BootstrapCsc.binlog"
Exec-Console
"dotnet"
"publish --no-restore src/Compilers/VisualBasic/vbc -o
`"
$dir
/bincore
`"
--framework
$bootstrapFramework
$bootstrapArgs
-bl:
$logsDir
/BootstrapVbc.binlog"
Exec-Console
"dotnet"
"publish --no-restore src/Compilers/Server/VBCSCompiler -o
`"
$dir
/bincore
`"
--framework
$bootstrapFramework
$bootstrapArgs
-bl:
$logsDir
/BootstrapVBCSCompiler.binlog"
Exec-Console
"dotnet"
"publish --no-restore src/Compilers/Core/MSBuildTask -o
`"
$dir
`"
--framework
$bootstrapFramework
$bootstrapArgs
-bl:
$logsDir
/BootstrapMSBuildTask.binlog"
Stop-BuildProcesses
}
else
{
...
...
@@ -397,8 +393,8 @@ function Test-XUnitCoreClr() {
$unitDir
= Join-Path
$configDir
"
UnitTests
"
$tf
= "
netcoreapp2.0
"
$
log
Dir
= Join-Path
$unitDir
"
xUnitResults
"
Create-Directory
$
log
Dir
$
xunitResult
Dir
= Join-Path
$unitDir
"
xUnitResults
"
Create-Directory
$
xunitResult
Dir
$xunitConsole
= Join-Path (Get-PackageDir "
xunit.runner.console
") "
tools\
$tf
\xunit.console.dll
"
$dlls
= @()
...
...
@@ -414,7 +410,7 @@ function Test-XUnitCoreClr() {
$args
+= "
--runtimeconfig
" + [IO.Path]::ChangeExtension(
$dllPath
, "
.
runtimeconfig
.
json
")
$args
+= "
$xunitConsole
"
$args
+= "
$dllPath
"
$args
+= "
-xml
" + (Join-Path
$
log
Dir
([IO.Path]::ChangeExtension(
$dllName
, "
.
xml
")))
$args
+= "
-xml
" + (Join-Path
$
xunitResult
Dir
([IO.Path]::ChangeExtension(
$dllName
, "
.
xml
")))
# https://github.com/dotnet/roslyn/issues/25049
# Disable parallel runs everywhere until we get assembly specific settings working again
...
...
@@ -448,7 +444,7 @@ function Test-XUnit() {
Deploy-VsixViaTool
}
$logFilePath
= Join-Path
$
config
Dir
"
runtests.log
"
$logFilePath
= Join-Path
$
logs
Dir
"
runtests.log
"
$unitDir
= Join-Path
$configDir
"
UnitTests
"
$runTests
= Join-Path
$configDir
"
Exes\RunTests\RunTests.exe
"
$xunitDir
= Join-Path (Get-PackageDir "
xunit.runner.console
") "
tools\net452
"
...
...
@@ -649,11 +645,13 @@ try {
$dotnet
=
Ensure-DotnetSdk
$buildConfiguration
=
if
(
$release
)
{
"Release"
}
else
{
"Debug"
}
$configDir
=
Join-Path
$binariesDir
$buildConfiguration
$logsDir
=
Join-Path
$configDir
"Logs"
$bootstrapDir
=
""
# Ensure the main output directories exist as a number of tools will fail when they don't exist.
Create-Directory
$binariesDir
Create-Directory
$configDir
Create-Directory
$logsDir
if
(
$cibuild
)
{
List-VSProcesses
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录