diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08e5664217900..e8df72ba5c92d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -94,73 +94,73 @@ - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - fc4ba340496ca0e45d51914f8f1606c60e3c75c6 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 https://github.com/dotnet/runtime-assets @@ -278,9 +278,9 @@ https://github.com/dotnet/xharness 1b2799a226fb2249d25495cbcc4e0c5d6e707dbb - + https://github.com/dotnet/arcade - 80b6be47e1425ea90c5febffac119250043a0c92 + 6b3bad6673f3ebe89ebe12ea7c4eff1705b893e6 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 82eb2bbd6dd5c..0dd5370e8da7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -82,21 +82,21 @@ 8.0.100-alpha.1.22571.3 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22572.2 - 8.0.0-beta.22554.2 - 2.5.1-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 - 8.0.0-beta.22554.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 2.5.1-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 + 8.0.0-beta.22579.2 6.0.0-preview.1.102 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 39be08d4b16c4..e10a596879746 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.3.1" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.4.1" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 1f1b78f2d4598..42017109f374d 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -34,6 +34,7 @@ jobs: - job: Asset_Registry_Publish dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: displayName: Publish Assets @@ -73,12 +74,6 @@ jobs: - task: NuGetAuthenticate@0 - - task: PowerShell@2 - displayName: Enable cross-org NuGet feed authentication - inputs: - filePath: $(Build.SourcesDirectory)/eng/common/enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-all-orgs-artifact-feeds-rw) - - task: PowerShell@2 displayName: Publish Build Assets inputs: diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index 1ac7f49a43ca8..c24193acfc981 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -1,8 +1,4 @@ variables: - - group: AzureDevOps-Artifact-Feeds-Pats - - group: DotNet-Blob-Feed - - group: DotNet-DotNetCli-Storage - - group: DotNet-MSRC-Storage - group: Publish-Build-Assets # Whether the build is internal or not diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 91251d08973c6..ef720f9d78198 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -172,12 +172,6 @@ stages: - task: NuGetAuthenticate@0 displayName: 'Authenticate to AzDO Feeds' - - task: PowerShell@2 - displayName: Enable cross-org publishing - inputs: - filePath: eng\common\enable-cross-org-publishing.ps1 - arguments: -token $(dn-bot-dnceng-artifact-feeds-rw) - # Signing validation will optionally work with the buildmanifest file which is downloaded from # Azure DevOps above. - task: PowerShell@2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 449126943299e..fc56f63f6f255 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,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/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.3.1view=overview - $defaultXCopyMSBuildVersion = '17.3.1' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.4.1&view=overview + $defaultXCopyMSBuildVersion = '17.4.1' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { @@ -413,6 +413,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = if($vsMinVersion -lt $vsMinVersionReqd){ Write-Host "Using xcopy-msbuild version of $defaultXCopyMSBuildVersion since VS version $vsMinVersionStr provided in global.json is not compatible" $xcopyMSBuildVersion = $defaultXCopyMSBuildVersion + $vsMajorVersion = $xcopyMSBuildVersion.Split('.')[0] } else{ # If the VS version IS compatible, look for an xcopy msbuild package diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 6586eab458e55..e7d1e3897e031 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -521,7 +521,7 @@ global_json_file="${repo_root}global.json" # determine if global.json contains a "runtimes" entry global_json_has_runtimes=false if command -v jq &> /dev/null; then - if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then + if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then global_json_has_runtimes=true fi elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then diff --git a/global.json b/global.json index 3ccb47a5d5491..88456e7736f23 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22554.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22554.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22554.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22579.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22579.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22579.2", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22559.2"