diff --git a/NuGet.config b/NuGet.config index 0ec82d8d8f7f..08e7ecd2a977 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + @@ -42,6 +42,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4735ed366284..0a6861d636f2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25612.111 - 10.0.0-beta.25612.111 - 0.11.5-alpha.25612.111 - 10.0.0-beta.25612.111 - 10.0.2-servicing.25612.111 - 10.0.2 - 10.0.2 - 10.0.102-servicing.25612.111 - 10.0.2 - 10.0.102 + 10.0.0-beta.26065.102 + 10.0.0-beta.26065.102 + 0.11.5-alpha.26065.102 + 10.0.0-beta.26065.102 + 10.0.3-servicing.26065.102 + 10.0.3 + 10.0.3 + 10.0.103-servicing.26065.102 + 10.0.3 + 10.0.103 26.0.11017 18.5.9227 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c8c9db74f81..bf2ecb10419e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 @@ -95,25 +95,25 @@ - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 https://github.com/dotnet/xharness 799df8d4c86ff50c83b7a57df9e3691eeab813ec - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 99f9e99f92d73ade5453ba8edba5d72247f3cd11 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/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 9634fbe97db7..e9ba19047a97 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.102-servicing.25612.111", + "version": "10.0.103-servicing.26065.102", "paths": [ "builds/downloads/dotnet", "$host$" @@ -8,9 +8,9 @@ "errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'." }, "tools": { - "dotnet": "10.0.102-servicing.25612.111" + "dotnet": "10.0.103-servicing.26065.102" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25612.111" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26065.102" } }