Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
fsharp
提交
b9e4b07f
F
fsharp
项目概览
dotNET Platform
/
fsharp
12 个月 前同步成功
通知
0
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
F
fsharp
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
b9e4b07f
编写于
9月 13, 2019
作者:
D
dotnet-maestro[bot]
提交者:
GitHub
9月 13, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20190912.5 (#7555)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19462.5
上级
3ce13ed4
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
39 addition
and
7 deletion
+39
-7
eng/Version.Details.xml
eng/Version.Details.xml
+2
-2
eng/common/templates/post-build/channels/netcore-internal-30.yml
...mon/templates/post-build/channels/netcore-internal-30.yml
+3
-3
eng/common/tools.ps1
eng/common/tools.ps1
+17
-1
eng/common/tools.sh
eng/common/tools.sh
+16
-0
global.json
global.json
+1
-1
未找到文件。
eng/Version.Details.xml
浏览文件 @
b9e4b07f
...
...
@@ -3,9 +3,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.1946
1.7
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"1.0.0-beta.1946
2.5
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba
</Sha>
<Sha>
6003ee189f456c92a18b097f226d4927309def27
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/common/templates/post-build/channels/netcore-internal-30.yml
浏览文件 @
b9e4b07f
...
...
@@ -107,9 +107,9 @@ stages:
/p:Configuration=Release
/p:PublishInstallersAndChecksums=true
/p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
/p:Checksums
TargetStaticFeed
Key=$(InternalChecksumsBlobFeedKey)
/p:Checksums
AzureAccount
Key=$(InternalChecksumsBlobFeedKey)
/p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
/p:Installers
TargetStaticFeed
Key=$(InternalInstallersBlobFeedKey)
/p:Installers
AzureAccount
Key=$(InternalInstallersBlobFeedKey)
/p:PublishToAzureDevOpsNuGetFeeds=true
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
...
...
@@ -121,4 +121,4 @@ stages:
-
template
:
../../steps/promote-build.yml
parameters
:
ChannelId
:
${{ variables.InternalServicing_30_Channel_Id }}
\ No newline at end of file
ChannelId
:
${{ variables.InternalServicing_30_Channel_Id }}
eng/common/tools.ps1
浏览文件 @
b9e4b07f
...
...
@@ -153,6 +153,16 @@ function InitializeDotNetCli([bool]$install) {
# Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build
Write-PipelinePrependPath
-Path
$dotnetRoot
# Work around issues with Azure Artifacts credential provider
# https://github.com/dotnet/arcade/issues/3932
if
(
$ci
)
{
$
env
:
NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS
=
20
$
env
:
NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS
=
20
Write-PipelineSetVariable
-Name
'NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS'
-Value
'20'
Write-PipelineSetVariable
-Name
'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS'
-Value
'20'
}
Write-PipelineSetVariable
-Name
'DOTNET_MULTILEVEL_LOOKUP'
-Value
'0'
Write-PipelineSetVariable
-Name
'DOTNET_SKIP_FIRST_TIME_EXPERIENCE'
-Value
'1'
...
...
@@ -365,7 +375,6 @@ function InitializeBuildTool() {
Write-PipelineTelemetryError
-Category
"InitializeToolset"
-Message
"/global.json must specify 'tools.dotnet'."
ExitWithExitCode
1
}
$buildTool
=
@{
Path
=
Join
-
Path
$dotnetRoot
"dotnet.exe"
;
Command
=
"msbuild"
;
Tool
=
"dotnet"
;
Framework
=
"netcoreapp2.1"
}
}
elseif
(
$msbuildEngine
-eq
"vs"
)
{
try
{
...
...
@@ -490,6 +499,13 @@ function Stop-Processes() {
function
MSBuild
()
{
if
(
$pipelinesLog
)
{
$buildTool
=
InitializeBuildTool
# Work around issues with Azure Artifacts credential provider
# https://github.com/dotnet/arcade/issues/3932
if
(
$ci
-and
$buildTool
.
Tool
-eq
"dotnet"
)
{
dotnet
nuget
locals
http-cache
-c
}
$toolsetBuildProject
=
InitializeToolset
$path
=
Split-Path
-parent
$toolsetBuildProject
$path
=
Join-Path
$path
(
Join-Path
$buildTool
.
Framework
"Microsoft.DotNet.Arcade.Sdk.dll"
)
...
...
eng/common/tools.sh
浏览文件 @
b9e4b07f
...
...
@@ -152,6 +152,15 @@ function InitializeDotNetCli {
# build steps from using anything other than what we've downloaded.
Write-PipelinePrependPath
-path
"
$dotnet_root
"
# Work around issues with Azure Artifacts credential provider
# https://github.com/dotnet/arcade/issues/3932
if
[[
"
$ci
"
==
true
]]
;
then
export
NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS
=
20
export
NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS
=
20
Write-PipelineSetVariable
-name
"NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS"
-value
"20"
Write-PipelineSetVariable
-name
"NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS"
-value
"20"
fi
Write-PipelineSetVariable
-name
"DOTNET_MULTILEVEL_LOOKUP"
-value
"0"
Write-PipelineSetVariable
-name
"DOTNET_SKIP_FIRST_TIME_EXPERIENCE"
-value
"1"
...
...
@@ -328,6 +337,13 @@ function MSBuild {
if
[[
"
$pipelines_log
"
==
true
]]
;
then
InitializeBuildTool
InitializeToolset
# Work around issues with Azure Artifacts credential provider
# https://github.com/dotnet/arcade/issues/3932
if
[[
"
$ci
"
==
true
]]
;
then
dotnet nuget locals http-cache
-c
fi
local
toolset_dir
=
"
${
_InitializeToolset
%/*
}
"
local
logger_path
=
"
$toolset_dir
/
$_InitializeBuildToolFramework
/Microsoft.DotNet.Arcade.Sdk.dll"
args
=(
"
${
args
[@]
}
"
"-logger:
$logger_path
"
)
...
...
global.json
浏览文件 @
b9e4b07f
...
...
@@ -10,7 +10,7 @@
}
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.1946
1.7
"
,
"Microsoft.DotNet.Arcade.Sdk"
:
"1.0.0-beta.1946
2.5
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"2.0.0-beta.19069.2"
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录