Update dependencies from https://github.com/dotnet/arcade build 20200827.5 (#8344)
[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Build.Tasks.Installers: from 5.0.0-beta.20426.6 to 5.0.0-beta.20427.5 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20426.6 to 5.0.0-beta.20427.5
This commit is contained in:
parent
760cb42918
commit
6b9318285e
6 changed files with 24 additions and 15 deletions
|
@ -98,13 +98,13 @@
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20426.6">
|
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20427.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1d0daed1e3abd70fba67840b1e1cc60ce0c97b1e</Sha>
|
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20426.6">
|
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20427.5">
|
||||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||||
<Sha>1d0daed1e3abd70fba67840b1e1cc60ce0c97b1e</Sha>
|
<Sha>f2b7fe854a0b1f78c04dfc065164d6d61040f5b8</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ToolsetDependencies>
|
</ToolsetDependencies>
|
||||||
</Dependencies>
|
</Dependencies>
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20426.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20427.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||||
|
|
|
@ -56,6 +56,7 @@ parameters:
|
||||||
NetEngServicesProdChannelId: 679
|
NetEngServicesProdChannelId: 679
|
||||||
Net5Preview8ChannelId: 1155
|
Net5Preview8ChannelId: 1155
|
||||||
Net5RC1ChannelId: 1157
|
Net5RC1ChannelId: 1157
|
||||||
|
Net5RC2ChannelId: 1329
|
||||||
NetCoreSDK313xxChannelId: 759
|
NetCoreSDK313xxChannelId: 759
|
||||||
NetCoreSDK313xxInternalChannelId: 760
|
NetCoreSDK313xxInternalChannelId: 760
|
||||||
NetCoreSDK314xxChannelId: 921
|
NetCoreSDK314xxChannelId: 921
|
||||||
|
@ -91,7 +92,7 @@ stages:
|
||||||
inputs:
|
inputs:
|
||||||
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
|
filePath: $(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
|
||||||
arguments: -PromoteToChannels "$(TargetChannels)"
|
arguments: -PromoteToChannels "$(TargetChannels)"
|
||||||
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
|
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.NetDev6ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview8ChannelId}},${{parameters.Net5RC1ChannelId}},${{parameters.Net5RC2ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}},${{parameters.VS166ChannelId}},${{parameters.VS167ChannelId}},${{parameters.VS168ChannelId}},${{parameters.VSMasterChannelId}}
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
displayName: NuGet Validation
|
displayName: NuGet Validation
|
||||||
|
@ -329,6 +330,22 @@ stages:
|
||||||
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
|
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
|
||||||
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
|
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
|
||||||
|
|
||||||
|
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
||||||
|
parameters:
|
||||||
|
BARBuildId: ${{ parameters.BARBuildId }}
|
||||||
|
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
|
||||||
|
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}
|
||||||
|
dependsOn: ${{ parameters.publishDependsOn }}
|
||||||
|
publishInstallersAndChecksums: ${{ parameters.publishInstallersAndChecksums }}
|
||||||
|
symbolPublishingAdditionalParameters: ${{ parameters.symbolPublishingAdditionalParameters }}
|
||||||
|
stageName: 'Net5_RC2_Publish'
|
||||||
|
channelName: '.NET 5 RC 2'
|
||||||
|
akaMSChannelName: 'net5/rc2'
|
||||||
|
channelId: ${{ parameters.Net5RC2ChannelId }}
|
||||||
|
transportFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-transport/nuget/v3/index.json'
|
||||||
|
shippingFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5/nuget/v3/index.json'
|
||||||
|
symbolsFeed: 'https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet5-symbols/nuget/v3/index.json'
|
||||||
|
|
||||||
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
- template: \eng\common\templates\post-build\channels\generic-public-channel.yml
|
||||||
parameters:
|
parameters:
|
||||||
BARBuildId: ${{ parameters.BARBuildId }}
|
BARBuildId: ${{ parameters.BARBuildId }}
|
||||||
|
|
|
@ -606,11 +606,7 @@ function MSBuild() {
|
||||||
if ($pipelinesLog) {
|
if ($pipelinesLog) {
|
||||||
$buildTool = InitializeBuildTool
|
$buildTool = InitializeBuildTool
|
||||||
|
|
||||||
# Work around issues with Azure Artifacts credential provider
|
|
||||||
# https://github.com/dotnet/arcade/issues/3932
|
|
||||||
if ($ci -and $buildTool.Tool -eq 'dotnet') {
|
if ($ci -and $buildTool.Tool -eq 'dotnet') {
|
||||||
dotnet nuget locals http-cache -c
|
|
||||||
|
|
||||||
$env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20
|
$env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20
|
||||||
$env:NUGET_PLUGIN_REQUEST_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_HANDSHAKE_TIMEOUT_IN_SECONDS' -Value '20'
|
||||||
|
|
|
@ -395,11 +395,7 @@ function MSBuild {
|
||||||
InitializeBuildTool
|
InitializeBuildTool
|
||||||
InitializeToolset
|
InitializeToolset
|
||||||
|
|
||||||
# Work around issues with Azure Artifacts credential provider
|
|
||||||
# https://github.com/dotnet/arcade/issues/3932
|
|
||||||
if [[ "$ci" == true ]]; then
|
if [[ "$ci" == true ]]; then
|
||||||
"$_InitializeBuildTool" nuget locals http-cache -c
|
|
||||||
|
|
||||||
export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20
|
export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20
|
||||||
export NUGET_PLUGIN_REQUEST_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_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
|
||||||
|
|
|
@ -8,6 +8,6 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"msbuild-sdks": {
|
"msbuild-sdks": {
|
||||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20426.6"
|
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20427.5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue