diff --git a/NuGet.config b/NuGet.config index 47a9aedbc40..97c2eabf276 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,12 +10,16 @@ - + + + + + @@ -55,6 +59,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60c06fc4ced..88144b20bcf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,13 +31,13 @@ - + https://github.com/dotnet/arcade - ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac + c7b4cf2b26fdef0e503ba8d2f67d67cf5a1594c8 - + https://github.com/dotnet/arcade - ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac + c7b4cf2b26fdef0e503ba8d2f67d67cf5a1594c8 https://github.com/dotnet/xharness diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index c7d59dcbfe1..3d3356e3196 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -76,11 +76,12 @@ jobs: fetchDepth: 3 clean: true - - task: DownloadPipelineArtifact@2 - displayName: Download Asset Manifests + - task: DownloadBuildArtifacts@0 + displayName: Download artifact inputs: artifactName: AssetManifests - targetPath: '$(Build.StagingDirectory)/AssetManifests' + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -94,7 +95,7 @@ jobs: scriptLocation: scriptPath scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet - /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' + /p:ManifestsPath='$(Build.StagingDirectory)/Download/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 ab2b13f63fb..4f0546dce12 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.13.0" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.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 95ccdf82e4b..80f9130b150 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.13.0 - $defaultXCopyMSBuildVersion = '17.13.0' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index ab684d4a26e..e6c50b1e2e0 100644 --- a/global.json +++ b/global.json @@ -1,15 +1,15 @@ { "sdk": { - "version": "10.0.100-preview.2.25118.3", + "version": "10.0.100-alpha.1.25077.2", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-preview.2.25118.3" + "dotnet": "10.0.100-alpha.1.25077.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25120.6", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25120.6" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25112.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25112.2" }, "native-tools": { "python3": "3.7.1"