diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0e2df9db976801..6d506b4601907f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -27,7 +27,7 @@ ] }, "microsoft.dotnet.helix.jobmonitor": { - "version": "11.0.0-beta.26431.109", + "version": "11.0.0-beta.26458.102", "commands": [ "dotnet-helix-job-monitor" ] diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fe0ce626278ba7..a30c32c1263e91 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,47 +6,47 @@ This file should be imported by eng/Versions.props - 5.12.0-1.26431.109 - 5.12.0-1.26431.109 - 5.12.0-1.26431.109 - 5.12.0-1.26431.109 - 11.0.100-rc.1.26431.109 - 11.0.100-rc.1.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 0.11.5-preview.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 11.0.0-beta.26431.109 - 2.9.3-beta.26431.109 - 11.0.0-beta.26431.109 - 5.12.0-1.26431.109 - 11.0.0-rc.1.26431.109 - 11.0.0-rc.1.26431.109 - 11.0.100-rc.1.26431.109 - 11.0.0-rc.1.26431.109 - 11.0.0-rc.1.26431.109 - 7.11.0-rc.43209 - 7.11.0-rc.43209 - 7.11.0-rc.43209 - 7.11.0-rc.43209 - 11.0.0-rc.1.26431.109 - 3.0.0-rc.1.26431.109 - 11.0.0-rc.1.26431.109 - 11.0.0-rc.1.26431.109 - 11.0.0-rc.1.26431.109 + 5.12.0-1.26458.102 + 5.12.0-1.26458.102 + 5.12.0-1.26458.102 + 5.12.0-1.26458.102 + 12.0.100-alpha.1.26458.102 + 12.0.100-alpha.1.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 0.11.5-preview.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 12.0.100-alpha.1.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 11.0.0-beta.26458.102 + 2.9.3-beta.26458.102 + 11.0.0-beta.26458.102 + 5.12.0-1.26458.102 + 12.0.0-alpha.1.26458.102 + 12.0.0-alpha.1.26458.102 + 12.0.0-alpha.1.26458.102 + 12.0.0-alpha.1.26458.102 + 7.12.0-rc.45902 + 7.12.0-rc.45902 + 7.12.0-rc.45902 + 7.12.0-rc.45902 + 12.0.0-alpha.1.26458.102 + 4.0.0-alpha.1.26458.102 + 12.0.0-alpha.1.26458.102 + 12.0.0-alpha.1.26458.102 + 12.0.0-alpha.1.26458.102 11.0.0-alpha.1.26418.1 @@ -137,6 +137,7 @@ This file should be imported by eng/Versions.props $(MicrosoftDotNetCecilPackageVersion) $(MicrosoftDotNetCodeAnalysisPackageVersion) $(MicrosoftDotNetGenAPIPackageVersion) + $(MicrosoftDotNetGenAPITaskPackageVersion) $(MicrosoftDotNetGenFacadesPackageVersion) $(MicrosoftDotNetHelixJobMonitorPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) @@ -149,7 +150,6 @@ This file should be imported by eng/Versions.props $(MicrosoftNetCompilersToolsetPackageVersion) $(MicrosoftNETRuntimeEmscriptenInternalPackageVersion) $(MicrosoftNETSdkILPackageVersion) - $(MicrosoftNETWorkloadEmscriptenCurrentManifest110100TransportPackageVersion) $(MicrosoftNETCoreAppRefPackageVersion) $(MicrosoftNETCoreILAsmPackageVersion) $(NuGetFrameworksPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0345922c6a45c2..daa1f0ed991ed0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,5 +1,5 @@ - + https://github.com/dotnet/icu @@ -37,91 +37,91 @@ https://github.com/dotnet/llvm-project 32664a0f03b10a2f35eae1fa2a680e7620d82c8b - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c - - - https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + + https://github.com/dotnet/dotnet + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 + + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 https://github.com/dotnet/runtime-assets @@ -259,33 +259,33 @@ https://github.com/dotnet/llvm-project 32664a0f03b10a2f35eae1fa2a680e7620d82c8b - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 https://github.com/dotnet/xharness @@ -299,9 +299,9 @@ https://github.com/dotnet/xharness f10844a1593bd12a5b59046798831ead3eeef2e0 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -323,33 +323,33 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -361,21 +361,21 @@ - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 https://github.com/dotnet/node @@ -417,9 +417,9 @@ https://github.com/dotnet/runtime-assets 13b701d371826c168b26d581351422c031089faa - + https://github.com/dotnet/dotnet - 4f8bdb66a033b551cc724f902111718ef5ca986c + 73ec55960bb496e6b2541b2fcf0a59576d1f8cd3 diff --git a/eng/Versions.props b/eng/Versions.props index 257d4700483fa9..db10b03b26048c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,9 +4,9 @@ - 11.0.0 + 12.0.0 - 11 + 12 0 0 10.0.0 @@ -14,20 +14,18 @@ 8.0.$([MSBuild]::Add($([System.Version]::Parse('$(PackageVersionNet9)').Build),11)) 7.0.20 6.0.36 - rc + alpha 1 false release + Use an SDK-versioned VMR package if it is newer than the SDK specified in global.json. --> <_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>$(MicrosoftNETWorkloadEmscriptenCurrentManifest110100TransportVersion) + <_DotnetSdkVersion>$(MicrosoftDotNetGenAPITaskPackageVersion) $(_DotnetSdkVersion) $(_GlobalJsonSdkVersion) $([System.String]::Copy('$(SdkVersionForWorkloadTesting)').Split('.')[0]) @@ -38,7 +36,13 @@ - $(MajorVersion).$(MinorVersion).0.0 + + + 11.0.0.0 false diff --git a/eng/common/init-tools-native.sh b/eng/common/init-tools-native.sh index 3e6a8d6acf2f57..4de1a04fee3875 100755 --- a/eng/common/init-tools-native.sh +++ b/eng/common/init-tools-native.sh @@ -60,8 +60,8 @@ while (($# > 0)); do echo " - (default) %USERPROFILE%/.netcoreeng/native" echo "" echo " --clean Switch specifying not to install anything, but cleanup native asset folders" - echo " --donotabortonfailure Switch specifiying whether to abort native tools installation on failure" - echo " --donotdisplaywarnings Switch specifiying whether to display warnings during native tools installation on failure" + echo " --donotabortonfailure Switch specifying whether to abort native tools installation on failure" + echo " --donotdisplaywarnings Switch specifying whether to display warnings during native tools installation on failure" echo " --force Clean and then install tools" echo " --help Print help and exit" echo "" @@ -83,7 +83,7 @@ function ReadGlobalJsonNativeTools { # KEY="" VALUE="" # followed by a null byte. # - # bash: read line with null byte delimeter and push to array (for later `eval`uation). + # bash: read line with null byte delimiter and push to array (for later `eval`uation). while IFS= read -rd '' line; do native_assets+=("$line") diff --git a/eng/common/loc/P22DotNetHtmlLocalization.lss b/eng/common/loc/P22DotNetHtmlLocalization.lss index 5d892d619398f9..c810350e58705c 100644 --- a/eng/common/loc/P22DotNetHtmlLocalization.lss +++ b/eng/common/loc/P22DotNetHtmlLocalization.lss @@ -16,7 +16,7 @@ - + + ReferenceOutputAssembly="false" + Private="false" /> - 11.0.0-{{versionSuffix}} - 11.0.0-{{versionSuffix}} - 11.0.0-{{versionSuffix}} - browser-wasm;%(RuntimePackRuntimeIdentifiers) + + {{runtimePackVersion}} + {{runtimePackVersion}} + browser-wasm;%(RuntimePackRuntimeIdentifiers) """; insertAtEnd += $$""" - + - 11.0.0-{{versionSuffix}} + {{runtimePackVersion}}