diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea16192eddd1..2c0c7792fb82 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 - + https://github.com/dotnet/arcade - 0890ca08513391dafe556fb326c73c6c5c6cb329 + 92e45d251889042fd956e18b28d489020298d864 diff --git a/eng/Versions.props b/eng/Versions.props index 7928139de311..e30c271601a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 - 9.0.0-beta.25577.5 + 9.0.0-beta.25608.5 + 9.0.0-beta.25608.5 + 9.0.0-beta.25608.5 + 9.0.0-beta.25608.5 diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 662b9fcce154..ddf8c2e00d80 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 6a1560e8442e..9b3ad8840fdb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -295,7 +295,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -547,25 +547,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component @@ -968,4 +962,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 3ee42b57d57e..46380d959f85 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25577.5", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25577.5", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25608.5", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25608.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" }