diff options
author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2019-03-19 12:23:59 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2019-03-19 12:23:59 -0700 |
commit | 36b8237ad6ce317d8621985ee9a7ade5201f4fc2 (patch) | |
tree | 8329a3f185c0c3684eb1ee488db3a57e87f11806 /eng | |
parent | 7c226433c1d53e2978be99db9cba47597b20763d (diff) | |
download | coreclr-36b8237ad6ce317d8621985ee9a7ade5201f4fc2.tar.gz coreclr-36b8237ad6ce317d8621985ee9a7ade5201f4fc2.tar.bz2 coreclr-36b8237ad6ce317d8621985ee9a7ade5201f4fc2.zip |
Update dependencies from https://github.com/dotnet/arcade build 20190317.10 (#23339)
This change updates the following dependencies
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19167.10
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19167.10
Diffstat (limited to 'eng')
-rw-r--r-- | eng/Version.Details.xml | 8 | ||||
-rw-r--r-- | eng/common/PublishToPackageFeed.proj | 24 | ||||
-rw-r--r-- | eng/common/init-tools-native.ps1 | 14 | ||||
-rw-r--r-- | eng/common/templates/job/publish-build-assets.yml | 1 | ||||
-rw-r--r-- | eng/common/templates/steps/send-to-helix.yml | 2 |
5 files changed, 40 insertions, 9 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4517e45a42..debcacfa39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19162.7"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19167.10"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>443dea11f8649fe12fedf60cfab0a4b2b20bd153</Sha> + <Sha>de7be3ba62b92e5c48c36876c851a14f154444af</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19162.7"> + <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.19167.10"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>443dea11f8649fe12fedf60cfab0a4b2b20bd153</Sha> + <Sha>de7be3ba62b92e5c48c36876c851a14f154444af</Sha> </Dependency> <Dependency Name="Microsoft.Private.CoreFx.NETCoreApp" Version="4.6.0-preview4.19164.7"> <Uri>https://github.com/dotnet/corefx</Uri> diff --git a/eng/common/PublishToPackageFeed.proj b/eng/common/PublishToPackageFeed.proj index b26d28a90b..25362ff060 100644 --- a/eng/common/PublishToPackageFeed.proj +++ b/eng/common/PublishToPackageFeed.proj @@ -11,11 +11,17 @@ </PropertyGroup> <Import Project="$(MSBuildThisFileDirectory)DefaultVersions.props" Condition="Exists('$(MSBuildThisFileDirectory)DefaultVersions.props')" /> + + <!-- + This won't be necessary once we solve this issue: + https://github.com/dotnet/arcade/issues/2266 + --> + <Import Project="$(MSBuildThisFileDirectory)ArtifactsCategory.props" Condition="Exists('$(MSBuildThisFileDirectory)ArtifactsCategory.props')" /> <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" /> <Target Name="PublishToFeed"> - <Error Condition="'$(TargetStaticFeed)' == ''" Text="TargetStaticFeed: Target feed for publishing assets wasn't provided." /> + <Error Condition="'$(ArtifactsCategory)' == ''" Text="ArtifactsCategory: The artifacts' category produced by the build wasn't provided." /> <Error Condition="'$(AccountKeyToStaticFeed)' == ''" Text="AccountKeyToStaticFeed: Account key for target feed wasn't provided." /> <Error Condition="'$(ManifestsBasePath)' == ''" Text="Full path to asset manifests directory wasn't provided." /> <Error Condition="'$(BlobBasePath)' == '' AND '$(PackageBasePath)' == ''" Text="A valid full path to BlobBasePath of PackageBasePath is required." /> @@ -26,7 +32,21 @@ </ItemGroup> <Error Condition="'@(ManifestFiles)' == ''" Text="No manifest file was found in the provided path: $(ManifestsBasePath)" /> - + + <!-- + For now the type of packages being published will be informed for the whole build. + Eventually this will be specified on a per package basis: + TODO: https://github.com/dotnet/arcade/issues/2266 + --> + <PropertyGroup> + <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == '.NETCORE'">https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</TargetStaticFeed> + <TargetStaticFeed Condition="'$(ArtifactsCategory.ToUpper())' == '.NETCOREVALIDATION'">https://dotnetfeed.blob.core.windows.net/arcade-validation/index.json</TargetStaticFeed> + </PropertyGroup> + + <Error + Condition="'$(TargetStaticFeed)' == ''" + Text="'$(ArtifactsCategory)' wasn't recognized as a valid artifact category. Valid categories are: '.NetCore' and '.NetCoreValidation'" /> + <!-- Iterate publishing assets from each manifest file. --> <PushArtifactsInManifestToFeed ExpectedFeedUrl="$(TargetStaticFeed)" diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index e25c60fed4..495a563a75 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -98,10 +98,20 @@ try { Write-Verbose "Executing '$LocalInstallerCommand'" Invoke-Expression "$LocalInstallerCommand" if ($LASTEXITCODE -Ne "0") { - Write-Error "Execution failed" - exit 1 + $errMsg = "$ToolName installation failed" + if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { + Write-Warning $errMsg + $toolInstallationFailure = $true + } else { + Write-Error $errMsg + exit 1 + } } } + + if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) { + exit 1 + } } else { Write-Host "No native tools defined in global.json" diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index d6d8697cbd..83646c6438 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -52,6 +52,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:PublishUsingPipelines=$(_PublishUsingPipelines) /p:Configuration=$(_BuildConfig) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index 0925e8ebd1..45d63fbc38 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -2,7 +2,7 @@ parameters: HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number - HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/api/2018-03-14/info/queues for a list of queues + HelixTargetQueues: '' # required -- semicolon delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group HelixPreCommands: '' # optional -- commands to run before Helix work item execution HelixPostCommands: '' # optional -- commands to run after Helix work item execution |