[main] Update dependencies from dotnet/arcade#102488

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

Merged
ericstj merged 3 commits into from
May 23, 2024
Merged

[main] Update dependencies from dotnet/arcade #102488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93681e4
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] May 21, 2024
4639a53
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] May 22, 2024
016b390
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] May 23, 2024
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
84 changes: 42 additions & 42 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24266.1">
<Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24266.1">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24263.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>8cbf240a033d37ab8ebae11726bb3f867cfeb9e3</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24266.1">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
<Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24263.1</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24266.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24266.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24266.1</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
<!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
<XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
<!-- NuGet dependencies -->
Expand Down
6 changes: 3 additions & 3 deletions eng/common/core-templates/job/source-index-stage1.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
parameters:
runAsPublic: false
sourceIndexUploadPackageVersion: 2.0.0-20240502.12
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
sourceIndexUploadPackageVersion: 2.0.0-20240522.1
sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps: []
Expand DownExpand Up@@ -88,4 +88,4 @@ jobs:
displayName: "Login to Azure"

- script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
displayName: Upload stage1 artifacts to source index
displayName: Upload stage1 artifacts to source index
5 changes: 5 additions & 0 deletions eng/common/internal/Directory.Build.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

<PropertyGroup>
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
<ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
</PropertyGroup>

<Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

</Project>
1 change: 0 additions & 1 deletion eng/common/internal/Tools.csproj
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

<PropertyGroup>
<TargetFramework>net472</TargetFramework>
<ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
</PropertyGroup>
<ItemGroup>
Expand Down
85 changes: 55 additions & 30 deletions eng/common/native/init-compiler.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure
# to not output *anything* here, unless it is an error message that fails the
# build.

if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
echo "Usage..."
Expand DownExpand Up@@ -58,6 +60,26 @@ check_version_exists() {
echo "$desired_version"
}

__baseOS="$(uname)"
set_compiler_version_from_CC() {
if [ "$__baseOS" = "Darwin" ]; then
# On Darwin, the versions from -version/-dumpversion refer to Xcode
# versions, not llvm versions, so we can't rely on them.
return
fi

version="$("$CC" -dumpversion)"
if [ -z "$version" ]; then
echo "Error: $CC -dumpversion didn't provide a version"
exit 1
fi

# gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
IFS=. read -r majorVersion minorVersion _ <<EOF
$version
EOF
}

if [ -z "$CLR_CC" ]; then

# Set default versions
Expand All@@ -74,64 +96,67 @@ if [ -z "$CLR_CC" ]; then
done

if [ -z "$majorVersion" ]; then
if command -v "$compiler" > /dev/null; then
if [ "$(uname)" != "Darwin" ]; then
echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
fi
CC="$(command -v "$compiler")"
CXX="$(command -v "$cxxCompiler")"
else
echo "No usable version of $compiler found."
if ! command -v "$compiler" > /dev/null; then
echo "Error: No usable version of $compiler found."
exit 1
fi

CC="$(command -v "$compiler" 2> /dev/null)"
CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
set_compiler_version_from_CC
else
if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
if command -v "$compiler" > /dev/null; then
echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
CC="$(command -v "$compiler")"
CXX="$(command -v "$cxxCompiler")"
else
echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
exit 1
fi
if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
# If a major version was provided explicitly, and it was too old, find a newer compiler instead
if ! command -v "$compiler" > /dev/null; then
echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
exit 1
fi

CC="$(command -v "$compiler" 2> /dev/null)"
CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
set_compiler_version_from_CC
fi
fi
else
desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
if [ "$desired_version" = "-1" ]; then
echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
exit 1
fi
fi

if [ -z "$CC" ]; then
CC="$(command -v "$compiler$desired_version")"
CXX="$(command -v "$cxxCompiler$desired_version")"
if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
set_compiler_version_from_CC
fi
else
if [ ! -f "$CLR_CC" ]; then
echo "CLR_CC is set but path '$CLR_CC' does not exist"
echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
exit 1
fi
CC="$CLR_CC"
CXX="$CLR_CXX"
set_compiler_version_from_CC
fi

if [ -z "$CC" ]; then
echo "Unable to find $compiler."
echo "Error: Unable to find $compiler."
exit 1
fi

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
LDFLAGS="-fuse-ld=lld"
if [ "$__baseOS" != "Darwin" ]; then
# On Darwin, we always want to use the Apple linker.

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
LDFLAGS="-fuse-ld=lld"
fi
fi
fi

SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"

export CC CXX LDFLAGS SCAN_BUILD_COMMAND
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102488

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

 Merged

ericstj
merged 3 commits into

from

May 23, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102488
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
93681e4

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 21, 2024
4639a53

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 22, 2024
016b390

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 23, 2024

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


84 changes: 42 additions & 42 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24263.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8cbf240a033d37ab8ebae11726bb3f867cfeb9e3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24263.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24266.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24266.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24266.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/core-templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
parameters:
 runAsPublic: false
 sourceIndexUploadPackageVersion: 2.0.0-20240502.12
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
 sourceIndexUploadPackageVersion: 2.0.0-20240522.1
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
 preSteps: []
Expand DownExpand Up@@ -88,4 +88,4 @@ jobs:
 displayName: "Login to Azure"

 - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
 displayName: Upload stage1 artifacts to source index
 displayName: Upload stage1 artifacts to source index

5 changes: 5 additions & 0 deletions
eng/common/internal/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

 <PropertyGroup>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
 </PropertyGroup>

 <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

</Project>

1 change: 0 additions & 1 deletion
eng/common/internal/Tools.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

 <PropertyGroup>
 <TargetFramework>net472</TargetFramework>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
 </PropertyGroup>
 <ItemGroup>
Expand Down

85 changes: 55 additions & 30 deletions
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure
# to not output *anything* here, unless it is an error message that fails the
# build.

if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
 echo "Usage..."
Expand DownExpand Up@@ -58,6 +60,26 @@ check_version_exists() {
 echo "$desired_version"
}

__baseOS="$(uname)"
set_compiler_version_from_CC() {
 if [ "$__baseOS" = "Darwin" ]; then
 # On Darwin, the versions from -version/-dumpversion refer to Xcode
 # versions, not llvm versions, so we can't rely on them.
 return
 fi

 version="$("$CC" -dumpversion)"
 if [ -z "$version" ]; then
 echo "Error: $CC -dumpversion didn't provide a version"
 exit 1
 fi

 # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
 IFS=. read -r majorVersion minorVersion _ <<EOF
$version
EOF
}

if [ -z "$CLR_CC" ]; then

 # Set default versions
Expand All@@ -74,64 +96,67 @@ if [ -z "$CLR_CC" ]; then
 done

 if [ -z "$majorVersion" ]; then
 if command -v "$compiler" > /dev/null; then
 if [ "$(uname)" != "Darwin" ]; then
 echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
 fi
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "No usable version of $compiler found."
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: No usable version of $compiler found."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 else
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
 if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
 if command -v "$compiler" > /dev/null; then
 echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
 # If a major version was provided explicitly, and it was too old, find a newer compiler instead
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 fi
 fi
 else
 desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
 if [ "$desired_version" = "-1" ]; then
 echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
 echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
 exit 1
 fi
 fi

 if [ -z "$CC" ]; then
 CC="$(command -v "$compiler$desired_version")"
 CXX="$(command -v "$cxxCompiler$desired_version")"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
 CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
 set_compiler_version_from_CC
 fi
else
 if [ ! -f "$CLR_CC" ]; then
 echo "CLR_CC is set but path '$CLR_CC' does not exist"
 echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
 exit 1
 fi
 CC="$CLR_CC"
 CXX="$CLR_CXX"
 set_compiler_version_from_CC
fi

if [ -z "$CC" ]; then
 echo "Unable to find $compiler."
 echo "Error: Unable to find $compiler."
 exit 1
fi

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
if [ "$__baseOS" != "Darwin" ]; then
 # On Darwin, we always want to use the Apple linker.

 # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
 if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
 fi
 fi
fi

SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"

export CC CXX LDFLAGS SCAN_BUILD_COMMAND
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102488

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

 Merged

ericstj
merged 3 commits into

from

May 23, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102488
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
93681e4

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 21, 2024
4639a53

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 22, 2024
016b390

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 23, 2024

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


84 changes: 42 additions & 42 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24263.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8cbf240a033d37ab8ebae11726bb3f867cfeb9e3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24263.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24266.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24266.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24266.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/core-templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
parameters:
 runAsPublic: false
 sourceIndexUploadPackageVersion: 2.0.0-20240502.12
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
 sourceIndexUploadPackageVersion: 2.0.0-20240522.1
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
 preSteps: []
Expand DownExpand Up@@ -88,4 +88,4 @@ jobs:
 displayName: "Login to Azure"

 - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
 displayName: Upload stage1 artifacts to source index
 displayName: Upload stage1 artifacts to source index

5 changes: 5 additions & 0 deletions
eng/common/internal/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

 <PropertyGroup>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
 </PropertyGroup>

 <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

</Project>

1 change: 0 additions & 1 deletion
eng/common/internal/Tools.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

 <PropertyGroup>
 <TargetFramework>net472</TargetFramework>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
 </PropertyGroup>
 <ItemGroup>
Expand Down

85 changes: 55 additions & 30 deletions
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure
# to not output *anything* here, unless it is an error message that fails the
# build.

if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
 echo "Usage..."
Expand DownExpand Up@@ -58,6 +60,26 @@ check_version_exists() {
 echo "$desired_version"
}

__baseOS="$(uname)"
set_compiler_version_from_CC() {
 if [ "$__baseOS" = "Darwin" ]; then
 # On Darwin, the versions from -version/-dumpversion refer to Xcode
 # versions, not llvm versions, so we can't rely on them.
 return
 fi

 version="$("$CC" -dumpversion)"
 if [ -z "$version" ]; then
 echo "Error: $CC -dumpversion didn't provide a version"
 exit 1
 fi

 # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
 IFS=. read -r majorVersion minorVersion _ <<EOF
$version
EOF
}

if [ -z "$CLR_CC" ]; then

 # Set default versions
Expand All@@ -74,64 +96,67 @@ if [ -z "$CLR_CC" ]; then
 done

 if [ -z "$majorVersion" ]; then
 if command -v "$compiler" > /dev/null; then
 if [ "$(uname)" != "Darwin" ]; then
 echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
 fi
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "No usable version of $compiler found."
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: No usable version of $compiler found."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 else
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
 if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
 if command -v "$compiler" > /dev/null; then
 echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
 # If a major version was provided explicitly, and it was too old, find a newer compiler instead
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 fi
 fi
 else
 desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
 if [ "$desired_version" = "-1" ]; then
 echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
 echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
 exit 1
 fi
 fi

 if [ -z "$CC" ]; then
 CC="$(command -v "$compiler$desired_version")"
 CXX="$(command -v "$cxxCompiler$desired_version")"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
 CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
 set_compiler_version_from_CC
 fi
else
 if [ ! -f "$CLR_CC" ]; then
 echo "CLR_CC is set but path '$CLR_CC' does not exist"
 echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
 exit 1
 fi
 CC="$CLR_CC"
 CXX="$CLR_CXX"
 set_compiler_version_from_CC
fi

if [ -z "$CC" ]; then
 echo "Unable to find $compiler."
 echo "Error: Unable to find $compiler."
 exit 1
fi

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
if [ "$__baseOS" != "Darwin" ]; then
 # On Darwin, we always want to use the Apple linker.

 # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
 if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
 fi
 fi
fi

SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"

export CC CXX LDFLAGS SCAN_BUILD_COMMAND
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102488

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

 Merged

ericstj
merged 3 commits into

from

May 23, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102488
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
93681e4

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 21, 2024
4639a53

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 22, 2024
016b390

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 23, 2024

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


84 changes: 42 additions & 42 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24263.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8cbf240a033d37ab8ebae11726bb3f867cfeb9e3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24263.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24266.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24266.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24266.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/core-templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
parameters:
 runAsPublic: false
 sourceIndexUploadPackageVersion: 2.0.0-20240502.12
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
 sourceIndexUploadPackageVersion: 2.0.0-20240522.1
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
 preSteps: []
Expand DownExpand Up@@ -88,4 +88,4 @@ jobs:
 displayName: "Login to Azure"

 - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
 displayName: Upload stage1 artifacts to source index
 displayName: Upload stage1 artifacts to source index

5 changes: 5 additions & 0 deletions
eng/common/internal/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

 <PropertyGroup>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
 </PropertyGroup>

 <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

</Project>

1 change: 0 additions & 1 deletion
eng/common/internal/Tools.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

 <PropertyGroup>
 <TargetFramework>net472</TargetFramework>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
 </PropertyGroup>
 <ItemGroup>
Expand Down

85 changes: 55 additions & 30 deletions
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure
# to not output *anything* here, unless it is an error message that fails the
# build.

if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
 echo "Usage..."
Expand DownExpand Up@@ -58,6 +60,26 @@ check_version_exists() {
 echo "$desired_version"
}

