From 54fba14273fe9b6f53d68c98920f0ee1ecb2dd04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 10 Nov 2018 15:08:04 +0000 Subject: [PATCH] Updating version files (#20927) --- eng/Version.Details.xml | 8 ++++---- eng/common/templates/phases/publish-build-assets.yml | 12 ++++++++++-- eng/common/templates/steps/helix-publish.yml | 2 +- global.json | 4 ++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a35b25d..3ddc6cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -2,13 +2,13 @@ - + https://github.com/dotnet/arcade - 7b0a1f028490bbf18ab1565998719315f2de22e7 + 83ae1a636871cf7f2f4d229047c6535ace11081c - + https://github.com/dotnet/arcade - 7b0a1f028490bbf18ab1565998719315f2de22e7 + 83ae1a636871cf7f2f4d229047c6535ace11081c \ No newline at end of file diff --git a/eng/common/templates/phases/publish-build-assets.yml b/eng/common/templates/phases/publish-build-assets.yml index c9381cf..85fabe6 100644 --- a/eng/common/templates/phases/publish-build-assets.yml +++ b/eng/common/templates/phases/publish-build-assets.yml @@ -11,7 +11,7 @@ phases: dependsOn: ${{ parameters.dependsOn }} queue: ${{ parameters.queue }} variables: - config: ${{ parameters.configuration }} + _BuildConfig: ${{ parameters.configuration }} steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: DownloadBuildArtifacts@0 @@ -32,7 +32,15 @@ phases: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com - /p:Configuration=$(config) + /p:Configuration=$(_BuildConfig) displayName: Publish Build Assets condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: $(Agent.Os)_Asset_Registry_Publish + continueOnError: true + condition: always() diff --git a/eng/common/templates/steps/helix-publish.yml b/eng/common/templates/steps/helix-publish.yml index f145467..68d2eb9 100644 --- a/eng/common/templates/steps/helix-publish.yml +++ b/eng/common/templates/steps/helix-publish.yml @@ -23,7 +23,7 @@ steps: command: custom projects: eng/common/helixpublish.proj custom: msbuild - arguments: '/t:test /p:Language=msbuild' + arguments: '/t:test /p:Language=msbuild /bl:$(Build.SourcesDirectory)\artifacts\log\$(_BuildConfig)\SendToHelix.binlog' displayName: Send job to Helix env: HelixSource: ${{ parameters.HelixSource }} diff --git a/global.json b/global.json index c5e0057..85188fc 100644 --- a/global.json +++ b/global.json @@ -7,7 +7,7 @@ "python": "2.7.15" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18556.6", - "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18556.6" + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.18559.22", + "Microsoft.DotNet.Helix.Sdk": "1.0.0-beta.18559.22" } } \ No newline at end of file -- 2.7.4