diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 4ef4e71b3bff41..856cc4c5edb1ff 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.22375.5", + "version": "1.0.0-prerelease.22408.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29b21fd47da85d..1c412944b83883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,52 +1,52 @@ - + https://github.com/dotnet/icu - d65ae2e51ad292901e89d06b31d31d7038c30c0f + c04d1340510269c5cd07a285abb097f587924d5b https://github.com/dotnet/msquic dc012a715ceb9b5d5258f2fda77520586af5a36a - + https://github.com/dotnet/emsdk - 7b2cd1ee7169143248a7da9fd749caf22affa624 + 216093204c415b6e37dfadfcbcf183881b443636 https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - 754d13817d834b716d339183e21aac7d2489c496 + e73d65f0f80655b463162bd41a8365377ba6565d - + https://github.com/dotnet/llvm-project - 754d13817d834b716d339183e21aac7d2489c496 + e73d65f0f80655b463162bd41a8365377ba6565d - + https://github.com/dotnet/llvm-project - 754d13817d834b716d339183e21aac7d2489c496 + e73d65f0f80655b463162bd41a8365377ba6565d - + https://github.com/dotnet/llvm-project - 754d13817d834b716d339183e21aac7d2489c496 + e73d65f0f80655b463162bd41a8365377ba6565d - + https://github.com/dotnet/llvm-project - 754d13817d834b716d339183e21aac7d2489c496 + e73d65f0f80655b463162bd41a8365377ba6565d - + https://github.com/dotnet/llvm-project - 754d13817d834b716d339183e21aac7d2489c496 + e73d65f0f80655b463162bd41a8365377ba6565d - + https://github.com/dotnet/llvm-project - 754d13817d834b716d339183e21aac7d2489c496 + e73d65f0f80655b463162bd41a8365377ba6565d - + https://github.com/dotnet/llvm-project - 754d13817d834b716d339183e21aac7d2489c496 + e73d65f0f80655b463162bd41a8365377ba6565d https://github.com/dotnet/command-line-api @@ -126,121 +126,129 @@ https://github.com/dotnet/arcade 13b342360ba81ca3fdf911fda985dc8420d51627 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/llvm-project - d87702da408b8aad0680f4f1c8b858c87d98f1df + 527481d107abeb3d6aa2881643a3efeda949f244 - + https://github.com/dotnet/llvm-project - d87702da408b8aad0680f4f1c8b858c87d98f1df + 527481d107abeb3d6aa2881643a3efeda949f244 - + https://github.com/dotnet/llvm-project - d87702da408b8aad0680f4f1c8b858c87d98f1df + 527481d107abeb3d6aa2881643a3efeda949f244 - + https://github.com/dotnet/llvm-project - d87702da408b8aad0680f4f1c8b858c87d98f1df + 527481d107abeb3d6aa2881643a3efeda949f244 - + https://github.com/dotnet/llvm-project - d87702da408b8aad0680f4f1c8b858c87d98f1df + 527481d107abeb3d6aa2881643a3efeda949f244 - + https://github.com/dotnet/llvm-project - d87702da408b8aad0680f4f1c8b858c87d98f1df + 527481d107abeb3d6aa2881643a3efeda949f244 - + https://github.com/dotnet/llvm-project - d87702da408b8aad0680f4f1c8b858c87d98f1df + 527481d107abeb3d6aa2881643a3efeda949f244 - + https://github.com/dotnet/llvm-project - d87702da408b8aad0680f4f1c8b858c87d98f1df + 527481d107abeb3d6aa2881643a3efeda949f244 - + https://github.com/dotnet/runtime - 214ca6db481923aa49bac2d2b75b9aca4041b304 + 0c5ca95fec9b6e2cc5e757ad36d0b094f81a59a6 - + https://github.com/dotnet/runtime - 214ca6db481923aa49bac2d2b75b9aca4041b304 + 508fef51e841aa16ffed1aae32bf4793a2cea363 - + https://github.com/dotnet/runtime - 214ca6db481923aa49bac2d2b75b9aca4041b304 + 508fef51e841aa16ffed1aae32bf4793a2cea363 - + https://github.com/dotnet/runtime - 214ca6db481923aa49bac2d2b75b9aca4041b304 + 0c5ca95fec9b6e2cc5e757ad36d0b094f81a59a6 - + https://github.com/dotnet/runtime - 214ca6db481923aa49bac2d2b75b9aca4041b304 + 0c5ca95fec9b6e2cc5e757ad36d0b094f81a59a6 + + + https://github.com/dotnet/runtime + 0c5ca95fec9b6e2cc5e757ad36d0b094f81a59a6 + + + https://github.com/dotnet/runtime + 0c5ca95fec9b6e2cc5e757ad36d0b094f81a59a6 https://github.com/dotnet/linker f09bacf09ef10b61cf9f19825f8782171a816dab - + https://github.com/dotnet/xharness - d43453b9981bfd8705025250caff58d18e2abc7e + c98b5a327992608c54e50d48e24bb4dde0fa853e - + https://github.com/dotnet/xharness - d43453b9981bfd8705025250caff58d18e2abc7e + c98b5a327992608c54e50d48e24bb4dde0fa853e - + https://github.com/dotnet/xharness - d43453b9981bfd8705025250caff58d18e2abc7e + c98b5a327992608c54e50d48e24bb4dde0fa853e https://github.com/dotnet/arcade @@ -266,13 +274,13 @@ https://github.com/dotnet/hotreload-utils c6dfd18158f2290855b98e71734f5f169cf1dfe7 - + https://github.com/dotnet/runtime-assets - 86e7816b9869ab19ee3f44aba7ac5f0ef7d04c8c + 77acd39a813579e1e9b12cd98466787e7f90e059 - + https://github.com/dotnet/roslyn-analyzers - 4dce248f4ca16d6fa04be777c07d2a7a5f117370 + 793113a41d7f21b03470521bf48438f2abd9b12f https://github.com/dotnet/sdk diff --git a/eng/Versions.props b/eng/Versions.props index d67c8f03640f69..dc79241d09cdf3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ 4.3.0-2.final 4.3.0-2.final 4.3.0-2.final - 7.0.0-preview1.22373.2 + 7.0.0-preview1.22403.2 4.3.0-2.final 6.0.0-preview.1.102 - 7.0.0-rc.1.22374.4 + 7.0.0-rc.1.22407.4 + 7.0.0-rc.1.22381.5 + 7.0.0-rc.1.22381.5 6.0.0 - 7.0.0-rc.1.22374.4 - 1.0.0-alpha.1.22364.1 - 1.0.0-alpha.1.22364.1 - 1.0.0-alpha.1.22364.1 - 1.0.0-alpha.1.22364.1 - 1.0.0-alpha.1.22364.1 - 1.0.0-alpha.1.22364.1 - 1.0.0-alpha.1.22364.1 - 1.0.0-alpha.1.22364.1 + 7.0.0-rc.1.22407.4 + 1.0.0-alpha.1.22411.1 + 1.0.0-alpha.1.22411.1 + 1.0.0-alpha.1.22411.1 + 1.0.0-alpha.1.22411.1 + 1.0.0-alpha.1.22411.1 + 1.0.0-alpha.1.22411.1 + 1.0.0-alpha.1.22411.1 + 1.0.0-alpha.1.22411.1 6.0.0 1.1.1 @@ -111,25 +113,25 @@ 5.0.0 5.0.0 4.9.0 - 7.0.0-rc.1.22374.4 + 7.0.0-rc.1.22407.4 6.0.0 4.5.4 4.5.0 - 7.0.0-rc.1.22374.4 + 7.0.0-rc.1.22407.4 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 - 7.0.0-beta.22361.2 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 + 7.0.0-beta.22409.1 1.0.0-prerelease.22375.7 1.0.0-prerelease.22375.7 @@ -150,9 +152,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 1.0.0-prerelease.22375.5 - 1.0.0-prerelease.22375.5 - 1.0.0-prerelease.22375.5 + 1.0.0-prerelease.22408.1 + 1.0.0-prerelease.22408.1 + 1.0.0-prerelease.22408.1 1.1.0-alpha.0.22362.1 2.4.2-pre.22 0.12.0-pre.20 @@ -172,20 +174,20 @@ 7.0.100-1.22377.1 $(MicrosoftNETILLinkTasksVersion) - 7.0.0-rc.1.22375.1 + 7.0.0-rc.1.22408.1 7.0.0-alpha.1.22406.1 - 11.1.0-alpha.1.22376.4 - 11.1.0-alpha.1.22376.4 - 11.1.0-alpha.1.22376.4 - 11.1.0-alpha.1.22376.4 - 11.1.0-alpha.1.22376.4 - 11.1.0-alpha.1.22376.4 - 11.1.0-alpha.1.22376.4 - 11.1.0-alpha.1.22376.4 + 11.1.0-alpha.1.22408.2 + 11.1.0-alpha.1.22408.2 + 11.1.0-alpha.1.22408.2 + 11.1.0-alpha.1.22408.2 + 11.1.0-alpha.1.22408.2 + 11.1.0-alpha.1.22408.2 + 11.1.0-alpha.1.22408.2 + 11.1.0-alpha.1.22408.2 - 7.0.0-rc.1.22368.1 + 7.0.0-rc.1.22411.1 $(MicrosoftNETWorkloadEmscriptenManifest70100Version) 1.1.87-gba258badda diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 9d45d7cddf15d8..83a0efd39874f0 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -150,12 +150,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals windows.vs2022preview.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 # Public Windows Build Pool ${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals windows.vs2022preview.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open ${{ if eq(parameters.helixQueuesTemplate, '') }}: diff --git a/global.json b/global.json index 81d425f8329cc2..31b8c266d8aabc 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22408.3", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", - "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22374.4" + "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22407.4" } }