__baseOS="$(uname)"
set_compiler_version_from_CC() {
 if [ "$__baseOS" = "Darwin" ]; then
 # On Darwin, the versions from -version/-dumpversion refer to Xcode
 # versions, not llvm versions, so we can't rely on them.
 return
 fi

 version="$("$CC" -dumpversion)"
 if [ -z "$version" ]; then
 echo "Error: $CC -dumpversion didn't provide a version"
 exit 1
 fi

 # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
 IFS=. read -r majorVersion minorVersion _ <<EOF
$version
EOF
}

if [ -z "$CLR_CC" ]; then

 # Set default versions
Expand All@@ -74,64 +96,67 @@ if [ -z "$CLR_CC" ]; then
 done

 if [ -z "$majorVersion" ]; then
 if command -v "$compiler" > /dev/null; then
 if [ "$(uname)" != "Darwin" ]; then
 echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
 fi
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "No usable version of $compiler found."
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: No usable version of $compiler found."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 else
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
 if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
 if command -v "$compiler" > /dev/null; then
 echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
 # If a major version was provided explicitly, and it was too old, find a newer compiler instead
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 fi
 fi
 else
 desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
 if [ "$desired_version" = "-1" ]; then
 echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
 echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
 exit 1
 fi
 fi

 if [ -z "$CC" ]; then
 CC="$(command -v "$compiler$desired_version")"
 CXX="$(command -v "$cxxCompiler$desired_version")"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
 CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
 set_compiler_version_from_CC
 fi
else
 if [ ! -f "$CLR_CC" ]; then
 echo "CLR_CC is set but path '$CLR_CC' does not exist"
 echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
 exit 1
 fi
 CC="$CLR_CC"
 CXX="$CLR_CXX"
 set_compiler_version_from_CC
fi

if [ -z "$CC" ]; then
 echo "Unable to find $compiler."
 echo "Error: Unable to find $compiler."
 exit 1
fi

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
if [ "$__baseOS" != "Darwin" ]; then
 # On Darwin, we always want to use the Apple linker.

 # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
 if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
 fi
 fi
fi

SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"

export CC CXX LDFLAGS SCAN_BUILD_COMMAND
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102488

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

 Merged

ericstj
merged 3 commits into

from

May 23, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102488
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
93681e4

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 21, 2024
4639a53

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 22, 2024
016b390

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 23, 2024

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


84 changes: 42 additions & 42 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24263.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8cbf240a033d37ab8ebae11726bb3f867cfeb9e3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24263.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24266.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24266.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24266.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/core-templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
parameters:
 runAsPublic: false
 sourceIndexUploadPackageVersion: 2.0.0-20240502.12
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
 sourceIndexUploadPackageVersion: 2.0.0-20240522.1
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
 preSteps: []
Expand DownExpand Up@@ -88,4 +88,4 @@ jobs:
 displayName: "Login to Azure"

 - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
 displayName: Upload stage1 artifacts to source index
 displayName: Upload stage1 artifacts to source index

5 changes: 5 additions & 0 deletions
eng/common/internal/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

 <PropertyGroup>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
 </PropertyGroup>

 <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

</Project>

1 change: 0 additions & 1 deletion
eng/common/internal/Tools.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

 <PropertyGroup>
 <TargetFramework>net472</TargetFramework>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
 </PropertyGroup>
 <ItemGroup>
Expand Down

85 changes: 55 additions & 30 deletions
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure
# to not output *anything* here, unless it is an error message that fails the
# build.

if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
 echo "Usage..."
Expand DownExpand Up@@ -58,6 +60,26 @@ check_version_exists() {
 echo "$desired_version"
}

__baseOS="$(uname)"
set_compiler_version_from_CC() {
 if [ "$__baseOS" = "Darwin" ]; then
 # On Darwin, the versions from -version/-dumpversion refer to Xcode
 # versions, not llvm versions, so we can't rely on them.
 return
 fi

 version="$("$CC" -dumpversion)"
 if [ -z "$version" ]; then
 echo "Error: $CC -dumpversion didn't provide a version"
 exit 1
 fi

 # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
 IFS=. read -r majorVersion minorVersion _ <<EOF
$version
EOF
}

if [ -z "$CLR_CC" ]; then

 # Set default versions
