Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade (#628)
Browse files Browse the repository at this point in the history
* Update dependencies from https://github.com/dotnet/arcade build 20190724.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19374.2
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19374.2
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19374.2

* Update dependencies from https://github.com/dotnet/arcade build 20190725.2

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19375.2
- Microsoft.DotNet.GenAPI - 1.0.0-beta.19375.2
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19375.2
  • Loading branch information
dotnet-maestro[bot] authored and joperezr committed Jul 25, 2019
1 parent 8243b98 commit 4db58b9
Show file tree
Hide file tree
Showing 26 changed files with 108 additions and 101 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19373.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19375.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>56b5e5a9debc87b98c5dd394e8a72c916099d9d5</Sha>
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19373.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19375.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>56b5e5a9debc87b98c5dd394e8a72c916099d9d5</Sha>
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19373.6">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.19375.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>56b5e5a9debc87b98c5dd394e8a72c916099d9d5</Sha>
<Sha>3dfa62fddcde597959c323d17426f215384e773a</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19373.6</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.19375.2</MicrosoftDotNetGenAPIPackageVersion>
</PropertyGroup>
<!-- Restore sources -->
<PropertyGroup>
Expand Down
Empty file modified eng/common/cross/armel/tizen-build-rootfs.sh
100644 → 100755
Empty file.
Empty file modified eng/common/cross/armel/tizen-fetch.sh
100644 → 100755
Empty file.
Empty file modified eng/common/cross/build-android-rootfs.sh
100644 → 100755
Empty file.
Empty file modified eng/common/cross/build-rootfs.sh
100644 → 100755
Empty file.
11 changes: 11 additions & 0 deletions eng/common/cross/x86/sources.list.bionic
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
deb http://archive.ubuntu.com/ubuntu/ bionic main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ bionic main restricted universe

deb http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ bionic-updates main restricted universe

deb http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted
deb-src http://archive.ubuntu.com/ubuntu/ bionic-backports main restricted

deb http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ bionic-security main restricted universe multiverse
11 changes: 11 additions & 0 deletions eng/common/cross/x86/sources.list.trusty
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ trusty main restricted universe

deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe

deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted
deb-src http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted

deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse
11 changes: 11 additions & 0 deletions eng/common/cross/x86/sources.list.xenial
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
deb http://archive.ubuntu.com/ubuntu/ xenial main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ xenial main restricted universe

deb http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe
deb-src http://archive.ubuntu.com/ubuntu/ xenial-updates main restricted universe

deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted
deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted

deb http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
deb-src http://archive.ubuntu.com/ubuntu/ xenial-security main restricted universe multiverse
Empty file modified eng/common/darc-init.sh
100644 → 100755
Empty file.
2 changes: 1 addition & 1 deletion eng/common/init-tools-native.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ try {
}

Write-Verbose "Installing $ToolName version $ToolVersion"
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ `"$($LocalInstallerArguments.$_)`""}) -join ' ')'"
Write-Verbose "Executing '$InstallerPath $LocalInstallerArguments'"
& $InstallerPath @LocalInstallerArguments
if ($LASTEXITCODE -Ne "0") {
$errMsg = "$ToolName installation failed"
Expand Down
Empty file modified eng/common/init-tools-native.sh
100644 → 100755
Empty file.
Empty file modified eng/common/internal-feed-operations.sh
100644 → 100755
Empty file.
Empty file modified eng/common/native/common-library.sh
100644 → 100755
Empty file.
Empty file modified eng/common/native/install-cmake.sh
100644 → 100755
Empty file.
Empty file modified eng/common/performance/performance-setup.sh
100644 → 100755
Empty file.
Empty file modified eng/common/pipeline-logging-functions.sh
100644 → 100755
Empty file.
36 changes: 36 additions & 0 deletions eng/common/post-build/darc-gather-drop.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
param(
[Parameter(Mandatory=$true)][string] $BarBuildId, # ID of the build which assets should be downloaded
[Parameter(Mandatory=$true)][string] $MaestroAccessToken, # Token used to access Maestro API
[Parameter(Mandatory=$true)][string] $DropLocation # Where the assets should be downloaded to
)

$ErrorActionPreference = "Stop"
Set-StrictMode -Version 2.0

. $PSScriptRoot\..\tools.ps1

try {
Write-Host "Installing DARC ..."

. $PSScriptRoot\..\darc-init.ps1
$exitCode = $LASTEXITCODE

if ($exitCode -ne 0) {
Write-PipelineTaskError "Something failed while running 'darc-init.ps1'. Check for errors above. Exiting now..."
ExitWithExitCode $exitCode
}

darc gather-drop --non-shipping `
--continue-on-error `
--id $BarBuildId `
--output-dir $DropLocation `
--bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ `
--password $MaestroAccessToken `
--latest-location
}
catch {
Write-Host $_
Write-Host $_.Exception
Write-Host $_.ScriptStackTrace
ExitWithExitCode 1
}
23 changes: 0 additions & 23 deletions eng/common/templates/post-build/channels/internal-servicing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,29 +143,6 @@ stages:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)

