diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 013de83088fd56..e4014bd8f233cb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness c26361a23526ea459ca0a19b34b285eda1bffecb - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 3937c705c0b303..787652caf606ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,6 @@ release -$(PreReleaseVersionLabel) -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) - $(SdkBandVersion)$(WorkloadVersionSuffix) $(MajorVersion).$(MinorVersion).0.0 @@ -85,22 +84,22 @@ 9.0.109 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 2.9.0-beta.25626.6 - 9.0.0-beta.25626.6 - 2.9.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 - 9.0.0-beta.25626.6 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 2.9.0-beta.26063.2 + 9.0.0-beta.26063.2 + 2.9.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 + 9.0.0-beta.26063.2 1.4.0 @@ -253,6 +252,18 @@ 9.0.13-servicing.26056.4 9.0.13 $(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version) + + + <_GlobalJsonContent>$([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)../global.json')) + <_GlobalJsonSdkVersion Condition="'$(_GlobalJsonContent)' != ''">$([System.Text.RegularExpressions.Regex]::Match($(_GlobalJsonContent), '"sdk"\s*:\s*\{[^\}]*"version"\s*:\s*"([^"]+)"', System.Text.RegularExpressions.RegexOptions.Singleline).Groups[1].Value) + <_DotnetSdkVersion>$(MicrosoftDotNetApiCompatTaskVersion) + $(_DotnetSdkVersion) + $(_GlobalJsonSdkVersion) + $(SdkBandVersion)$(WorkloadVersionSuffix) 1.1.87-gba258badda 1.0.0-v3.14.0.5722 @@ -268,9 +279,6 @@ 3.1.7 1.0.406601 - - - 9.0.112 9.0.0-alpha.1.24175.1 $(MicrosoftNETRuntimeEmscriptenVersion) $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 6b5ff28cc70633..3cb20fb5041fed 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -74,7 +74,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 221d1ac6de1945..864427d9694ab3 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -291,11 +291,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 e0b19c14a073c6..18693ea120d57b 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 0c66b3f266c358..9d1e6e3db9c573 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.112" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26063.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.26063.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"