Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
8aa833e7
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,发现更多精彩内容 >>
提交
8aa833e7
编写于
7月 26, 2019
作者:
D
dotnet-maestro
提交者:
Andy Gocke
7月 30, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20190725.15
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19375.15
上级
e05a2340
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
39 addition
and
10 deletion
+39
-10
eng/Version.Details.xml
eng/Version.Details.xml
+2
-2
eng/common/init-tools-native.ps1
eng/common/init-tools-native.ps1
+1
-1
eng/common/native/CommonLibrary.psm1
eng/common/native/CommonLibrary.psm1
+31
-2
eng/common/templates/post-build/channels/public-dev-release.yml
...mmon/templates/post-build/channels/public-dev-release.yml
+1
-1
eng/common/templates/post-build/channels/public-validation-release.yml
...mplates/post-build/channels/public-validation-release.yml
+1
-1
eng/common/tools.sh
eng/common/tools.sh
+2
-2
global.json
global.json
+1
-1
未找到文件。
eng/Version.Details.xml
浏览文件 @
8aa833e7
...
...
@@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.19375.
2
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.19375.
15
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
3dfa62fddcde597959c323d17426f215384e773a
</Sha>
<Sha>
ef1c110152df0d500fffb87878a86f88d1ca5295
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/common/init-tools-native.ps1
浏览文件 @
8aa833e7
...
...
@@ -98,7 +98,7 @@ try {
}
Write-Verbose
"Installing
$ToolName
version
$ToolVersion
"
Write-Verbose
"Executing '
$InstallerPath
$
LocalInstallerArguments
'"
Write-Verbose
"Executing '
$InstallerPath
$
(
$LocalInstallerArguments
.
Keys
.
ForEach
({
"-
$_
'
$(
$LocalInstallerArguments
.
$_
)
'"
}
)
-join ' ')
'"
&
$InstallerPath
@
LocalInstallerArguments
if
(
$LASTEXITCODE
-Ne
"0"
)
{
$errMsg
=
"
$ToolName
installation failed"
...
...
eng/common/native/CommonLibrary.psm1
浏览文件 @
8aa833e7
...
...
@@ -59,9 +59,38 @@ function DownloadAndExtract {
-Verbose
:
$Verbose
if
(
$UnzipStatus
-Eq
$False
)
{
Write-Error
"Unzip failed"
return
$False
# Retry Download one more time with Force=true
$DownloadRetryStatus
=
CommonLibrary\Get-File
-Uri
$Uri
`
-Path
$TempToolPath
`
-DownloadRetries
1
`
-RetryWaitTimeInSeconds
$RetryWaitTimeInSeconds
`
-Force
:
$True
`
-Verbose
:
$Verbose
if
(
$DownloadRetryStatus
-Eq
$False
)
{
Write-Error
"Last attempt of download failed as well"
return
$False
}
# Retry unzip again one more time with Force=true
$UnzipRetryStatus
=
CommonLibrary\Expand-Zip
-ZipPath
$TempToolPath
`
-OutputDirectory
$InstallDirectory
`
-Force
:
$True
`
-Verbose
:
$Verbose
if
(
$UnzipRetryStatus
-Eq
$False
)
{
Write-Error
"Last attempt of unzip failed as well"
# Clean up partial zips and extracts
if
(
Test-Path
$TempToolPath
)
{
Remove-Item
$TempToolPath
-Force
}
if
(
Test-Path
$InstallDirectory
)
{
Remove-Item
$InstallDirectory
-Force
-Recurse
}
return
$False
}
}
return
$True
}
...
...
eng/common/templates/post-build/channels/public-dev-release.yml
浏览文件 @
8aa833e7
...
...
@@ -77,7 +77,7 @@ stages:
filePath
:
eng\common\sdk-task.ps1
arguments
:
-task PublishArtifactsInManifest -restore -msbuildEngine dotnet
/p:ChannelId=$(PublicDevRelease_30_Channel_Id)
/p:ArtifactsCategory=
.NetCore
/p:ArtifactsCategory=
$(_DotNetArtifactsCategory)
/p:IsStableBuild=$(IsStableBuild)
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
...
...
eng/common/templates/post-build/channels/public-validation-release.yml
浏览文件 @
8aa833e7
...
...
@@ -48,7 +48,7 @@ stages:
filePath
:
eng\common\sdk-task.ps1
arguments
:
-task PublishArtifactsInManifest -restore -msbuildEngine dotnet
/p:ChannelId=$(PublicValidationRelease_30_Channel_Id)
/p:ArtifactsCategory=
.NetCoreValidation
/p:ArtifactsCategory=
$(_DotNetArtifactsCategory)
/p:IsStableBuild=$(IsStableBuild)
/p:IsInternalBuild=$(IsInternalBuild)
/p:RepositoryName=$(Build.Repository.Name)
...
...
eng/common/tools.sh
浏览文件 @
8aa833e7
...
...
@@ -77,7 +77,7 @@ function ReadGlobalVersion {
local
pattern
=
"
\"
$key
\"
*: *
\"
(.*)
\"
"
if
[[
!
$line
=
~
$pattern
]]
;
then
Write-PipelineTelemetryError
-category
'InitializeTools'
"Error: Cannot find
\"
$key
\"
in
$global_json_file
"
Write-PipelineTelemetryError
-category
'InitializeTools
et
'
"Error: Cannot find
\"
$key
\"
in
$global_json_file
"
ExitWithExitCode 1
fi
...
...
@@ -245,7 +245,7 @@ function InitializeNativeTools() {
then
local
nativeArgs
=
""
if
[[
"
$ci
"
==
true
]]
;
then
nativeArgs
=
"-
I
nstallDirectory
$tools_dir
"
nativeArgs
=
"-
-i
nstallDirectory
$tools_dir
"
fi
"
$_script_dir
/init-tools-native.sh"
$nativeArgs
fi
...
...
global.json
浏览文件 @
8aa833e7
...
...
@@ -7,6 +7,6 @@
"xcopy-msbuild"
:
"16.0.0-alpha"
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.19375.
2
"
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.19375.
15
"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录