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.

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

[main] Update dependencies from 7 repositories #58314

Merged
merged 15 commits into from
Aug 30, 2021
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli": {
"version": "1.0.0-prerelease.21426.1",
"version": "1.0.0-prerelease.21427.1",
"commands": [
"xharness"
]
Expand Down
108 changes: 54 additions & 54 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,83 +4,83 @@
<Uri>https://github.com/dotnet/icu</Uri>
<Sha>5c8d6612b9a8f0a0279df07286c35d3dbe62b2e3</Sha>
</Dependency>
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21425.1">
<Dependency Name="System.Net.MsQuic.Transport" Version="6.0.0-preview.7.21426.1">
<Uri>https://github.com/dotnet/msquic</Uri>
<Sha>5a2fcca17678a0c3a84f94a927db69e759fd955d</Sha>
<Sha>2966c909aa6637767f09395a5fd7a45c6e07b7e7</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0-rc.1.21416.1">
<Uri>https://github.com/dotnet/emsdk</Uri>
<Sha>9f2345b3c5f43dbf34790e21657ae1f2445cd06a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21427.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>870d4582f5fe1a8a7ca9a14cc1de0fc88ee4d4f6</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21425.3">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Test.Sdk" Version="16.9.0-preview-20201201-01">
<Uri>https://github.com/microsoft/vstest</Uri>
Expand Down Expand Up @@ -194,37 +194,37 @@
<Uri>https://github.com/mono/linker</Uri>
<Sha>38544e820223e60d0abe2801b2856cd124679522</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21426.1">
<Dependency Name="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21427.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>d78f6e0d1ed604c4409b6fdfc692dd08b27460a9</Sha>
<Sha>2e03d2d1081b606ad3c5f79709297a9c5627854d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21426.1">
<Dependency Name="Microsoft.DotNet.XHarness.CLI" Version="1.0.0-prerelease.21427.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>d78f6e0d1ed604c4409b6fdfc692dd08b27460a9</Sha>
<Sha>2e03d2d1081b606ad3c5f79709297a9c5627854d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21425.3">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="6.0.0-beta.21427.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>809cbb58dea1d1e477ab0e12855d1758d50844a8</Sha>
<Sha>474307e526160c813c9fd58060eb8356ccca6099</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21425.6">
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.21428.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>1c4754daafb919bfb6bcd995cbaf04f1b4010cfe</Sha>
<Sha>6ea283b355c3dfca6cbc6e0c146801d945e027ac</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21425.6">
<Dependency Name="optimization.windows_nt-x86.MIBC.Runtime" Version="1.0.0-prerelease.21428.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>1c4754daafb919bfb6bcd995cbaf04f1b4010cfe</Sha>
<Sha>6ea283b355c3dfca6cbc6e0c146801d945e027ac</Sha>
</Dependency>
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21425.6">
<Dependency Name="optimization.linux-x64.MIBC.Runtime" Version="1.0.0-prerelease.21428.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>1c4754daafb919bfb6bcd995cbaf04f1b4010cfe</Sha>
<Sha>6ea283b355c3dfca6cbc6e0c146801d945e027ac</Sha>
</Dependency>
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21425.6">
<Dependency Name="optimization.PGO.CoreCLR" Version="1.0.0-prerelease.21428.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
<Sha>1c4754daafb919bfb6bcd995cbaf04f1b4010cfe</Sha>
<Sha>6ea283b355c3dfca6cbc6e0c146801d945e027ac</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.2-alpha.0.21425.1">
<Dependency Name="Microsoft.DotNet.HotReload.Utils.Generator.BuildTool" Version="1.0.2-alpha.0.21427.1">
<Uri>https://github.com/dotnet/hotreload-utils</Uri>
<Sha>296d9b615300fe236c54721e5a50cacd843eeaf3</Sha>
<Sha>9072cbb58b1efe912c1b112265fcab18fa2a43df</Sha>
</Dependency>
<Dependency Name="System.Runtime.Numerics.TestData" Version="7.0.0-beta.21423.2">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand All @@ -234,9 +234,9 @@
<Uri>https://github.com/dotnet/roslyn-analyzers</Uri>
<Sha>9a1f02eff42635a5a9934735f12c722c3bfba8e8</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Compatibility" Version="1.0.0-rc.1.21426.17">
<Dependency Name="Microsoft.DotNet.Compatibility" Version="1.0.0-rc.1.21428.10">
<Uri>https://github.com/dotnet/sdk</Uri>
<Sha>c9baf2d5ea9d76cbef13b0dcd51877715c9b009a</Sha>
<Sha>813913938ba3893273952d966f423da72aca8963</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
46 changes: 23 additions & 23 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,22 @@
<MicrosoftCodeAnalysisCSharpVersion>3.10.0</MicrosoftCodeAnalysisCSharpVersion>
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-rc1.21413.4</MicrosoftCodeAnalysisNetAnalyzersVersion>
<!-- SDK dependencies -->
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.1.21426.17</MicrosoftDotNetCompatibilityVersion>
<MicrosoftDotNetCompatibilityVersion>1.0.0-rc.1.21428.10</MicrosoftDotNetCompatibilityVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21425.3</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21425.3</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21425.3</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21425.3</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21425.3</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21425.3</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21425.3</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21425.3</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21425.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21425.3</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21425.3</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21425.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21425.3</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21425.3</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.21427.6</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21427.6</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.21427.6</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.21427.6</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.21427.6</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.21427.6</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>6.0.0-beta.21427.6</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.21427.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.21427.6</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>6.0.0-beta.21427.6</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down Expand Up @@ -127,10 +127,10 @@
<SystemWindowsExtensionsTestDataVersion>7.0.0-beta.21423.2</SystemWindowsExtensionsTestDataVersion>
<MicrosoftDotNetCilStripSourcesVersion>7.0.0-beta.21423.2</MicrosoftDotNetCilStripSourcesVersion>
<!-- dotnet-optimization dependencies -->
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21425.6</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21425.6</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21425.6</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21425.6</optimizationPGOCoreCLRVersion>
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21428.5</optimizationwindows_ntx64MIBCRuntimeVersion>
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21428.5</optimizationwindows_ntx86MIBCRuntimeVersion>
<optimizationlinuxx64MIBCRuntimeVersion>1.0.0-prerelease.21428.5</optimizationlinuxx64MIBCRuntimeVersion>
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.21428.5</optimizationPGOCoreCLRVersion>
<!-- Not auto-updated. -->
<MicrosoftDiaSymReaderNativeVersion>16.9.0-beta1.21055.5</MicrosoftDiaSymReaderNativeVersion>
<SystemCommandLineVersion>2.0.0-beta1.20253.1</SystemCommandLineVersion>
Expand All @@ -154,9 +154,9 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21426.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21426.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.21425.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.21427.1</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.21427.1</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>1.0.2-alpha.0.21427.1</MicrosoftDotNetHotReloadUtilsGeneratorBuildToolVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
Expand All @@ -173,7 +173,7 @@
<!-- ICU -->
<MicrosoftNETCoreRuntimeICUTransportVersion>7.0.0-alpha.1.21423.1</MicrosoftNETCoreRuntimeICUTransportVersion>
<!-- MsQuic -->
<SystemNetMsQuicTransportVersion>6.0.0-preview.7.21425.1</SystemNetMsQuicTransportVersion>
<SystemNetMsQuicTransportVersion>6.0.0-preview.7.21426.1</SystemNetMsQuicTransportVersion>
<!-- Mono LLVM -->
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21423.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
<runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21423.1</runtimelinuxarm64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
Expand Down
5 changes: 1 addition & 4 deletions eng/common/cross/toolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
set(TOOLCHAIN "i686-linux-gnu")
elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
set(triple "x86_64-unknown-freebsd12")
set(triple "x86_64-unknown-freebsd11")
elseif (ILLUMOS)
set(CMAKE_SYSTEM_PROCESSOR "x86_64")
set(TOOLCHAIN "x86_64-illumos")
Expand Down Expand Up @@ -90,9 +90,6 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
set(CMAKE_C_COMPILER_TARGET ${triple})
set(CMAKE_CXX_COMPILER_TARGET ${triple})
set(CMAKE_ASM_COMPILER_TARGET ${triple})
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -fuse-ld=lld")
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
elseif(ILLUMOS)
set(CMAKE_SYSROOT "${CROSS_ROOTFS}")
Expand Down
2 changes: 1 addition & 1 deletion eng/common/native/find-native-compiler.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if [ -z "$CLR_CC" ]; then
# Set default versions
if [ -z "$majorVersion" ]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
if [ "$compiler" = "clang" ]; then versions=( 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
if [ "$compiler" = "clang" ]; then versions=( 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5 )
elif [ "$compiler" = "gcc" ]; then versions=( 9 8 7 6 5 4.9 ); fi

for version in "${versions[@]}"; do
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/job/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:

- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
- ${{ if eq(parameters.enableMicrobuild, 'true') }}:
- task: MicroBuildSigningPlugin@2
- task: MicroBuildSigningPlugin@3
displayName: Install MicroBuild plugin
inputs:
signType: $(_SignType)
Expand Down
Loading