diff --git a/.vsts-dotnet-ci.yml b/.vsts-dotnet-ci.yml index eb38f6d96a3..fc7940289f0 100644 --- a/.vsts-dotnet-ci.yml +++ b/.vsts-dotnet-ci.yml @@ -20,6 +20,14 @@ jobs: steps: - powershell: | $versionsFile = "eng/Versions.props" + + [xml]$xml = Get-Content $versionsFile + $finalVersionKind = $xml.Project.PropertyGroup.DotNetFinalVersionKind + if ($finalVersionKind -ne 'release') { + Write-Host "Since it is not released, skip the version bump check."; + return + } + $changedFiles = git diff --name-only HEAD HEAD~1 $changedVersionsFile = $changedFiles | Where-Object { $_ -eq $versionsFile } $isInitialCommit = $false diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5b13936e49b..a0fcf9f8095 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -24,8 +24,8 @@ This file should be imported by eng/Versions.props 9.0.11 9.0.11 - 10.0.0-beta.25626.5 - 10.0.0-beta.25626.5 + 10.0.0-beta.26062.3 + 10.0.0-beta.26062.3 7.3.0-preview.1.50 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1508f78d1ec..272731ff355 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -106,9 +106,9 @@ - + https://github.com/dotnet/arcade - d8dca0b41b903e7182e64543773390b969dab96b + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 https://github.com/nuget/nuget.client @@ -118,9 +118,9 @@ https://github.com/dotnet/roslyn df7b5aaff073486376dad5d30b6d0ba45595d97d - + https://github.com/dotnet/arcade - d8dca0b41b903e7182e64543773390b969dab96b + 9f518f2be968c4c0102c2e3f8c793c5b7f28b731 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3437087c80f..b955fac6e13 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 9423d71ca3a..b942a79ef02 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index e0b19c14a07..18693ea120d 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 +# demands: ImageOverride -equals windows.vs2022.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/global.json b/global.json index 677476b7c8a..0d6a2066c27 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ "xcopy-msbuild": "18.0.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25626.5" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26062.3" } }