Expand All@@ -74,64 +96,67 @@ if [ -z "$CLR_CC" ]; then
 done

 if [ -z "$majorVersion" ]; then
 if command -v "$compiler" > /dev/null; then
 if [ "$(uname)" != "Darwin" ]; then
 echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
 fi
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "No usable version of $compiler found."
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: No usable version of $compiler found."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 else
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
 if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
 if command -v "$compiler" > /dev/null; then
 echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
 # If a major version was provided explicitly, and it was too old, find a newer compiler instead
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 fi
 fi
 else
 desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
 if [ "$desired_version" = "-1" ]; then
 echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
 echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
 exit 1
 fi
 fi

 if [ -z "$CC" ]; then
 CC="$(command -v "$compiler$desired_version")"
 CXX="$(command -v "$cxxCompiler$desired_version")"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
 CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
 set_compiler_version_from_CC
 fi
else
 if [ ! -f "$CLR_CC" ]; then
 echo "CLR_CC is set but path '$CLR_CC' does not exist"
 echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
 exit 1
 fi
 CC="$CLR_CC"
 CXX="$CLR_CXX"
 set_compiler_version_from_CC
fi

if [ -z "$CC" ]; then
 echo "Unable to find $compiler."
 echo "Error: Unable to find $compiler."
 exit 1
fi

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
if [ "$__baseOS" != "Darwin" ]; then
 # On Darwin, we always want to use the Apple linker.

 # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
 if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
 fi
 fi
fi

SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"

export CC CXX LDFLAGS SCAN_BUILD_COMMAND
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102488

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

 Merged

ericstj
merged 3 commits into

from

May 23, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102488
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
93681e4

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 21, 2024
4639a53

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 22, 2024
016b390

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 23, 2024

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


84 changes: 42 additions & 42 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24263.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8cbf240a033d37ab8ebae11726bb3f867cfeb9e3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24263.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24266.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24266.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24266.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/core-templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
parameters:
 runAsPublic: false
 sourceIndexUploadPackageVersion: 2.0.0-20240502.12
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
 sourceIndexUploadPackageVersion: 2.0.0-20240522.1
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
 preSteps: []
Expand DownExpand Up@@ -88,4 +88,4 @@ jobs:
 displayName: "Login to Azure"

 - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
 displayName: Upload stage1 artifacts to source index
 displayName: Upload stage1 artifacts to source index

5 changes: 5 additions & 0 deletions
eng/common/internal/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

 <PropertyGroup>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
 </PropertyGroup>

 <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

</Project>

1 change: 0 additions & 1 deletion
eng/common/internal/Tools.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

 <PropertyGroup>
 <TargetFramework>net472</TargetFramework>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
 </PropertyGroup>
 <ItemGroup>
Expand Down

85 changes: 55 additions & 30 deletions
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure
# to not output *anything* here, unless it is an error message that fails the
# build.

if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
 echo "Usage..."
Expand DownExpand Up@@ -58,6 +60,26 @@ check_version_exists() {
 echo "$desired_version"
}

__baseOS="$(uname)"
set_compiler_version_from_CC() {
 if [ "$__baseOS" = "Darwin" ]; then
 # On Darwin, the versions from -version/-dumpversion refer to Xcode
 # versions, not llvm versions, so we can't rely on them.
 return
 fi

 version="$("$CC" -dumpversion)"
 if [ -z "$version" ]; then
 echo "Error: $CC -dumpversion didn't provide a version"
 exit 1
 fi

 # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
 IFS=. read -r majorVersion minorVersion _ <<EOF
$version
EOF
}

if [ -z "$CLR_CC" ]; then

 # Set default versions
Expand All@@ -74,64 +96,67 @@ if [ -z "$CLR_CC" ]; then
 done

 if [ -z "$majorVersion" ]; then
 if command -v "$compiler" > /dev/null; then
 if [ "$(uname)" != "Darwin" ]; then
 echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
 fi
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "No usable version of $compiler found."
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: No usable version of $compiler found."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 else
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
 if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
 if command -v "$compiler" > /dev/null; then
 echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
 # If a major version was provided explicitly, and it was too old, find a newer compiler instead
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 fi
 fi
 else
 desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
 if [ "$desired_version" = "-1" ]; then
 echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
 echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
 exit 1
 fi
 fi

 if [ -z "$CC" ]; then
 CC="$(command -v "$compiler$desired_version")"
 CXX="$(command -v "$cxxCompiler$desired_version")"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
 CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
 set_compiler_version_from_CC
 fi
