diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b92652a172..2af3681997 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 663ead2cbcbc7ee3d5cb792a30209ad58d6ee971 + fd104228e5b97494a4ab0896a979b69928257ef9 diff --git a/eng/common/templates/steps/publish-logs.yml b/eng/common/templates/steps/publish-logs.yml index 428026d2e7..88f238f36b 100644 --- a/eng/common/templates/steps/publish-logs.yml +++ b/eng/common/templates/steps/publish-logs.yml @@ -3,20 +3,21 @@ parameters: JobLabel: '' steps: -- task: CopyFiles@2 - displayName: Copy Logs to $(Build.StagingDirectory)\BuildLogs +- task: Powershell@2 + displayName: Prepare Binlogs to Upload inputs: - SourceFolder: $(Build.SourcesDirectory)\artifacts - Contents: | - **/*.log - **/*.binlog - TargetFolder: '$(Build.StagingDirectory)\BuildLogs' + targetType: inline + script: | + New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true - condition: succeededOrFailed() + condition: always() -- task: PublishPipelineArtifact@1 - displayName: Publish BuildLogs +- task: PublishBuildArtifacts@1 + displayName: Publish Logs inputs: - targetPath: '$(Build.StagingDirectory)\BuildLogs' - artifactName: ${{ parameters.JobLabel }} - condition: succeededOrFailed() + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/global.json b/global.json index 2aebf1d8a4..c56315568c 100644 --- a/global.json +++ b/global.json @@ -12,6 +12,6 @@ "xcopy-msbuild": "16.6.5-alpha1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20451.5" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20452.19" } }