diff --git a/eng/Version.Details.props b/eng/Version.Details.props index aa6835c00e50..5f9a23814e37 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,68 +6,68 @@ This file should be imported by eng/Versions.props - 10.0.0-preview.26110.110 - 18.3.0-release-26110-110 - 18.3.0-release-26110-110 - 7.3.0-preview.1.11110 - 10.0.200-alpha.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 - 10.0.0-preview.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 - 10.0.0-beta.26110.110 - 10.0.0-beta.26110.110 - 10.0.0-beta.26110.110 - 10.0.0-beta.26110.110 - 10.0.0-beta.26110.110 - 10.0.0-beta.26110.110 - 10.0.0-beta.26110.110 - 10.0.0-beta.26110.110 - 15.2.200-servicing.26110.110 - 5.3.0-2.26110.110 - 5.3.0-2.26110.110 + 10.0.0-preview.26113.113 + 18.3.0-release-26113-113 + 18.3.0-release-26113-113 + 7.3.0-preview.1.11413 + 10.0.200-alpha.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 + 10.0.0-preview.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 + 10.0.0-beta.26113.113 + 10.0.0-beta.26113.113 + 10.0.0-beta.26113.113 + 10.0.0-beta.26113.113 + 10.0.0-beta.26113.113 + 10.0.0-beta.26113.113 + 10.0.0-beta.26113.113 + 10.0.0-beta.26113.113 + 15.2.100-preview2.26113.113 + 5.3.0-2.26113.113 + 5.3.0-2.26113.113 10.0.0-preview.7.25377.103 - 10.0.0-preview.26110.110 - 18.3.0-release-26110-110 - 10.0.200-alpha.26110.110 - 10.0.200-alpha.26110.110 - 10.0.200-alpha.26110.110 - 10.0.200-alpha.26110.110 - 10.0.200-alpha.26110.110 - 10.0.200-preview.26110.110 - 10.0.200-preview.26110.110 - 10.0.200-preview.26110.110 - 10.0.200-preview.26110.110 - 10.0.200-preview.26110.110 - 10.0.200-preview.26110.110 - 10.0.200-preview.26110.110 - 10.0.200-preview.26110.110 - 10.0.200-preview.26110.110 - 18.3.0-release-26110-110 - 18.3.0-release-26110-110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 - 7.3.0-preview.1.11110 + 10.0.0-preview.26113.113 + 18.3.0-release-26113-113 + 10.0.200-alpha.26113.113 + 10.0.200-alpha.26113.113 + 10.0.200-alpha.26113.113 + 10.0.200-alpha.26113.113 + 10.0.200-alpha.26113.113 + 10.0.200-preview.26113.113 + 10.0.200-preview.26113.113 + 10.0.200-preview.26113.113 + 10.0.200-preview.26113.113 + 10.0.200-preview.26113.113 + 10.0.200-preview.26113.113 + 10.0.200-preview.26113.113 + 10.0.200-preview.26113.113 + 10.0.200-preview.26113.113 + 18.3.0-release-26113-113 + 18.3.0-release-26113-113 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 + 7.3.0-preview.1.11413 10.0.2-servicing.25612.105 10.0.2-servicing.25612.105 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c619dfaf94e0..b9f328cd397c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,138 +72,138 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -370,25 +370,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -405,29 +405,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee @@ -514,9 +514,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -528,37 +528,37 @@ - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee - + https://github.com/dotnet/dotnet - 24f66fec875855c1e7bcddebf0703b2fcab1ee3e + 05d9490471fb4b10d7ef4faa32c423e1b5adcaee https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3437087c80fc..b955fac6e13f 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/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb94..1997c2ae00d7 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,19 +60,19 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals build.ubuntu.2004.amd64 + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: build.azurelinux.3.amd64 os: linux ${{ else }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64.Open + demands: ImageOverride -equals build.azurelinux.3.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - demands: ImageOverride -equals Build.Ubuntu.2204.Amd64 + demands: ImageOverride -equals build.azurelinux.3.amd64 ${{ if ne(parameters.platform.pool, '') }}: pool: ${{ parameters.platform.pool }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 9423d71ca3a2..b942a79ef02d 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 e0b19c14a073..18693ea120d5 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/eng/common/tools.ps1 b/eng/common/tools.ps1 index bef4affa4a41..049fe6db994e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -560,19 +560,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index e12862d61aad..7979cffaeec4 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26110.110", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26110.110", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26113.113", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26113.113", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"