else
 if [ ! -f "$CLR_CC" ]; then
 echo "CLR_CC is set but path '$CLR_CC' does not exist"
 echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
 exit 1
 fi
 CC="$CLR_CC"
 CXX="$CLR_CXX"
 set_compiler_version_from_CC
fi

if [ -z "$CC" ]; then
 echo "Unable to find $compiler."
 echo "Error: Unable to find $compiler."
 exit 1
fi

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
if [ "$__baseOS" != "Darwin" ]; then
 # On Darwin, we always want to use the Apple linker.

 # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
 if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
 fi
 fi
fi

SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"

export CC CXX LDFLAGS SCAN_BUILD_COMMAND
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
[main] Update dependencies from dotnet/arcade#102488

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

 Merged

ericstj
merged 3 commits into

from

May 23, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102488
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
93681e4

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 21, 2024
4639a53

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 22, 2024
016b390

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 23, 2024

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


84 changes: 42 additions & 42 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24263.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8cbf240a033d37ab8ebae11726bb3f867cfeb9e3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24263.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24266.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24266.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24266.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/core-templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
parameters:
 runAsPublic: false
 sourceIndexUploadPackageVersion: 2.0.0-20240502.12
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
 sourceIndexUploadPackageVersion: 2.0.0-20240522.1
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
 preSteps: []
Expand DownExpand Up@@ -88,4 +88,4 @@ jobs:
 displayName: "Login to Azure"

 - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
 displayName: Upload stage1 artifacts to source index
 displayName: Upload stage1 artifacts to source index

5 changes: 5 additions & 0 deletions
eng/common/internal/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

 <PropertyGroup>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
 </PropertyGroup>

 <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

</Project>

1 change: 0 additions & 1 deletion
eng/common/internal/Tools.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

 <PropertyGroup>
 <TargetFramework>net472</TargetFramework>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
 </PropertyGroup>
 <ItemGroup>
Expand Down

85 changes: 55 additions & 30 deletions
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure
# to not output *anything* here, unless it is an error message that fails the
# build.

if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
 echo "Usage..."
Expand DownExpand Up@@ -58,6 +60,26 @@ check_version_exists() {
 echo "$desired_version"
}

__baseOS="$(uname)"
set_compiler_version_from_CC() {
 if [ "$__baseOS" = "Darwin" ]; then
 # On Darwin, the versions from -version/-dumpversion refer to Xcode
 # versions, not llvm versions, so we can't rely on them.
 return
 fi

 version="$("$CC" -dumpversion)"
 if [ -z "$version" ]; then
 echo "Error: $CC -dumpversion didn't provide a version"
 exit 1
 fi

 # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
 IFS=. read -r majorVersion minorVersion _ <<EOF
$version
EOF
}

if [ -z "$CLR_CC" ]; then

 # Set default versions
Expand All@@ -74,64 +96,67 @@ if [ -z "$CLR_CC" ]; then
 done

 if [ -z "$majorVersion" ]; then
 if command -v "$compiler" > /dev/null; then
 if [ "$(uname)" != "Darwin" ]; then
 echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
 fi
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "No usable version of $compiler found."
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: No usable version of $compiler found."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 else
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
 if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
 if command -v "$compiler" > /dev/null; then
 echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
 # If a major version was provided explicitly, and it was too old, find a newer compiler instead
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 fi
 fi
 else
 desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
 if [ "$desired_version" = "-1" ]; then
 echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
 echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
 exit 1
 fi
 fi

 if [ -z "$CC" ]; then
 CC="$(command -v "$compiler$desired_version")"
 CXX="$(command -v "$cxxCompiler$desired_version")"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
 CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
 set_compiler_version_from_CC
 fi
else
 if [ ! -f "$CLR_CC" ]; then
 echo "CLR_CC is set but path '$CLR_CC' does not exist"
 echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
 exit 1
 fi
 CC="$CLR_CC"
 CXX="$CLR_CXX"
 set_compiler_version_from_CC
fi

if [ -z "$CC" ]; then
 echo "Unable to find $compiler."
 echo "Error: Unable to find $compiler."
 exit 1
fi

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
if [ "$__baseOS" != "Darwin" ]; then
 # On Darwin, we always want to use the Apple linker.

 # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
 if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
 fi
 fi
fi

SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"

export CC CXX LDFLAGS SCAN_BUILD_COMMAND
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
[main] Update dependencies from dotnet/arcade#102488

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

 Merged

