Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Iot
提交
872a51aa
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,发现更多精彩内容 >>
提交
872a51aa
编写于
5月 10, 2019
作者:
D
dotnet-maestro[bot]
提交者:
Jose Perez Rodriguez
5月 10, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20190509.9 (#412)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19259.9
上级
c5077855
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
10 deletion
+10
-10
eng/Version.Details.xml
eng/Version.Details.xml
+2
-2
eng/common/tools.ps1
eng/common/tools.ps1
+5
-5
eng/common/tools.sh
eng/common/tools.sh
+2
-2
global.json
global.json
+1
-1
未找到文件。
eng/Version.Details.xml
浏览文件 @
872a51aa
...
...
@@ -11,9 +11,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.1925
8.5
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.1925
9.9
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
9005cee9510d23535c09bd9b6be7c426e526c06
7
</Sha>
<Sha>
155080ecb738e189db75f8f2461ebad75d955aa
7
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/common/tools.ps1
浏览文件 @
872a51aa
...
...
@@ -358,7 +358,7 @@ function InitializeBuildTool() {
ExitWithExitCode
1
}
$buildTool
=
@{
Path
=
Join
-
Path
$dotnetRoot
"dotnet.exe"
;
Command
=
"msbuild"
}
$buildTool
=
@{
Path
=
Join
-
Path
$dotnetRoot
"dotnet.exe"
;
Command
=
"msbuild"
;
Tool
=
"dotnet"
;
Framework
=
"netcoreapp2.1"
}
}
elseif
(
$msbuildEngine
-eq
"vs"
)
{
try
{
$msbuildPath
=
InitializeVisualStudioMSBuild
-install
:
$restore
...
...
@@ -367,7 +367,7 @@ function InitializeBuildTool() {
ExitWithExitCode
1
}
$buildTool
=
@{
Path
=
$msbuildPath
;
Command
=
""
}
$buildTool
=
@{
Path
=
$msbuildPath
;
Command
=
""
;
Tool
=
"vs"
;
Framework
=
"net472"
}
}
else
{
Write-Host
"Unexpected value of -msbuildEngine: '
$msbuildEngine
'."
-ForegroundColor
Red
ExitWithExitCode
1
...
...
@@ -478,11 +478,11 @@ function Stop-Processes() {
# Terminates the script if the build fails.
#
function
MSBuild
()
{
if
(
$pipelinesLog
-and
$msbuildEngine
)
{
if
(
$pipelinesLog
)
{
$buildTool
=
InitializeBuildTool
$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"
$path
=
Join-Path
$path
(
Join-Path
$buildTool
.
Framework
"Microsoft.DotNet.Arcade.Sdk.dll"
)
$args
+=
"/logger:
$path
"
}
...
...
eng/common/tools.sh
浏览文件 @
872a51aa
...
...
@@ -165,11 +165,11 @@ function InstallDotNet {
local
install_script
=
$_GetDotNetInstallScript
local
archArg
=
''
if
[[
"$#"
-ge
"3
"
]]
;
then
if
[[
-n
"
${
3
:-}
"
]]
;
then
archArg
=
"--architecture
$3
"
fi
local
runtimeArg
=
''
if
[[
"$#"
-ge
"4
"
]]
;
then
if
[[
-n
"
${
4
:-}
"
]]
;
then
runtimeArg
=
"--runtime
$4
"
fi
...
...
global.json
浏览文件 @
872a51aa
...
...
@@ -6,6 +6,6 @@
"version"
:
"2.2.203"
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.1925
8.5
"
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.1925
9.9
"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录