Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jobily
Iot
提交
c216dc28
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,发现更多精彩内容 >>
提交
c216dc28
编写于
5月 02, 2019
作者:
D
dotnet-maestro[bot]
提交者:
Jose Perez Rodriguez
5月 02, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20190501.6 (#397)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19251.6
上级
db394970
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
44 addition
and
14 deletion
+44
-14
eng/Version.Details.xml
eng/Version.Details.xml
+2
-2
eng/common/build.ps1
eng/common/build.ps1
+4
-0
eng/common/build.sh
eng/common/build.sh
+4
-0
eng/common/init-tools-native.ps1
eng/common/init-tools-native.ps1
+5
-1
eng/common/init-tools-native.sh
eng/common/init-tools-native.sh
+4
-8
eng/common/tools.ps1
eng/common/tools.ps1
+10
-0
eng/common/tools.sh
eng/common/tools.sh
+12
-0
global.json
global.json
+3
-3
未找到文件。
eng/Version.Details.xml
浏览文件 @
c216dc28
...
...
@@ -11,9 +11,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.192
30
.6"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.192
51
.6"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
ac8d88df02d246d3147338fcfb03b1b93dc84b53
</Sha>
<Sha>
ea9b2530a1559dd6426730aba52fca1924db2b65
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/common/build.ps1
浏览文件 @
c216dc28
...
...
@@ -122,6 +122,10 @@ try {
.
$configureToolsetScript
}
if
(
$restore
)
{
InitializeNativeTools
}
Build
}
catch
{
...
...
eng/common/build.sh
浏览文件 @
c216dc28
...
...
@@ -218,4 +218,8 @@ if [[ -n "${useInstalledDotNetCli:-}" ]]; then
use_installed_dotnet_cli
=
"
$useInstalledDotNetCli
"
fi
if
[[
"
$restore
"
==
true
]]
;
then
InitializeNativeTools
fi
Build
eng/common/init-tools-native.ps1
浏览文件 @
c216dc28
...
...
@@ -41,9 +41,13 @@ Param (
[
switch
]
$Force
=
$False
,
[
int
]
$DownloadRetries
=
5
,
[
int
]
$RetryWaitTimeInSeconds
=
30
,
[
string
]
$GlobalJsonFile
=
"
$PSScriptRoot
\..\..\global.json"
[
string
]
$GlobalJsonFile
)
if
(
!
$GlobalJsonFile
)
{
$GlobalJsonFile
=
Join-Path
(
Get-Item
$PSScriptRoot
)
.
Parent
.
Parent
.
FullName
"global.json"
}
Set-StrictMode
-version
2.0
$Error
ActionPreference
=
"Stop"
...
...
eng/common/init-tools-native.sh
浏览文件 @
c216dc28
...
...
@@ -9,7 +9,7 @@ clean=false
force
=
false
download_retries
=
5
retry_wait_time_seconds
=
30
global_json_file
=
"
$
{
scriptroot
}
/../..
/global.json"
global_json_file
=
"
$
(
dirname
"
$(
dirname
"
${
scriptroot
}
"
)
"
)
/global.json"
declare
-A
native_assets
.
$scriptroot
/native/common-library.sh
...
...
@@ -71,6 +71,7 @@ function ReadGlobalJsonNativeTools {
local
native_tools_list
=
$(
echo
$native_tools_section
|
awk
-F
"[{}]"
'{print $2}'
)
native_tools_list
=
${
native_tools_list
//[\
" ]/}
native_tools_list=
${
native_tools_list
//,/
$'
\n
'
}
native_tools_list="
$(
echo
-e
"
${
native_tools_list
}
"
|
tr
-d
'[:space:]'
)
"
local old_IFS=
$IFS
while read -r line; do
...
...
@@ -116,8 +117,6 @@ else
installer_command+="
--clean
"
fi
echo "
Installing
$tool
version
$tool_version
"
echo "
Executing
'$installer_command'
"
$installer_command
if [[
$?
!= 0 ]]; then
...
...
@@ -127,19 +126,16 @@ else
done
fi
if [[
! -z
$clean
]]; then
if [[
$clean
= true
]]; then
exit 0
fi
if [[ -d
$install_bin
]]; then
echo "
Native
tools are available from
$install_bin
"
if [[ !-z BUILD_BUILDNUMBER ]]; then
echo "
##vso[task.prependpath]
$install_bin
"
fi
echo "
##vso[task.prependpath]
$install_bin
"
else
echo "
Native
tools install directory does not exist, installation failed
" >&2
exit 1
fi
exit 0
eng/common/tools.ps1
浏览文件 @
c216dc28
...
...
@@ -391,6 +391,16 @@ function GetSdkTaskProject([string]$taskName) {
return
Join-Path
(
Split-Path
(
InitializeToolset
)
-Parent
)
"SdkTasks\
$taskName
.proj"
}
function
InitializeNativeTools
()
{
if
(
Get-Member
-InputObject
$GlobalJson
-Name
"native-tools"
)
{
$nativeArgs
=
""
if
(
$ci
)
{
$nativeArgs
=
"-InstallDirectory
$ToolsDir
"
}
Invoke-Expression
"&
`"
$PSScriptRoot
/init-tools-native.ps1
`"
$nativeArgs
"
}
}
function
InitializeToolset
()
{
if
(
Test-Path
variable:global:_ToolsetBuildProj
)
{
return
$
global
:
_ToolsetBuildProj
...
...
eng/common/tools.sh
浏览文件 @
c216dc28
...
...
@@ -212,6 +212,17 @@ function GetNuGetPackageCachePath {
_GetNuGetPackageCachePath
=
$NUGET_PACKAGES
}
function
InitializeNativeTools
()
{
if
grep
-Fq
"native-tools"
$global_json_file
then
local
nativeArgs
=
""
if
[[
"
$ci
"
==
true
]]
;
then
nativeArgs
=
"-InstallDirectory
$tools_dir
"
fi
"
$_script_dir
/init-tools-native.sh"
$nativeArgs
fi
}
function
InitializeToolset
{
if
[[
-n
"
${
_InitializeToolset
:-}
"
]]
;
then
return
...
...
@@ -307,6 +318,7 @@ eng_root=`cd -P "$_script_dir/.." && pwd`
repo_root
=
`
cd
-P
"
$_script_dir
/../.."
&&
pwd
`
artifacts_dir
=
"
$repo_root
/artifacts"
toolset_dir
=
"
$artifacts_dir
/toolset"
tools_dir
=
"
$repo_root
/.tools"
log_dir
=
"
$artifacts_dir
/log/
$configuration
"
temp_dir
=
"
$artifacts_dir
/tmp/
$configuration
"
...
...
global.json
浏览文件 @
c216dc28
{
"tools"
:
{
"dotnet"
:
"2.
1.5
03"
"dotnet"
:
"2.
2.2
03"
},
"sdk"
:
{
"version"
:
"2.
1.5
03"
"version"
:
"2.
2.2
03"
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.192
30
.6"
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.192
51
.6"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录