ericstj
merged 3 commits into

from

May 23, 2024
 Merged


[main] Update dependencies from dotnet/arcade
#102488
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
93681e4

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 21, 2024
4639a53

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 22, 2024
016b390

Update dependencies from https://github.com/dotnet/arcade build 20240…


dotnet-maestro[bot] May 23, 2024

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


84 changes: 42 additions & 42 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -92,87 +92,87 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <!-- Intermediate is necessary for source build. -->
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 <SourceBuild RepoName="arcade" ManagedOnly="true" />
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.GenFacades" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitAssert" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.6.7-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="9.0.0-beta.24263.1">
 <Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand DownExpand Up@@ -332,9 +332,9 @@
 <Uri>https://github.com/dotnet/xharness</Uri>
 <Sha>8cbf240a033d37ab8ebae11726bb3f867cfeb9e3</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24266.1">
 <Dependency Name="Microsoft.DotNet.PackageTesting" Version="9.0.0-beta.24272.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>ed14da5934ffb536cff8f41f8b5719334524cbed</Sha>
 <Sha>2001d73c8ff942331a73300ba61fa6164805b231</Sha>
 </Dependency>
 <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.24223.3">
 <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down

32 changes: 16 additions & 16 deletions
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -83,22 +83,22 @@
 <!-- SDK dependencies -->
 <MicrosoftDotNetApiCompatTaskVersion>9.0.100-preview.5.24263.1</MicrosoftDotNetApiCompatTaskVersion>
 <!-- Arcade dependencies -->
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24266.1</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24266.1</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24266.1</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24266.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24266.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24266.1</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24266.1</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24266.1</MicrosoftDotNetPackageTestingVersion>
 <MicrosoftDotNetBuildTasksFeedVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksFeedVersion>
 <MicrosoftDotNetCodeAnalysisVersion>9.0.0-beta.24272.5</MicrosoftDotNetCodeAnalysisVersion>
 <MicrosoftDotNetGenAPIVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenAPIVersion>
 <MicrosoftDotNetGenFacadesVersion>9.0.0-beta.24272.5</MicrosoftDotNetGenFacadesVersion>
 <MicrosoftDotNetXUnitAssertVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitAssertVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24272.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitConsoleRunnerVersion>2.6.7-beta.24272.5</MicrosoftDotNetXUnitConsoleRunnerVersion>
 <MicrosoftDotNetBuildTasksArchivesVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksArchivesVersion>
 <MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksInstallersVersion>
 <MicrosoftDotNetBuildTasksPackagingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksPackagingVersion>
 <MicrosoftDotNetBuildTasksTargetFrameworkVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
 <MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksTemplatingVersion>
 <MicrosoftDotNetBuildTasksWorkloadsPackageVersion>9.0.0-beta.24272.5</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
 <MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24272.5</MicrosoftDotNetRemoteExecutorVersion>
 <MicrosoftDotNetVersionToolsTasksVersion>9.0.0-beta.24272.5</MicrosoftDotNetVersionToolsTasksVersion>
 <MicrosoftDotNetPackageTestingVersion>9.0.0-beta.24272.5</MicrosoftDotNetPackageTestingVersion>
 <!-- TODO: Remove pinned xunit.analyzers version: https://github.com/dotnet/runtime/issues/97088 -->
 <XUnitAnalyzersVersion>1.4.0</XUnitAnalyzersVersion>
 <!-- NuGet dependencies -->
Expand Down

6 changes: 3 additions & 3 deletions
eng/common/core-templates/job/source-index-stage1.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
parameters:
 runAsPublic: false
 sourceIndexUploadPackageVersion: 2.0.0-20240502.12
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2
 sourceIndexUploadPackageVersion: 2.0.0-20240522.1
 sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1
 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
 preSteps: []
Expand DownExpand Up@@ -88,4 +88,4 @@ jobs:
 displayName: "Login to Azure"

 - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1
 displayName: Upload stage1 artifacts to source index
 displayName: Upload stage1 artifacts to source index

5 changes: 5 additions & 0 deletions
eng/common/internal/Directory.Build.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
<!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. -->
<Project>

 <PropertyGroup>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
 </PropertyGroup>

 <Import Project="Sdk.props" Sdk="Microsoft.DotNet.Arcade.Sdk" />

</Project>

