Update dependencies from https://github.com/dotnet/arcade build 20190621.75 (#2579)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19321.75
This commit is contained in:
dotnet-maestro[bot] 2019-06-22 12:29:08 +00:00 committed by GitHub
parent b097cc236f
commit 6393c9f42e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 42 additions and 36 deletions

View file

@ -65,9 +65,9 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19320.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19321.75">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>b21c24996a73aa62b7a1ee69f546b9d2eb084f29</Sha>
<Sha>fcee3d5c2d6180bec19c4ae50234771c436b4b52</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>

View file

@ -203,6 +203,7 @@ if [[ "$__LinuxCodeName" == "alpine" ]]; then
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/main \
-X http://dl-cdn.alpinelinux.org/alpine/v$__AlpineVersion/community \
-X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
-X http://dl-cdn.alpinelinux.org/alpine/edge/main \
-U --allow-untrusted --root $__RootfsDir --arch $__AlpineArch --initdb \
add $__AlpinePackages
rm -r $__ApkToolsDir

View file

@ -13,6 +13,13 @@ jobs:
steps:
- checkout: self
clean: true
- task: DownloadBuildArtifacts@0
displayName: Download Build Artifacts
inputs:
buildType: current
downloadType: specific files
matchingPattern: "**"
downloadPath: $(Build.SourcesDirectory)\artifacts
- task: NuGetToolInstaller@1
displayName: 'Install NuGet.exe'
- task: NuGetCommand@2

View file

@ -60,27 +60,18 @@ jobs:
condition: ${{ parameters.condition }}
continueOnError: ${{ parameters.continueOnError }}
- task: powershell@2
displayName: Create BARBuildId Artifact
displayName: Create ReleaseConfigs Artifact
inputs:
targetType: inline
script: |
Add-Content -Path "$(Build.StagingDirectory)/BARBuildId.txt" -Value $(BARBuildId)
- task: powershell@2
displayName: Create Channels Artifact
inputs:
targetType: inline
script: |
Add-Content -Path "$(Build.StagingDirectory)/Channels.txt" -Value "$(DefaultChannels)"
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId)
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)"
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsInternalBuild)
Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild)
- task: PublishBuildArtifacts@1
displayName: Publish BAR BuildId to VSTS
displayName: Publish ReleaseConfigs Artifact
inputs:
PathtoPublish: '$(Build.StagingDirectory)/BARBuildId.txt'
PublishLocation: Container
ArtifactName: ReleaseConfigs
- task: PublishBuildArtifacts@1
displayName: Publish Channels to VSTS
inputs:
PathtoPublish: '$(Build.StagingDirectory)/Channels.txt'
PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt'
PublishLocation: Container
ArtifactName: ReleaseConfigs
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:

View file

@ -2,6 +2,9 @@ parameters:
enableSourceLinkValidation: true
enableSigningValidation: true
enableSymbolValidation: true
SDLValidationParameters:
enable: false
params: ''
stages:
- stage: validate
@ -52,6 +55,11 @@ stages:
-GHCommit $(Build.SourceVersion)
-SourcelinkCliVersion $(SourceLinkCLIVersion)
- ${{ if eq(parameters.SDLValidationParameters.enable, 'true') }}:
- template: /eng/common/templates/job/execute-sdl.yml
parameters:
additionalParameters: ${{ parameters.SDLValidationParameters.params }}
- template: \eng\common\templates\post-build\channels\public-dev-release.yml
parameters:
enableSymbolValidation: ${{ parameters.enableSymbolValidation }}

View file

@ -17,22 +17,21 @@ jobs:
targetType: inline
script: |
# This is needed to make Write-PipelineSetVariable works in this context
if ($env:BUILD_BUILDNUMBER -ne "" -and $env:BUILD_BUILDNUMBER -ne $null) {
$ci = $true
$ci = $true
. "$(Build.SourcesDirectory)/eng/common/tools.ps1"
$BarId = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/BARBuildId.txt"
Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
. "$(Build.SourcesDirectory)/eng/common/tools.ps1"
Write-Host "Asked Write-PipelineSetVariable to create BARBuildId with value '$BarId'"
$Content = Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt"
$Channels = ""
Get-Content "$(Build.StagingDirectory)/ReleaseConfigs/Channels.txt" | ForEach-Object { $Channels += "$_ ," }
Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels"
$BarId = $Content | Select -Index 0
Write-Host "Asked Write-PipelineSetVariable to create InitialChannels with value '$Channels'"
}
else {
Write-Host "This step can only be run in an Azure DevOps CI environment."
}
$Channels = ""
$Content | Select -Index 1 | ForEach-Object { $Channels += "$_ ," }
$IsInternalBuild = $Content | Select -Index 2
$IsStableBuild = $Content | Select -Index 3
Write-PipelineSetVariable -Name 'BARBuildId' -Value $BarId
Write-PipelineSetVariable -Name 'InitialChannels' -Value "$Channels"
Write-PipelineSetVariable -Name 'IsInternalBuild' -Value $IsInternalBuild
Write-PipelineSetVariable -Name 'IsStableBuild' -Value $IsStableBuild

View file

@ -356,11 +356,11 @@ function MSBuild-Core {
}
}
. "$scriptroot/pipeline-logging-functions.sh"
ResolvePath "${BASH_SOURCE[0]}"
_script_dir=`dirname "$_ResolvePath"`
. "$_script_dir/pipeline-logging-functions.sh"
eng_root=`cd -P "$_script_dir/.." && pwd`
repo_root=`cd -P "$_script_dir/../.." && pwd`
artifacts_dir="$repo_root/artifacts"

View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview5-011568"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19320.1"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19321.75"
}
}