Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Iot
提交
b770dc37
I
Iot
项目概览
jobily
/
Iot
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
Iot
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b770dc37
编写于
5月 09, 2019
作者:
D
dotnet-maestro[bot]
提交者:
Jose Perez Rodriguez
5月 09, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20190508.5 (#411)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19258.5
上级
733296b6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
5 deletion
+28
-5
eng/Version.Details.xml
eng/Version.Details.xml
+2
-2
eng/common/tools.ps1
eng/common/tools.ps1
+25
-2
global.json
global.json
+1
-1
未找到文件。
eng/Version.Details.xml
浏览文件 @
b770dc37
...
...
@@ -11,9 +11,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.1925
7.7
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.1925
8.5
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
bda52d7619f9420de46f2c39ffc972864bbcab63
</Sha>
<Sha>
9005cee9510d23535c09bd9b6be7c426e526c067
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/common/tools.ps1
浏览文件 @
b770dc37
...
...
@@ -11,6 +11,12 @@
# Binary log must be enabled on CI.
[
bool
]
$binaryLog
=
if
(
Test-Path
variable:binaryLog
)
{
$binaryLog
}
else
{
$ci
}
# Set to true to use the pipelines logger which will enable Azure logging output.
# https://github.com/Microsoft/azure-pipelines-tasks/blob/master/docs/authoring/commands.md
# This flag is meant as a temporary opt-opt for the feature while validate it across
# our consumers. It will be deleted in the future.
[
bool
]
$pipelinesLog
=
if
(
Test-Path
variable:pipelinesLog
)
{
$pipelinesLog
}
else
{
$ci
}
# Turns on machine preparation/clean up code that changes the machine state (e.g. kills build processes).
[
bool
]
$prepareMachine
=
if
(
Test-Path
variable:prepareMachine
)
{
$prepareMachine
}
else
{
$false
}
...
...
@@ -442,7 +448,7 @@ function InitializeToolset() {
'<Project Sdk="Microsoft.DotNet.Arcade.Sdk"/>'
|
Set-Content
$proj
MSBuild
$proj
$bl
/t:__WriteToolsetLocation
/clp:ErrorsOnly
`;
NoSummary
/p:__ToolsetLocationOutputFile
=
$toolsetLocationFile
MSBuild
-Core
$proj
$bl
/t:__WriteToolsetLocation
/clp:ErrorsOnly
`;
NoSummary
/p:__ToolsetLocationOutputFile
=
$toolsetLocationFile
$path
=
Get-Content
$toolsetLocationFile
-TotalCount
1
if
(
!
(
Test-Path
$path
))
{
...
...
@@ -472,6 +478,23 @@ function Stop-Processes() {
# Terminates the script if the build fails.
#
function
MSBuild
()
{
if
(
$pipelinesLog
-and
$msbuildEngine
)
{
$toolsetBuildProject
=
InitializeToolset
$tf
=
if
(
$msbuildEngine
-eq
"dotnet"
)
{
"netcoreapp2.1"
}
else
{
"net472"
}
$path
=
Split-Path
-parent
$toolsetBuildProject
$path
=
Join-Path
$path
"
$tf
\Microsoft.DotNet.Arcade.Sdk.dll"
$args
+=
"/logger:
$path
"
}
MSBuild-Core
@
args
}
#
# Executes msbuild (or 'dotnet msbuild') with arguments passed to the function.
# The arguments are automatically quoted.
# Terminates the script if the build fails.
#
function
MSBuild-Core
()
{
if
(
$ci
)
{
if
(
!
$binaryLog
)
{
throw
"Binary log must be enabled in CI build."
...
...
@@ -549,4 +572,4 @@ if ($ci) {
$
env
:
TEMP
=
$TempDir
$
env
:
TMP
=
$TempDir
}
\ No newline at end of file
}
global.json
浏览文件 @
b770dc37
...
...
@@ -6,6 +6,6 @@
"version"
:
"2.2.203"
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.1925
7.7
"
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.1925
8.5
"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录