diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99ed98a2a..aebceb6c1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac - + https://github.com/dotnet/arcade - ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1 + ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac diff --git a/eng/Versions.props b/eng/Versions.props index b568d30a6..0e1f4a350 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,7 +15,7 @@ 8.0.0 8.0.0 8.0.0 - 10.0.0-beta.25113.2 + 10.0.0-beta.25120.6 6.0.36 0.2.0-alpha.24576.2 10.0.0-beta.25056.1 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3d3356e31..c7d59dcbf 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -76,12 +76,11 @@ jobs: fetchDepth: 3 clean: true - - task: DownloadBuildArtifacts@0 - displayName: Download artifact + - task: DownloadPipelineArtifact@2 + displayName: Download Asset Manifests inputs: artifactName: AssetManifests - downloadPath: '$(Build.StagingDirectory)/Download' - checkDownloadedFiles: true + targetPath: '$(Build.StagingDirectory)/AssetManifests' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -95,7 +94,7 @@ jobs: scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 4f0546dce..ab2b13f63 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 80f9130b1..95ccdf82e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 - $defaultXCopyMSBuildVersion = '17.12.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0 + $defaultXCopyMSBuildVersion = '17.13.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index b1d6135cb..fcbbaaca1 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-alpha.1.25077.2" + "version": "10.0.100-preview.2.25118.3" }, "tools": { - "dotnet": "10.0.100-alpha.1.25077.2", + "dotnet": "10.0.100-preview.2.25118.3", "runtimes": { "dotnet": [ "6.0.36", @@ -20,7 +20,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25120.6", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25120.6" } }