1 change: 0 additions & 1 deletion
eng/common/internal/Tools.csproj

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@

 <PropertyGroup>
 <TargetFramework>net472</TargetFramework>
 <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
 <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
 </PropertyGroup>
 <ItemGroup>
Expand Down

85 changes: 55 additions & 30 deletions
eng/common/native/init-compiler.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,9 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure
# to not output *anything* here, unless it is an error message that fails the
# build.

if [ -z "$build_arch" ] || [ -z "$compiler" ]; then
 echo "Usage..."
Expand DownExpand Up@@ -58,6 +60,26 @@ check_version_exists() {
 echo "$desired_version"
}

__baseOS="$(uname)"
set_compiler_version_from_CC() {
 if [ "$__baseOS" = "Darwin" ]; then
 # On Darwin, the versions from -version/-dumpversion refer to Xcode
 # versions, not llvm versions, so we can't rely on them.
 return
 fi

 version="$("$CC" -dumpversion)"
 if [ -z "$version" ]; then
 echo "Error: $CC -dumpversion didn't provide a version"
 exit 1
 fi

 # gcc and clang often display 3 part versions. However, gcc can show only 1 part in some environments.
 IFS=. read -r majorVersion minorVersion _ <<EOF
$version
EOF
}

if [ -z "$CLR_CC" ]; then

 # Set default versions
Expand All@@ -74,64 +96,67 @@ if [ -z "$CLR_CC" ]; then
 done

 if [ -z "$majorVersion" ]; then
 if command -v "$compiler" > /dev/null; then
 if [ "$(uname)" != "Darwin" ]; then
 echo "Warning: Specific version of $compiler not found, falling back to use the one in PATH."
 fi
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "No usable version of $compiler found."
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: No usable version of $compiler found."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 else
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ]; then
 if [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; then
 if command -v "$compiler" > /dev/null; then
 echo "Warning: Found clang version $majorVersion which is not supported on arm/armel architectures, falling back to use clang from PATH."
 CC="$(command -v "$compiler")"
 CXX="$(command -v "$cxxCompiler")"
 else
 echo "Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi
 if [ "$compiler" = "clang" ] && [ "$majorVersion" -lt 5 ] && { [ "$build_arch" = "arm" ] || [ "$build_arch" = "armel" ]; }; then
 # If a major version was provided explicitly, and it was too old, find a newer compiler instead
 if ! command -v "$compiler" > /dev/null; then
 echo "Error: Found clang version $majorVersion which is not supported on arm/armel architectures, and there is no clang in PATH."
 exit 1
 fi

 CC="$(command -v "$compiler" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler" 2> /dev/null)"
 set_compiler_version_from_CC
 fi
 fi
 else
 desired_version="$(check_version_exists "$majorVersion" "$minorVersion")"
 if [ "$desired_version" = "-1" ]; then
 echo "Could not find specific version of $compiler: $majorVersion $minorVersion."
 echo "Error: Could not find specific version of $compiler: $majorVersion $minorVersion."
 exit 1
 fi
 fi

 if [ -z "$CC" ]; then
 CC="$(command -v "$compiler$desired_version")"
 CXX="$(command -v "$cxxCompiler$desired_version")"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler")"; fi
 CC="$(command -v "$compiler$desired_version" 2> /dev/null)"
 CXX="$(command -v "$cxxCompiler$desired_version" 2> /dev/null)"
 if [ -z "$CXX" ]; then CXX="$(command -v "$cxxCompiler" 2> /dev/null)"; fi
 set_compiler_version_from_CC
 fi
else
 if [ ! -f "$CLR_CC" ]; then
 echo "CLR_CC is set but path '$CLR_CC' does not exist"
 echo "Error: CLR_CC is set but path '$CLR_CC' does not exist"
 exit 1
 fi
 CC="$CLR_CC"
 CXX="$CLR_CXX"
 set_compiler_version_from_CC
fi

if [ -z "$CC" ]; then
 echo "Unable to find $compiler."
 echo "Error: Unable to find $compiler."
 exit 1
fi

# Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
if [ "$__baseOS" != "Darwin" ]; then
 # On Darwin, we always want to use the Apple linker.

 # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
 if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && { [ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]; }; then
 if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
 LDFLAGS="-fuse-ld=lld"
 fi
 fi
fi

SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version")"
SCAN_BUILD_COMMAND="$(command -v "scan-build$desired_version" 2> /dev/null)"

export CC CXX LDFLAGS SCAN_BUILD_COMMAND
Loading