diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 6ea39c8bb659b8..38fb878a54320b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -10,78 +10,78 @@ This file should be imported by eng/Versions.props 4.9.0-rc2.21473.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 - 19.1.0-alpha.1.25513.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 + 19.1.0-alpha.1.25564.1 - 5.3.0-1.25528.108 - 5.3.0-1.25528.108 - 5.3.0-1.25528.108 - 10.0.100-rc.2.25528.108 - 10.0.100-rc.2.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 0.11.5-alpha.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 11.0.0-beta.25528.108 - 2.9.3-beta.25528.108 - 2.9.3-beta.25528.108 - 11.0.0-beta.25528.108 - 5.3.0-1.25528.108 - 10.0.0-rc.1.25528.108 - 10.0.100-rc.2.25528.108 - 10.0.0-rc.1.25528.108 - 10.0.0-rc.1.25528.108 - 7.0.0-preview.1.2908 - 7.0.0-preview.1.2908 - 7.0.0-preview.1.2908 - 7.0.0-preview.1.2908 - 10.0.0-rc.1.25528.108 - 2.0.0-rc.1.25528.108 - 10.0.0-rc.1.25528.108 - 10.0.0-rc.1.25528.108 - 10.0.0-rc.1.25528.108 + 5.3.0-1.25602.105 + 5.3.0-1.25602.105 + 5.3.0-1.25602.105 + 10.0.100-rc.3.25602.105 + 10.0.100-rc.3.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 0.11.5-alpha.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 11.0.0-beta.25602.105 + 2.9.3-beta.25602.105 + 2.9.3-beta.25602.105 + 11.0.0-beta.25602.105 + 5.3.0-1.25602.105 + 10.0.0-rc.3.25602.105 + 10.0.100-rc.3.25602.105 + 10.0.0-rc.3.25602.105 + 10.0.0-rc.3.25602.105 + 7.0.0-preview.1.10305 + 7.0.0-preview.1.10305 + 7.0.0-preview.1.10305 + 7.0.0-preview.1.10305 + 10.0.0-rc.3.25602.105 + 3.0.0-alpha.1.25602.105 + 10.0.0-rc.3.25602.105 + 10.0.0-rc.3.25602.105 + 10.0.0-rc.3.25602.105 11.0.0-beta.25553.1 - 11.0.0-beta.25574.4 + 11.0.0-beta.25553.1 11.0.0-beta.25553.1 11.0.0-beta.25553.1 11.0.0-beta.25553.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ba1fb5912f558..a55e7ed3587e3a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -9,123 +9,123 @@ https://github.com/dotnet/wcf 7f504aabb1988e9a093c1e74d8040bd52feb2f01 - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 https://github.com/dotnet/runtime-assets @@ -179,117 +179,117 @@ https://github.com/dotnet/runtime-assets b5d67650a6a37772770a9df6ca762eebd0c21617 - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/llvm-project - 816523df2340bb2d44fa15f1fb0fcfda9e38e9a2 + df75e5e5928e2fa2171fad46ce44244b2c71922f - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 https://github.com/dotnet/xharness @@ -303,9 +303,9 @@ https://github.com/dotnet/xharness e26a7b2ad453b6739b033b18d9f896ab2f112e36 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -331,29 +331,29 @@ https://github.com/dotnet/runtime-assets b5d67650a6a37772770a9df6ca762eebd0c21617 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -365,21 +365,21 @@ - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 - + https://github.com/dotnet/dotnet - e545239117919cda700be149a2e9a032374fc284 + 78c39718bb6e8008ba9d2dbd00d550bee6be9f59 https://github.com/dotnet/node diff --git a/eng/Versions.props b/eng/Versions.props index ad0283439a0745..fd5b5482d4de80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,39 +1,48 @@ - + + + - - 10.0.0 - 10 0 0 - $(MajorVersion).0.100 + rc + 3 + + + + + $(MajorVersion).$(MinorVersion).$(PatchVersion) 9.0.3 8.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet9)').Build),11)) 7.0.20 6.0.36 - rc - 1 - - false - release - -$(PreReleaseVersionLabel) - -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) - $(SdkBandVersion)$(WorkloadVersionSuffix) + + + + $(MicrosoftNETWorkloadEmscriptenCurrentManifest100100TransportPackageVersion) + $([System.String]::Copy('$(SdkVersionForWorkloadTesting)').Split('.')[0]) + $(SdkMajorVersion).0.100 + $([System.Text.RegularExpressions.Regex]::Match($(SdkVersionForWorkloadTesting), '-(?!rtm|servicing)(.+)\.[^.]+\.[^.]+$').Groups[1].Value) + $(SdkBandVersion) + $(SdkBandVersion)-$(SdkPreReleaseLabel) + $(MajorVersion).$(MinorVersion).0.0 - + + false false - true true true + + 3.3.5-beta1.23270.2 + $(MicrosoftCodeAnalysisVersion_LatestVS) + 0.2.0 @@ -155,10 +166,7 @@ 3.1.7 1.0.406601 - - - 10.0.100-rc.2.25502.107 - 10.0.0-preview.7.25359.101 + 10.0.0 $(runtimewinx64MicrosoftNETCoreRuntimeWasmNodeTransportPackageVersion) 3.1.56 @@ -170,4 +178,5 @@ 5.0.2-dotnet.2811440 5.0.2-dotnet.2811440 + diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 721a5566699fba..8b5c635fe807e1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -122,8 +122,9 @@ jobs: # Populate internal runtime variables. - template: /eng/common/templates/steps/enable-internal-sources.yml - parameters: - legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + parameters: + legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) - template: /eng/common/templates/steps/enable-internal-runtimes.yml @@ -140,7 +141,7 @@ jobs: /p:MaestroApiEndpoint=https://maestro.dot.net /p:OfficialBuildId=$(OfficialBuildId) -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} @@ -189,6 +190,11 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x - task: AzureCLI@2 displayName: Publish Using Darc @@ -205,8 +211,8 @@ jobs: -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' - -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/core-templates/steps/publish-logs.yml diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d805d5faeb9475..9d820f9742117b 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -60,10 +60,10 @@ 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.ubuntu.2204.amd64 ${{ 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: 1es-azurelinux-3 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 30530359a5d6d6..58b7a76814e08f 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open + image: windows.vs2026preview.scout.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 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 0cea81c74f2271..06864cd1feb8e8 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -127,11 +127,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -175,7 +175,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -236,7 +236,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -305,14 +305,19 @@ stages: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} - - task: NuGetAuthenticate@1 # Populate internal runtime variables. + - task: NuGetAuthenticate@1 + # Populate internal runtime variables. - template: /eng/common/templates/steps/enable-internal-sources.yml parameters: legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw) - template: /eng/common/templates/steps/enable-internal-runtimes.yml + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: @@ -330,4 +335,4 @@ stages: -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}' -runtimeSourceFeed https://ci.dot.net/internal - -runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64) + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' diff --git a/eng/common/core-templates/steps/install-microbuild-impl.yml b/eng/common/core-templates/steps/install-microbuild-impl.yml index 9fdf3a116774e0..b9e0143ee92adc 100644 --- a/eng/common/core-templates/steps/install-microbuild-impl.yml +++ b/eng/common/core-templates/steps/install-microbuild-impl.yml @@ -20,15 +20,15 @@ parameters: steps: - ${{ if eq(parameters.enablePreviewMicrobuild, 'true') }}: - task: MicroBuildSigningPluginPreview@4 - displayName: Install Preview MicroBuild plugin (Windows) + displayName: Install Preview MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} condition: ${{ parameters.condition }} - ${{ else }}: - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin (Windows) + displayName: Install MicroBuild plugin inputs: ${{ parameters.microbuildTaskInputs }} env: ${{ parameters.microbuildEnv }} continueOnError: ${{ parameters.continueOnError }} - condition: ${{ parameters.condition }} \ No newline at end of file + condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index 3d42d9a5661576..4f4b56ed2a6bbd 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -13,6 +13,8 @@ parameters: # Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true + # Microbuild installation directory + microBuildOutputFolder: $(Agent.TempDirectory)/MicroBuild # Microbuild version microbuildPluginVersion: 'latest' @@ -21,16 +23,33 @@ parameters: steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Installing .NET 8 is required to use the MicroBuild signing plugin on non-Windows platforms + # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin inputs: packageType: sdk version: 8.0.x - # Installing the SDK in a '.dotnet-microbuild' directory is required for signing. - # See target FindDotNetPathForMicroBuild in arcade/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj - # Do not remove '.dotnet-microbuild' from the path without changing the corresponding logic. - installationPath: $(Agent.TempDirectory)/.dotnet-microbuild + installationPath: ${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + + - script: | + set -euo pipefail + + # UseDotNet@2 prepends the dotnet executable path to the PATH variable, so we can call dotnet directly + version=$(dotnet --version) + cat << 'EOF' > ${{ parameters.microBuildOutputFolder }}/global.json + { + "sdk": { + "version": "$version", + "paths": [ + "${{ parameters.microBuildOutputFolder }}/.dotnet-microbuild" + ], + "errorMessage": "The .NET SDK version $version is required to install the MicroBuild signing plugin." + } + } + EOF + displayName: 'Add global.json to MicroBuild Installation path' + workingDirectory: ${{ parameters.microBuildOutputFolder }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - script: | @@ -70,7 +89,7 @@ steps: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) @@ -84,6 +103,7 @@ steps: zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json version: ${{ parameters.microbuildPluginVersion }} + workingDirectory: ${{ parameters.microBuildOutputFolder }} ${{ if eq(parameters.microbuildUseESRP, true) }}: ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: @@ -92,7 +112,7 @@ steps: ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc microbuildEnv: TeamName: $(_TeamName) - MicroBuildOutputFolderOverride: $(Agent.TempDirectory)/MicroBuild + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index 10f825e270a03b..5a927b4c7bcbf2 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -26,8 +26,10 @@ steps: # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' - -BinlogToolVersion ${{parameters.BinlogToolVersion}} + -BinlogToolVersion '${{parameters.BinlogToolVersion}}' -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' + -runtimeSourceFeed https://ci.dot.net/internal + -runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index eff4573c6e5fb1..ac019e2d033713 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -14,8 +14,8 @@ steps: workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --add-source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version ${{parameters.sourceIndexProcessBinlogPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version ${{parameters.sourceIndexUploadPackageVersion}} --source ${{parameters.SourceIndexPackageSource}} --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: "Source Index: Download netsourceindex Tools" # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) diff --git a/eng/common/generate-sbom-prep.sh b/eng/common/generate-sbom-prep.sh old mode 100755 new mode 100644 diff --git a/eng/common/native/install-dependencies.sh b/eng/common/native/install-dependencies.sh index f7bd4af0c8dbad..64b87d0bcc3cec 100755 --- a/eng/common/native/install-dependencies.sh +++ b/eng/common/native/install-dependencies.sh @@ -27,7 +27,7 @@ case "$os" in libssl-dev libkrb5-dev pigz cpio localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 - elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ]; then + elif [ "$ID" = "fedora" ] || [ "$ID" = "rhel" ] || [ "$ID" = "azurelinux" ] || [ "$ID" = "centos"]; then pkg_mgr="$(command -v tdnf 2>/dev/null || command -v dnf)" $pkg_mgr install -y cmake llvm lld lldb clang python curl libicu-devel openssl-devel krb5-devel lttng-ust-devel pigz cpio elif [ "$ID" = "amzn" ]; then diff --git a/eng/common/post-build/redact-logs.ps1 b/eng/common/post-build/redact-logs.ps1 index b7fc195915079f..fc0218a013d16b 100644 --- a/eng/common/post-build/redact-logs.ps1 +++ b/eng/common/post-build/redact-logs.ps1 @@ -7,7 +7,9 @@ param( # File with strings to redact - separated by newlines. # For comments start the line with '# ' - such lines are ignored [Parameter(Mandatory=$false)][string] $TokensFilePath, - [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact + [Parameter(ValueFromRemainingArguments=$true)][String[]]$TokensToRedact, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeed, + [Parameter(Mandatory=$false)][string] $runtimeSourceFeedKey ) try { diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 9ae443f1c36b3f..b64b66a6275bb5 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -70,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4bc50bd568cae1..578705ee4dbdee 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 - $defaultXCopyMSBuildVersion = '17.14.16' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/eng/testing/workloads-testing.targets b/eng/testing/workloads-testing.targets index 4c21756db44e40..25b53de8d15d64 100644 --- a/eng/testing/workloads-testing.targets +++ b/eng/testing/workloads-testing.targets @@ -7,18 +7,19 @@ $([MSBuild]::NormalizeDirectory($(ArtifactsDir), 'packages', $(Configuration), 'Shipping')) + $(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel 10.0 + >$(_DotNetInstallScriptPath) -i $(_SdkWithNoWorkloadPath) -v latest -q daily --channel 11.0 $(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel 10.0 + >$(_DotNetInstallScriptPath) -InstallDir $(_SdkWithNoWorkloadPath) -Quality daily -Channel 11.0 $(SdkBandVersionForWorkload_FromRuntimeVersions) - - + + diff --git a/global.json b/global.json index 6767e8120de23b..855192d241c9fa 100644 --- a/global.json +++ b/global.json @@ -1,18 +1,18 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100-rc.3.25602.105", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-rc.2.25502.107" + "dotnet": "10.0.100-rc.3.25602.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25528.108", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25528.108", - "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25528.108", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25602.105", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25602.105", + "Microsoft.DotNet.SharedFramework.Sdk": "11.0.0-beta.25602.105", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", - "Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25528.108" + "Microsoft.NET.Sdk.IL": "10.0.0-rc.3.25602.105" } } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj index f2f89b4735bf3f..6a84242ae3c2d0 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/ILCompiler.ReadyToRun.csproj @@ -367,4 +367,8 @@ + + + + diff --git a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props index 708648df743f74..30cb047bc02ba2 100644 --- a/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props +++ b/src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props @@ -74,7 +74,7 @@ - + diff --git a/src/installer/pkg/sfx/installers/host.wxs b/src/installer/pkg/sfx/installers/host.wxs index 2f53e3ba54c1f8..066cf4dfbd0186 100644 --- a/src/installer/pkg/sfx/installers/host.wxs +++ b/src/installer/pkg/sfx/installers/host.wxs @@ -75,6 +75,12 @@ + + + +