diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5dbf8980ea163..968403269807c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "8.0.0-prerelease.23523.1", + "version": "9.0.0-prerelease.23526.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6d18bf4c0139c..278d57999a271 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -107,83 +107,83 @@ - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/xliff-tasks - d66a09c8b11e1235273c8e6cd946e5c8e247f189 + 83531fff1a39abe38de53e2e6b702bc1bb9c3bb4 - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae https://github.com/dotnet/runtime-assets @@ -318,21 +318,21 @@ https://github.com/dotnet/runtime 2959e1acd09aec0f1e59db9cbe41f3701b0bd4dd - + https://github.com/dotnet/xharness - 3fc757d9b48e116713d1e0e3a3bd111a588905cb + ab9528860ac51bb0aa6112fa2605b18c926594ef - + https://github.com/dotnet/xharness - 3fc757d9b48e116713d1e0e3a3bd111a588905cb + ab9528860ac51bb0aa6112fa2605b18c926594ef - + https://github.com/dotnet/xharness - 3fc757d9b48e116713d1e0e3a3bd111a588905cb + ab9528860ac51bb0aa6112fa2605b18c926594ef - + https://github.com/dotnet/arcade - 6a5ca678aef84f34a1fccc46f76623f41da56553 + 36d11a863c7ffc41e3730c806b0e98d32d1795ae https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -379,9 +379,9 @@ https://github.com/dotnet/roslyn-analyzers b4ed6a3093cfd3c8d353214ce97aaa7d24cf2df1 - + https://github.com/dotnet/sdk - 520797bdd9cf4ea016f28b14fa810aa295c931d6 + 92a2dbef8611cf00d92317e66611848143cdbfed diff --git a/eng/Versions.props b/eng/Versions.props index 477e04d50570f..e624284c9bc45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,24 +80,24 @@ 0.2.0 - 9.0.100-alpha.1.23524.12 + 9.0.100-alpha.1.23525.29 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 2.5.1-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 - 9.0.0-beta.23518.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 2.5.3-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 + 9.0.0-beta.23525.2 6.0.0-preview.1.102 @@ -178,9 +178,9 @@ 1.1.0 17.4.0-preview-20220707-01 - 8.0.0-prerelease.23523.1 - 8.0.0-prerelease.23523.1 - 8.0.0-prerelease.23523.1 + 9.0.0-prerelease.23526.1 + 9.0.0-prerelease.23526.1 + 9.0.0-prerelease.23526.1 9.0.0-alpha.0.23523.3 3.12.0 4.1.0 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index cb0aaa7606345..00288a300653a 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/13.1.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -98,7 +98,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -115,7 +115,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/13.1.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91f859..e8def7e6a85f2 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -158,7 +158,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { $env:DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we do not need all ASP.NET packages restored. - $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + $env:DOTNET_NOLOGO=1 # Disable telemetry on CI. if ($ci) { @@ -228,7 +228,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { Write-PipelinePrependPath -Path $dotnetRoot Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' - Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1' + Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943341d..710e64df967fd 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -112,7 +112,7 @@ function InitializeDotNetCli { export DOTNET_MULTILEVEL_LOOKUP=0 # Disable first run since we want to control all package sources - export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 + export DOTNET_NOLOGO=1 # Disable telemetry on CI if [[ $ci == true ]]; then @@ -165,7 +165,7 @@ function InitializeDotNetCli { Write-PipelinePrependPath -path "$dotnet_root" Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" - Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1" + Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value _InitializeDotNetCli="$dotnet_root" diff --git a/global.json b/global.json index a473434ed1a1d..b9ab9626f2361 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-rtm.23506.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23518.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23518.2", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23518.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23525.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23525.2", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.23525.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-alpha.1.23523.1" diff --git a/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs b/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs index 4f99005491b79..8afbf22547ddd 100644 --- a/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs +++ b/src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs @@ -72,16 +72,16 @@ public static int Main(string[] args) if (args[i].Equals("-notrait", StringComparison.OrdinalIgnoreCase)) { var traitKeyValue = args[i + 1].Split("=", StringSplitOptions.TrimEntries); - + if (!noTraits.TryGetValue(traitKeyValue[0], out List values)) { noTraits.Add(traitKeyValue[0], values = new List()); } - + values.Add(traitKeyValue[1]); i++; } - + if (args[i].Equals("-xml", StringComparison.OrdinalIgnoreCase)) { xmlResultFileName = args[i + 1].Trim(); @@ -167,6 +167,8 @@ public static int Main(string[] args) } } +// This is about running on desktop FX, which we don't do +#pragma warning disable xUnit3000 internal class ConsoleDiagnosticMessageSink : IMessageSink { public bool OnMessage(IMessageSinkMessage message) @@ -178,3 +180,4 @@ public bool OnMessage(IMessageSinkMessage message) return false; } } +#pragma warning restore xUnit3000