- job:
displayName: Gather Drop
dependsOn: setupMaestroVars
variables:
BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.InternalServicing_30_Channel_Id)
pool:
vmImage: 'windows-2019'
steps:
- task: PowerShell@2
displayName: Setup Darc CLI
inputs:
targetType: filePath
filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1'

- task: PowerShell@2
displayName: Run Darc gather-drop
inputs:
targetType: inline
script: |
darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location
enabled: false

- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
24 changes: 3 additions & 21 deletions eng/common/templates/post-build/channels/public-dev-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,27 +140,9 @@ stages:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)

- job:
displayName: Gather Drop
dependsOn: setupMaestroVars
variables:
BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicDevRelease_30_Channel_Id)
pool:
vmImage: 'windows-2019'
steps:
- task: PowerShell@2
displayName: Setup Darc CLI
inputs:
targetType: filePath
filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1'

- task: PowerShell@2
displayName: Run Darc gather-drop
inputs:
targetType: inline
script: |
darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location
- template: ../darc-gather-drop.yml
parameters:
ChannelId: ${{ variables.PublicDevRelease_30_Channel_Id }}

- template: ../promote-build.yml
parameters:
Expand Down
23 changes: 0 additions & 23 deletions eng/common/templates/post-build/channels/public-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,29 +143,6 @@ stages:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/symbols-validation.ps1
arguments: -InputPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Temp/ -DotnetSymbolVersion $(SymbolToolVersion)

- job:
displayName: Gather Drop
dependsOn: setupMaestroVars
variables:
BARBuildId: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicRelease_30_Channel_Id)
pool:
vmImage: 'windows-2019'
steps:
- task: PowerShell@2
displayName: Setup Darc CLI
inputs:
targetType: filePath
filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1'

- task: PowerShell@2
displayName: Run Darc gather-drop
inputs:
targetType: inline
script: |
darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com/ --password $(MaestroAccessToken) --latest-location
enabled: false

- template: ../promote-build.yml
parameters:
ChannelId: ${{ variables.PublicRelease_30_Channel_Id }}
Original file line number Diff line number Diff line change
Expand Up @@ -91,29 +91,9 @@ stages:
jobs:
- template: ../setup-maestro-vars.yml

- job:
displayName: Gather Drop
dependsOn: setupMaestroVars
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], variables.PublicValidationRelease_30_Channel_Id)
variables:
- name: BARBuildId
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
- group: Publish-Build-Assets
pool:
vmImage: 'windows-2019'
steps:
- task: PowerShell@2
displayName: Setup Darc CLI
inputs:
targetType: filePath
filePath: '$(Build.SourcesDirectory)/eng/common/darc-init.ps1'

- task: PowerShell@2
displayName: Run Darc gather-drop
inputs:
targetType: inline
script: |
darc gather-drop --non-shipping --continue-on-error --id $(BARBuildId) --output-dir $(Agent.BuildDirectory)/Temp/Drop/ --bar-uri https://maestro-prod.westus2.cloudapp.azure.com --password $(MaestroAccessToken) --latest-location
- template: ../darc-gather-drop.yml
parameters:
ChannelId: ${{ variables.PublicValidationRelease_30_Channel_Id }}

- template: ../promote-build.yml
parameters:
Expand Down
22 changes: 22 additions & 0 deletions eng/common/templates/post-build/darc-gather-drop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
parameters:
ChannelId: 0

jobs:
- job: gatherDrop
displayName: Gather Drop
dependsOn: setupMaestroVars
condition: contains(dependencies.setupMaestroVars.outputs['setReleaseVars.InitialChannels'], ${{ parameters.ChannelId }})
variables:
- group: Publish-Build-Assets
- name: BARBuildId
value: $[ dependencies.setupMaestroVars.outputs['setReleaseVars.BARBuildId'] ]
pool:
vmImage: 'windows-2019'
steps:
- task: PowerShell@2
displayName: Darc gather-drop
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/darc-gather-drop.ps1
arguments: -BarBuildId $(BARBuildId)
-DropLocation $(Agent.BuildDirectory)/Temp/Drop/
-MaestroAccessToken $(MaestroAccessToken)
2 changes: 1 addition & 1 deletion eng/common/templates/post-build/trigger-subscription.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ steps:
filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1
arguments: -SourceRepo $(Build.Repository.Uri)
-ChannelId ${{ parameters.ChannelId }}
-BarToken $(MaestroAccessTokenInt)
-BarToken $(MaestroAccessToken)
Empty file modified eng/common/tools.sh
100644 → 100755
Empty file.
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"version": "3.0.100-preview6-012264"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19373.6",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19373.6"
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19375.2",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19375.2"
}
}

0 comments on commit 4db58b9

Please sign in to comment.