Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/sdk #93929

Merged
merged 11 commits into from
Oct 27, 2023
Merged

[main] Update dependencies from dotnet/arcade dotnet/xharness dotnet/sdk #93929

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
50f2780
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 24, 2023
232c4dd
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 25, 2023
78f3a8d
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 25, 2023
db02652
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 25, 2023
462413b
Update dependencies from https://github.com/dotnet/sdk build 20231025.7
dotnet-maestro[bot] Oct 25, 2023
3c8e07c
Update dependencies from https://github.com/dotnet/arcade build 20231…
dotnet-maestro[bot] Oct 26, 2023
c534184
Update dependencies from https://github.com/dotnet/xharness build 202…
dotnet-maestro[bot] Oct 26, 2023
716d217
Update dependencies from https://github.com/dotnet/sdk build 20231025.29
dotnet-maestro[bot] Oct 26, 2023
c8cdfc6
Try inheriting from LongLivedMarshalByRefObject
agocke Oct 26, 2023
cbc4ceb
Resolve XUnit ambiguity
agocke Oct 26, 2023
af79ffd
Just disable the warning
agocke Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .config/dotnet-tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "8.0.0-prerelease.23523.1",
"version": "9.0.0-prerelease.23526.1",
"commands": [
"xharness"
]
Expand Down
96 changes: 48 additions & 48 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,83 +107,83 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23516.1" CoherentParentDependency="Microsoft.DotNet.Helix.Sdk">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="1.0.0-beta.23523.1" CoherentParentDependency="Microsoft.DotNet.Helix.Sdk">
<Uri>https://github.com/dotnet/xliff-tasks</Uri>
<Sha>d66a09c8b11e1235273c8e6cd946e5c8e247f189</Sha>
<Sha>83531fff1a39abe38de53e2e6b702bc1bb9c3bb4</Sha>
<SourceBuild RepoName="xliff-tasks" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.23518.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.3-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="8.0.0-beta.23516.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -318,21 +318,21 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>2959e1acd09aec0f1e59db9cbe41f3701b0bd4dd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="8.0.0-prerelease.23523.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Common" Version="9.0.0-prerelease.23526.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3fc757d9b48e116713d1e0e3a3bd111a588905cb</Sha>
<Sha>ab9528860ac51bb0aa6112fa2605b18c926594ef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="8.0.0-prerelease.23523.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="9.0.0-prerelease.23526.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3fc757d9b48e116713d1e0e3a3bd111a588905cb</Sha>
<Sha>ab9528860ac51bb0aa6112fa2605b18c926594ef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="8.0.0-prerelease.23523.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="9.0.0-prerelease.23526.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3fc757d9b48e116713d1e0e3a3bd111a588905cb</Sha>
<Sha>ab9528860ac51bb0aa6112fa2605b18c926594ef</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.23518.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.23525.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>6a5ca678aef84f34a1fccc46f76623f41da56553</Sha>
<Sha>36d11a863c7ffc41e3730c806b0e98d32d1795ae</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.23521.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down Expand Up @@ -379,9 +379,9 @@
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>b4ed6a3093cfd3c8d353214ce97aaa7d24cf2df1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-alpha.1.23524.12">
<Dependency Name="Microsoft.DotNet.ApiCompat.Task" Version="9.0.100-alpha.1.23525.29">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>520797bdd9cf4ea016f28b14fa810aa295c931d6</Sha>
<Sha>92a2dbef8611cf00d92317e66611848143cdbfed</Sha>
<SourceBuild RepoName="sdk" ManagedOnly="true" />
</Dependency>
<Dependency Name="optimization.windows_nt-arm64.MIBC.Runtime" Version="1.0.0-prerelease.23521.3">
Expand Down
40 changes: 20 additions & 20 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,24 +80,24 @@
<PropertyGroup>
<StaticCsVersion>0.2.0</StaticCsVersion>
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-alpha.1.23524.12</MicrosoftDotNetApiCompatTaskVersion>
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-alpha.1.23525.29</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23518.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.23518.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.23518.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>9.0.0-beta.23518.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23518.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.23518.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.23518.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23518.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.23518.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.23518.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.23525.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.23525.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.23525.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.23525.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>9.0.0-beta.23525.2</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.23525.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.3-beta.23525.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.23525.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.23525.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.23525.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.23525.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.23525.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.23525.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.23525.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.23525.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.23525.2</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -178,9 +178,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.1.0</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>17.4.0-preview-20220707-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>8.0.0-prerelease.23523.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>8.0.0-prerelease.23523.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>8.0.0-prerelease.23523.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersCommonVersion>9.0.0-prerelease.23526.1</MicrosoftDotNetXHarnessTestRunnersCommonVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>9.0.0-prerelease.23526.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>9.0.0-prerelease.23526.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>9.0.0-alpha.0.23523.3</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<NUnitVersion>3.12.0</NUnitVersion>
<NUnitTestAdapterVersion>4.1.0</NUnitTestAdapterVersion>
Expand Down
8 changes: 4 additions & 4 deletions eng/common/cross/toolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")
Expand Down Expand Up @@ -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")
Expand All @@ -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!")
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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
}
Expand Down
4 changes: 2 additions & 2 deletions eng/common/tools.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 6 additions & 3 deletions src/libraries/Common/tests/SingleFileTestRunner/SingleFileTestRunner.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<string> values))
{
noTraits.Add(traitKeyValue[0], values = new List<string>());
}

values.Add(traitKeyValue[1]);
i++;
}

if (args[i].Equals("-xml", StringComparison.OrdinalIgnoreCase))
{
xmlResultFileName = args[i + 1].Trim();
Expand Down Expand Up @@ -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)
Expand All @@ -178,3 +180,4 @@ public bool OnMessage(IMessageSinkMessage message)
return false;
}
}
#pragma warning restore xUnit3000
Loading