[main] Update dependencies from dotnet/arcade#6995

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 6 commits into from
Mar 4, 2024
Merged

[main] Update dependencies from dotnet/arcade #6995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f8501b6
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 12, 2024
7d4b380
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 19, 2024
614f124
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Feb 26, 2024
d8d6c7f
Merge branch 'main' into darc-main-79f7d1b5-c99c-42c7-b7bf-b57aae2d315f
ericstj Feb 28, 2024
d82638d
Fix merge conflict in global.json
ericstj Mar 1, 2024
bfdbc78
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Mar 4, 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
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,33 +7,33 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
<Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@
<DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
<FluentAssertionVersion>5.10.2</FluentAssertionVersion>
<MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
<MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down
80 changes: 38 additions & 42 deletions eng/common/native/init-distro-rid.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# getNonPortableDistroRid
#
Expand All@@ -11,67 +11,66 @@
# non-portable rid
getNonPortableDistroRid()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir="$3"
local nonPortableRid=""
targetOs="$1"
targetArch="$2"
rootfsDir="$3"
nonPortableRid=""

if [ "$targetOs" = "linux" ]; then
# shellcheck disable=SC1091
if [ -e "${rootfsDir}/etc/os-release" ]; then
source "${rootfsDir}/etc/os-release"

if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
# remove the last version digit
VERSION_ID="${VERSION_ID%.*}"
. "${rootfsDir}/etc/os-release"
if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
fi

if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
else
# Rolling release distros either do not set VERSION_ID, set it as blank or
# set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
# so omit it here to be consistent with everything else.
nonPortableRid="${ID}-${targetArch}"
fi

elif [ -e "${rootfsDir}/android_platform" ]; then
source "$rootfsDir"/android_platform
# shellcheck disable=SC1091
. "${rootfsDir}/android_platform"
nonPortableRid="$RID"
fi
fi

if [ "$targetOs" = "freebsd" ]; then
# $rootfsDir can be empty. freebsd-version is shell script and it should always work.
__freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
# $rootfsDir can be empty. freebsd-version is a shell script and should always work.
__freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
__android_sdk_version=$(getprop ro.build.version.sdk)
nonPortableRid="android.$__android_sdk_version-${targetArch}"
elif [ "$targetOs" = "illumos" ]; then
__uname_version=$(uname -v)
case "$__uname_version" in
omnios-*)
__omnios_major_version=$(echo "${__uname_version:8:2}")
nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
;;
__omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
joyent_*)
__smartos_major_version=$(echo "${__uname_version:7:4}")
nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
;;
illumos_*)
nonPortableRid=openindiana-"$targetArch"
;;
__smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
*)
nonPortableRid="illumos-${targetArch}"
;;
esac
elif [ "$targetOs" = "solaris" ]; then
__uname_version=$(uname -v)
__solaris_major_version=$(echo "${__uname_version%.*}")
nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
__solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
elif [ "$targetOs" = "haiku" ]; then
__uname_release=$(uname -r)
__uname_release="$(uname -r)"
nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
fi

echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
}

# initDistroRidGlobal
Expand All@@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None
#
# Notes:
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir=""
if [ "$#" -ge 3 ]; then
targetOs="$1"
targetArch="$2"
rootfsDir=""
if [ $# -ge 3 ]; then
rootfsDir="$3"
fi

if [ -n "${rootfsDir}" ]; then
# We may have a cross build. Check for the existence of the rootfsDir
if [ ! -e "${rootfsDir}" ]; then
echo "Error rootfsDir has been passed, but the location is not valid."
echo "Error: rootfsDir has been passed, but the location is not valid."
exit 1
fi
fi
Expand All@@ -119,7 +115,7 @@ initDistroRidGlobal()
STRINGS="$(command -v llvm-strings || true)"
fi

# Check for musl-based distros (e.g Alpine Linux, Void Linux).
# Check for musl-based distros (e.g. Alpine Linux, Void Linux).
if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
__PortableTargetOS="linux-musl"
Expand Down
7 changes: 6 additions & 1 deletion eng/common/native/init-os-and-arch.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand DownExpand Up@@ -35,6 +35,10 @@ fi
case "$CPUName" in
arm64|aarch64)
arch=arm64
if [ "$(getconf LONG_BIT)" -lt 64 ]; then
# This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
arch=arm
fi
;;

loongarch64)
Expand All@@ -50,6 +54,7 @@ case "$CPUName" in
;;

armv7l|armv8l)
# shellcheck disable=SC1091
if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
arch=armel
else
Expand Down
4 changes: 2 additions & 2 deletions eng/common/post-build/publish-using-darc.ps1
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ param(
try {
. $PSScriptRoot\post-build-utils.ps1

$darc = Get-Darc
$darc = Get-Darc

$optionalParams = [System.Collections.ArrayList]::new()

Expand DownExpand Up@@ -46,7 +46,7 @@ try {
}

Write-Host 'done.'
}
}
catch {
Write-Host $_
Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
Expand Down
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#6995

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 6 commits into

from

Mar 4, 2024
 Merged


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

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f8501b6

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


dotnet-maestro[bot] Feb 12, 2024
7d4b380

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


dotnet-maestro[bot] Feb 19, 2024
614f124

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


dotnet-maestro[bot] Feb 26, 2024
d8d6c7f

Merge branch 'main' into darc-main-79f7d1b5-c99c-42c7-b7bf-b57aae2d315f


ericstj Feb 28, 2024
d82638d

Fix merge conflict in global.json


ericstj Mar 1, 2024
bfdbc78

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


dotnet-maestro[bot] Mar 4, 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


28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,33 +7,33 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@
 <DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

80 changes: 38 additions & 42 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# getNonPortableDistroRid
#
Expand All@@ -11,67 +11,66 @@
# non-portable rid
getNonPortableDistroRid()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir="$3"
local nonPortableRid=""
 targetOs="$1"
 targetArch="$2"
 rootfsDir="$3"
 nonPortableRid=""

 if [ "$targetOs" = "linux" ]; then
 # shellcheck disable=SC1091
 if [ -e "${rootfsDir}/etc/os-release" ]; then
 source "${rootfsDir}/etc/os-release"

 if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
 # remove the last version digit
 VERSION_ID="${VERSION_ID%.*}"
 . "${rootfsDir}/etc/os-release"
 if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
 VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
 fi

 if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
 if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
 nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
 else
 # Rolling release distros either do not set VERSION_ID, set it as blank or
 # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
 # so omit it here to be consistent with everything else.
 nonPortableRid="${ID}-${targetArch}"
 fi

 elif [ -e "${rootfsDir}/android_platform" ]; then
 source "$rootfsDir"/android_platform
 # shellcheck disable=SC1091
 . "${rootfsDir}/android_platform"
 nonPortableRid="$RID"
 fi
 fi

 if [ "$targetOs" = "freebsd" ]; then
 # $rootfsDir can be empty. freebsd-version is shell script and it should always work.
 __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
 # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
 __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
 nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
 elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
 elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
 __android_sdk_version=$(getprop ro.build.version.sdk)
 nonPortableRid="android.$__android_sdk_version-${targetArch}"
 elif [ "$targetOs" = "illumos" ]; then
 __uname_version=$(uname -v)
 case "$__uname_version" in
 omnios-*)
 __omnios_major_version=$(echo "${__uname_version:8:2}")
 nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
 ;;
 __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
 joyent_*)
 __smartos_major_version=$(echo "${__uname_version:7:4}")
 nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
 ;;
illumos_*)
 nonPortableRid=openindiana-"$targetArch"
 ;;
 __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
 *)
 nonPortableRid="illumos-${targetArch}"
;;
 esac
 elif [ "$targetOs" = "solaris" ]; then
 __uname_version=$(uname -v)
 __solaris_major_version=$(echo "${__uname_version%.*}")
 nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
 __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
 nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
 elif [ "$targetOs" = "haiku" ]; then
 __uname_release=$(uname -r)
 __uname_release="$(uname -r)"
 nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
 fi

 echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
 echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
}

# initDistroRidGlobal
Expand All@@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None
#
# Notes:
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir=""
 if [ "$#" -ge 3 ]; then
 targetOs="$1"
 targetArch="$2"
 rootfsDir=""
 if [ $# -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
 # We may have a cross build. Check for the existence of the rootfsDir
 if [ ! -e "${rootfsDir}" ]; then
 echo "Error rootfsDir has been passed, but the location is not valid."
 echo "Error: rootfsDir has been passed, but the location is not valid."
 exit 1
 fi
 fi
Expand All@@ -119,7 +115,7 @@ initDistroRidGlobal()
 STRINGS="$(command -v llvm-strings || true)"
 fi

 # Check for musl-based distros (e.g Alpine Linux, Void Linux).
 # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
 if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
 ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
 __PortableTargetOS="linux-musl"
Expand Down

7 changes: 6 additions & 1 deletion
eng/common/native/init-os-and-arch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand DownExpand Up@@ -35,6 +35,10 @@ fi
case "$CPUName" in
 arm64|aarch64)
 arch=arm64
 if [ "$(getconf LONG_BIT)" -lt 64 ]; then
 # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
 arch=arm
 fi
 ;;

 loongarch64)
Expand All@@ -50,6 +54,7 @@ case "$CPUName" in
 ;;

 armv7l|armv8l)
 # shellcheck disable=SC1091
 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
 arch=armel
 else
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/post-build/publish-using-darc.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ param(
try {
 . $PSScriptRoot\post-build-utils.ps1

 $darc = Get-Darc
 $darc = Get-Darc

 $optionalParams = [System.Collections.ArrayList]::new()

Expand DownExpand Up@@ -46,7 +46,7 @@ try {
 }

 Write-Host 'done.'
}
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
Expand Down
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#6995

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 6 commits into

from

Mar 4, 2024
 Merged


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

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f8501b6

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


dotnet-maestro[bot] Feb 12, 2024
7d4b380

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


dotnet-maestro[bot] Feb 19, 2024
614f124

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


dotnet-maestro[bot] Feb 26, 2024
d8d6c7f

Merge branch 'main' into darc-main-79f7d1b5-c99c-42c7-b7bf-b57aae2d315f


ericstj Feb 28, 2024
d82638d

Fix merge conflict in global.json


ericstj Mar 1, 2024
bfdbc78

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


dotnet-maestro[bot] Mar 4, 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


28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,33 +7,33 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@
 <DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

80 changes: 38 additions & 42 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# getNonPortableDistroRid
#
Expand All@@ -11,67 +11,66 @@
# non-portable rid
getNonPortableDistroRid()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir="$3"
local nonPortableRid=""
 targetOs="$1"
 targetArch="$2"
 rootfsDir="$3"
 nonPortableRid=""

 if [ "$targetOs" = "linux" ]; then
 # shellcheck disable=SC1091
 if [ -e "${rootfsDir}/etc/os-release" ]; then
 source "${rootfsDir}/etc/os-release"

 if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
 # remove the last version digit
 VERSION_ID="${VERSION_ID%.*}"
 . "${rootfsDir}/etc/os-release"
 if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
 VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
 fi

 if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
 if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
 nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
 else
 # Rolling release distros either do not set VERSION_ID, set it as blank or
 # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
 # so omit it here to be consistent with everything else.
 nonPortableRid="${ID}-${targetArch}"
 fi

 elif [ -e "${rootfsDir}/android_platform" ]; then
 source "$rootfsDir"/android_platform
 # shellcheck disable=SC1091
 . "${rootfsDir}/android_platform"
 nonPortableRid="$RID"
 fi
 fi

 if [ "$targetOs" = "freebsd" ]; then
 # $rootfsDir can be empty. freebsd-version is shell script and it should always work.
 __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
 # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
 __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
 nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
 elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
 elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
 __android_sdk_version=$(getprop ro.build.version.sdk)
 nonPortableRid="android.$__android_sdk_version-${targetArch}"
 elif [ "$targetOs" = "illumos" ]; then
 __uname_version=$(uname -v)
 case "$__uname_version" in
 omnios-*)
 __omnios_major_version=$(echo "${__uname_version:8:2}")
 nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
 ;;
 __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
 joyent_*)
 __smartos_major_version=$(echo "${__uname_version:7:4}")
 nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
 ;;
illumos_*)
 nonPortableRid=openindiana-"$targetArch"
 ;;
 __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
 *)
 nonPortableRid="illumos-${targetArch}"
;;
 esac
 elif [ "$targetOs" = "solaris" ]; then
 __uname_version=$(uname -v)
 __solaris_major_version=$(echo "${__uname_version%.*}")
 nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
 __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
 nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
 elif [ "$targetOs" = "haiku" ]; then
 __uname_release=$(uname -r)
 __uname_release="$(uname -r)"
 nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
 fi

 echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
 echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
}

# initDistroRidGlobal
Expand All@@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None
#
# Notes:
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir=""
 if [ "$#" -ge 3 ]; then
 targetOs="$1"
 targetArch="$2"
 rootfsDir=""
 if [ $# -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
 # We may have a cross build. Check for the existence of the rootfsDir
 if [ ! -e "${rootfsDir}" ]; then
 echo "Error rootfsDir has been passed, but the location is not valid."
 echo "Error: rootfsDir has been passed, but the location is not valid."
 exit 1
 fi
 fi
Expand All@@ -119,7 +115,7 @@ initDistroRidGlobal()
 STRINGS="$(command -v llvm-strings || true)"
 fi

 # Check for musl-based distros (e.g Alpine Linux, Void Linux).
 # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
 if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
 ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
 __PortableTargetOS="linux-musl"
Expand Down

7 changes: 6 additions & 1 deletion
eng/common/native/init-os-and-arch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand DownExpand Up@@ -35,6 +35,10 @@ fi
case "$CPUName" in
 arm64|aarch64)
 arch=arm64
 if [ "$(getconf LONG_BIT)" -lt 64 ]; then
 # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
 arch=arm
 fi
 ;;

 loongarch64)
Expand All@@ -50,6 +54,7 @@ case "$CPUName" in
 ;;

 armv7l|armv8l)
 # shellcheck disable=SC1091
 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
 arch=armel
 else
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/post-build/publish-using-darc.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ param(
try {
 . $PSScriptRoot\post-build-utils.ps1

 $darc = Get-Darc
 $darc = Get-Darc

 $optionalParams = [System.Collections.ArrayList]::new()

Expand DownExpand Up@@ -46,7 +46,7 @@ try {
 }

 Write-Host 'done.'
}
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
Expand Down
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#6995

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 6 commits into

from

Mar 4, 2024
 Merged


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

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f8501b6

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


dotnet-maestro[bot] Feb 12, 2024
7d4b380

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


dotnet-maestro[bot] Feb 19, 2024
614f124

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


dotnet-maestro[bot] Feb 26, 2024
d8d6c7f

Merge branch 'main' into darc-main-79f7d1b5-c99c-42c7-b7bf-b57aae2d315f


ericstj Feb 28, 2024
d82638d

Fix merge conflict in global.json


ericstj Mar 1, 2024
bfdbc78

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


dotnet-maestro[bot] Mar 4, 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


28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,33 +7,33 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@
 <DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

80 changes: 38 additions & 42 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# getNonPortableDistroRid
#
Expand All@@ -11,67 +11,66 @@
# non-portable rid
getNonPortableDistroRid()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir="$3"
local nonPortableRid=""
 targetOs="$1"
 targetArch="$2"
 rootfsDir="$3"
 nonPortableRid=""

 if [ "$targetOs" = "linux" ]; then
 # shellcheck disable=SC1091
 if [ -e "${rootfsDir}/etc/os-release" ]; then
 source "${rootfsDir}/etc/os-release"

 if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
 # remove the last version digit
 VERSION_ID="${VERSION_ID%.*}"
 . "${rootfsDir}/etc/os-release"
 if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
 VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
 fi

 if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
 if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
 nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
 else
 # Rolling release distros either do not set VERSION_ID, set it as blank or
 # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
 # so omit it here to be consistent with everything else.
 nonPortableRid="${ID}-${targetArch}"
 fi

 elif [ -e "${rootfsDir}/android_platform" ]; then
 source "$rootfsDir"/android_platform
 # shellcheck disable=SC1091
 . "${rootfsDir}/android_platform"
 nonPortableRid="$RID"
 fi
 fi

 if [ "$targetOs" = "freebsd" ]; then
 # $rootfsDir can be empty. freebsd-version is shell script and it should always work.
 __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
 # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
 __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
 nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
 elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
 elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
 __android_sdk_version=$(getprop ro.build.version.sdk)
 nonPortableRid="android.$__android_sdk_version-${targetArch}"
 elif [ "$targetOs" = "illumos" ]; then
 __uname_version=$(uname -v)
 case "$__uname_version" in
 omnios-*)
 __omnios_major_version=$(echo "${__uname_version:8:2}")
 nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
 ;;
 __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
 joyent_*)
 __smartos_major_version=$(echo "${__uname_version:7:4}")
 nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
 ;;
illumos_*)
 nonPortableRid=openindiana-"$targetArch"
 ;;
 __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
 *)
 nonPortableRid="illumos-${targetArch}"
;;
 esac
 elif [ "$targetOs" = "solaris" ]; then
 __uname_version=$(uname -v)
 __solaris_major_version=$(echo "${__uname_version%.*}")
 nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
 __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
 nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
 elif [ "$targetOs" = "haiku" ]; then
 __uname_release=$(uname -r)
 __uname_release="$(uname -r)"
 nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
 fi

 echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
 echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
}

# initDistroRidGlobal
Expand All@@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None
#
# Notes:
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir=""
 if [ "$#" -ge 3 ]; then
 targetOs="$1"
 targetArch="$2"
 rootfsDir=""
 if [ $# -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
 # We may have a cross build. Check for the existence of the rootfsDir
 if [ ! -e "${rootfsDir}" ]; then
 echo "Error rootfsDir has been passed, but the location is not valid."
 echo "Error: rootfsDir has been passed, but the location is not valid."
 exit 1
 fi
 fi
Expand All@@ -119,7 +115,7 @@ initDistroRidGlobal()
 STRINGS="$(command -v llvm-strings || true)"
 fi

 # Check for musl-based distros (e.g Alpine Linux, Void Linux).
 # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
 if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
 ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
 __PortableTargetOS="linux-musl"
Expand Down

7 changes: 6 additions & 1 deletion
eng/common/native/init-os-and-arch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand DownExpand Up@@ -35,6 +35,10 @@ fi
case "$CPUName" in
 arm64|aarch64)
 arch=arm64
 if [ "$(getconf LONG_BIT)" -lt 64 ]; then
 # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
 arch=arm
 fi
 ;;

 loongarch64)
Expand All@@ -50,6 +54,7 @@ case "$CPUName" in
 ;;

 armv7l|armv8l)
 # shellcheck disable=SC1091
 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
 arch=armel
 else
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/post-build/publish-using-darc.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ param(
try {
 . $PSScriptRoot\post-build-utils.ps1

 $darc = Get-Darc
 $darc = Get-Darc

 $optionalParams = [System.Collections.ArrayList]::new()

Expand DownExpand Up@@ -46,7 +46,7 @@ try {
 }

 Write-Host 'done.'
}
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
Expand Down
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#6995

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 6 commits into

from

Mar 4, 2024
 Merged


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

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f8501b6

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


dotnet-maestro[bot] Feb 12, 2024
7d4b380

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


dotnet-maestro[bot] Feb 19, 2024
614f124

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


dotnet-maestro[bot] Feb 26, 2024
d8d6c7f

Merge branch 'main' into darc-main-79f7d1b5-c99c-42c7-b7bf-b57aae2d315f


ericstj Feb 28, 2024
d82638d

Fix merge conflict in global.json


ericstj Mar 1, 2024
bfdbc78

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


dotnet-maestro[bot] Mar 4, 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


28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,33 +7,33 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@
 <DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

80 changes: 38 additions & 42 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# getNonPortableDistroRid
#
Expand All@@ -11,67 +11,66 @@
# non-portable rid
getNonPortableDistroRid()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir="$3"
local nonPortableRid=""
 targetOs="$1"
 targetArch="$2"
 rootfsDir="$3"
 nonPortableRid=""

 if [ "$targetOs" = "linux" ]; then
 # shellcheck disable=SC1091
 if [ -e "${rootfsDir}/etc/os-release" ]; then
 source "${rootfsDir}/etc/os-release"

 if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
 # remove the last version digit
 VERSION_ID="${VERSION_ID%.*}"
 . "${rootfsDir}/etc/os-release"
 if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
 VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
 fi

 if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
 if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
 nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
 else
 # Rolling release distros either do not set VERSION_ID, set it as blank or
 # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
 # so omit it here to be consistent with everything else.
 nonPortableRid="${ID}-${targetArch}"
 fi

 elif [ -e "${rootfsDir}/android_platform" ]; then
 source "$rootfsDir"/android_platform
 # shellcheck disable=SC1091
 . "${rootfsDir}/android_platform"
 nonPortableRid="$RID"
 fi
 fi

 if [ "$targetOs" = "freebsd" ]; then
 # $rootfsDir can be empty. freebsd-version is shell script and it should always work.
 __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
 # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
 __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
 nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
 elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
 elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
 __android_sdk_version=$(getprop ro.build.version.sdk)
 nonPortableRid="android.$__android_sdk_version-${targetArch}"
 elif [ "$targetOs" = "illumos" ]; then
 __uname_version=$(uname -v)
 case "$__uname_version" in
 omnios-*)
 __omnios_major_version=$(echo "${__uname_version:8:2}")
 nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
 ;;
 __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
 joyent_*)
 __smartos_major_version=$(echo "${__uname_version:7:4}")
 nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
 ;;
illumos_*)
 nonPortableRid=openindiana-"$targetArch"
 ;;
 __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
 *)
 nonPortableRid="illumos-${targetArch}"
;;
 esac
 elif [ "$targetOs" = "solaris" ]; then
 __uname_version=$(uname -v)
 __solaris_major_version=$(echo "${__uname_version%.*}")
 nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
 __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
 nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
 elif [ "$targetOs" = "haiku" ]; then
 __uname_release=$(uname -r)
 __uname_release="$(uname -r)"
 nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
 fi

 echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
 echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
}

# initDistroRidGlobal
Expand All@@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None
#
# Notes:
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir=""
 if [ "$#" -ge 3 ]; then
 targetOs="$1"
 targetArch="$2"
 rootfsDir=""
 if [ $# -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
 # We may have a cross build. Check for the existence of the rootfsDir
 if [ ! -e "${rootfsDir}" ]; then
 echo "Error rootfsDir has been passed, but the location is not valid."
 echo "Error: rootfsDir has been passed, but the location is not valid."
 exit 1
 fi
 fi
Expand All@@ -119,7 +115,7 @@ initDistroRidGlobal()
 STRINGS="$(command -v llvm-strings || true)"
 fi

 # Check for musl-based distros (e.g Alpine Linux, Void Linux).
 # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
 if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
 ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
 __PortableTargetOS="linux-musl"
Expand Down

7 changes: 6 additions & 1 deletion
eng/common/native/init-os-and-arch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand DownExpand Up@@ -35,6 +35,10 @@ fi
case "$CPUName" in
 arm64|aarch64)
 arch=arm64
 if [ "$(getconf LONG_BIT)" -lt 64 ]; then
 # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
 arch=arm
 fi
 ;;

 loongarch64)
Expand All@@ -50,6 +54,7 @@ case "$CPUName" in
 ;;

 armv7l|armv8l)
 # shellcheck disable=SC1091
 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
 arch=armel
 else
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/post-build/publish-using-darc.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ param(
try {
 . $PSScriptRoot\post-build-utils.ps1

 $darc = Get-Darc
 $darc = Get-Darc

 $optionalParams = [System.Collections.ArrayList]::new()

Expand DownExpand Up@@ -46,7 +46,7 @@ try {
 }

 Write-Host 'done.'
}
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
Expand Down
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#6995

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 6 commits into

from

Mar 4, 2024
 Merged


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

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f8501b6

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


dotnet-maestro[bot] Feb 12, 2024
7d4b380

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


dotnet-maestro[bot] Feb 19, 2024
614f124

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


dotnet-maestro[bot] Feb 26, 2024
d8d6c7f

Merge branch 'main' into darc-main-79f7d1b5-c99c-42c7-b7bf-b57aae2d315f


ericstj Feb 28, 2024
d82638d

Fix merge conflict in global.json


ericstj Mar 1, 2024
bfdbc78

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


dotnet-maestro[bot] Mar 4, 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


28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,33 +7,33 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@
 <DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

80 changes: 38 additions & 42 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# getNonPortableDistroRid
#
Expand All@@ -11,67 +11,66 @@
# non-portable rid
getNonPortableDistroRid()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir="$3"
local nonPortableRid=""
 targetOs="$1"
 targetArch="$2"
 rootfsDir="$3"
 nonPortableRid=""

 if [ "$targetOs" = "linux" ]; then
 # shellcheck disable=SC1091
 if [ -e "${rootfsDir}/etc/os-release" ]; then
 source "${rootfsDir}/etc/os-release"

 if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
 # remove the last version digit
 VERSION_ID="${VERSION_ID%.*}"
 . "${rootfsDir}/etc/os-release"
 if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
 VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
 fi

 if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
 if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
 nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
 else
 # Rolling release distros either do not set VERSION_ID, set it as blank or
 # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
 # so omit it here to be consistent with everything else.
 nonPortableRid="${ID}-${targetArch}"
 fi

 elif [ -e "${rootfsDir}/android_platform" ]; then
 source "$rootfsDir"/android_platform
 # shellcheck disable=SC1091
 . "${rootfsDir}/android_platform"
 nonPortableRid="$RID"
 fi
 fi

 if [ "$targetOs" = "freebsd" ]; then
 # $rootfsDir can be empty. freebsd-version is shell script and it should always work.
 __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
 # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
 __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
 nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
 elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
 elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
 __android_sdk_version=$(getprop ro.build.version.sdk)
 nonPortableRid="android.$__android_sdk_version-${targetArch}"
 elif [ "$targetOs" = "illumos" ]; then
 __uname_version=$(uname -v)
 case "$__uname_version" in
 omnios-*)
 __omnios_major_version=$(echo "${__uname_version:8:2}")
 nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
 ;;
 __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
 joyent_*)
 __smartos_major_version=$(echo "${__uname_version:7:4}")
 nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
 ;;
illumos_*)
 nonPortableRid=openindiana-"$targetArch"
 ;;
 __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
 *)
 nonPortableRid="illumos-${targetArch}"
;;
 esac
 elif [ "$targetOs" = "solaris" ]; then
 __uname_version=$(uname -v)
 __solaris_major_version=$(echo "${__uname_version%.*}")
 nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
 __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
 nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
 elif [ "$targetOs" = "haiku" ]; then
 __uname_release=$(uname -r)
 __uname_release="$(uname -r)"
 nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
 fi

 echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
 echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
}

# initDistroRidGlobal
Expand All@@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None
#
# Notes:
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir=""
 if [ "$#" -ge 3 ]; then
 targetOs="$1"
 targetArch="$2"
 rootfsDir=""
 if [ $# -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
 # We may have a cross build. Check for the existence of the rootfsDir
 if [ ! -e "${rootfsDir}" ]; then
 echo "Error rootfsDir has been passed, but the location is not valid."
 echo "Error: rootfsDir has been passed, but the location is not valid."
 exit 1
 fi
 fi
Expand All@@ -119,7 +115,7 @@ initDistroRidGlobal()
 STRINGS="$(command -v llvm-strings || true)"
 fi

 # Check for musl-based distros (e.g Alpine Linux, Void Linux).
 # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
 if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
 ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
 __PortableTargetOS="linux-musl"
Expand Down

7 changes: 6 additions & 1 deletion
eng/common/native/init-os-and-arch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand DownExpand Up@@ -35,6 +35,10 @@ fi
case "$CPUName" in
 arm64|aarch64)
 arch=arm64
 if [ "$(getconf LONG_BIT)" -lt 64 ]; then
 # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
 arch=arm
 fi
 ;;

 loongarch64)
Expand All@@ -50,6 +54,7 @@ case "$CPUName" in
 ;;

 armv7l|armv8l)
 # shellcheck disable=SC1091
 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
 arch=armel
 else
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/post-build/publish-using-darc.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ param(
try {
 . $PSScriptRoot\post-build-utils.ps1

 $darc = Get-Darc
 $darc = Get-Darc

 $optionalParams = [System.Collections.ArrayList]::new()

Expand DownExpand Up@@ -46,7 +46,7 @@ try {
 }

 Write-Host 'done.'
}
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
Expand Down
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#6995

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 6 commits into

from

Mar 4, 2024
 Merged


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

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f8501b6

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


dotnet-maestro[bot] Feb 12, 2024
7d4b380

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


dotnet-maestro[bot] Feb 19, 2024
614f124

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


dotnet-maestro[bot] Feb 26, 2024
d8d6c7f

Merge branch 'main' into darc-main-79f7d1b5-c99c-42c7-b7bf-b57aae2d315f


ericstj Feb 28, 2024
d82638d

Fix merge conflict in global.json


ericstj Mar 1, 2024
bfdbc78

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


dotnet-maestro[bot] Mar 4, 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


28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,33 +7,33 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@
 <DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

80 changes: 38 additions & 42 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# getNonPortableDistroRid
#
Expand All@@ -11,67 +11,66 @@
# non-portable rid
getNonPortableDistroRid()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir="$3"
local nonPortableRid=""
 targetOs="$1"
 targetArch="$2"
 rootfsDir="$3"
 nonPortableRid=""

 if [ "$targetOs" = "linux" ]; then
 # shellcheck disable=SC1091
 if [ -e "${rootfsDir}/etc/os-release" ]; then
 source "${rootfsDir}/etc/os-release"

 if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
 # remove the last version digit
 VERSION_ID="${VERSION_ID%.*}"
 . "${rootfsDir}/etc/os-release"
 if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
 VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
 fi

 if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
 if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
 nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
 else
 # Rolling release distros either do not set VERSION_ID, set it as blank or
 # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
 # so omit it here to be consistent with everything else.
 nonPortableRid="${ID}-${targetArch}"
 fi

 elif [ -e "${rootfsDir}/android_platform" ]; then
 source "$rootfsDir"/android_platform
 # shellcheck disable=SC1091
 . "${rootfsDir}/android_platform"
 nonPortableRid="$RID"
 fi
 fi

 if [ "$targetOs" = "freebsd" ]; then
 # $rootfsDir can be empty. freebsd-version is shell script and it should always work.
 __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
 # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
 __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
 nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
 elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
 elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
 __android_sdk_version=$(getprop ro.build.version.sdk)
 nonPortableRid="android.$__android_sdk_version-${targetArch}"
 elif [ "$targetOs" = "illumos" ]; then
 __uname_version=$(uname -v)
 case "$__uname_version" in
 omnios-*)
 __omnios_major_version=$(echo "${__uname_version:8:2}")
 nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
 ;;
 __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
 joyent_*)
 __smartos_major_version=$(echo "${__uname_version:7:4}")
 nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
 ;;
illumos_*)
 nonPortableRid=openindiana-"$targetArch"
 ;;
 __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
 *)
 nonPortableRid="illumos-${targetArch}"
;;
 esac
 elif [ "$targetOs" = "solaris" ]; then
 __uname_version=$(uname -v)
 __solaris_major_version=$(echo "${__uname_version%.*}")
 nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
 __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
 nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
 elif [ "$targetOs" = "haiku" ]; then
 __uname_release=$(uname -r)
 __uname_release="$(uname -r)"
 nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
 fi

 echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
 echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
}

# initDistroRidGlobal
Expand All@@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None
#
# Notes:
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir=""
 if [ "$#" -ge 3 ]; then
 targetOs="$1"
 targetArch="$2"
 rootfsDir=""
 if [ $# -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
 # We may have a cross build. Check for the existence of the rootfsDir
 if [ ! -e "${rootfsDir}" ]; then
 echo "Error rootfsDir has been passed, but the location is not valid."
 echo "Error: rootfsDir has been passed, but the location is not valid."
 exit 1
 fi
 fi
Expand All@@ -119,7 +115,7 @@ initDistroRidGlobal()
 STRINGS="$(command -v llvm-strings || true)"
 fi

 # Check for musl-based distros (e.g Alpine Linux, Void Linux).
 # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
 if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
 ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
 __PortableTargetOS="linux-musl"
Expand Down

7 changes: 6 additions & 1 deletion
eng/common/native/init-os-and-arch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand DownExpand Up@@ -35,6 +35,10 @@ fi
case "$CPUName" in
 arm64|aarch64)
 arch=arm64
 if [ "$(getconf LONG_BIT)" -lt 64 ]; then
 # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
 arch=arm
 fi
 ;;

 loongarch64)
Expand All@@ -50,6 +54,7 @@ case "$CPUName" in
 ;;

 armv7l|armv8l)
 # shellcheck disable=SC1091
 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
 arch=armel
 else
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/post-build/publish-using-darc.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ param(
try {
 . $PSScriptRoot\post-build-utils.ps1

 $darc = Get-Darc
 $darc = Get-Darc

 $optionalParams = [System.Collections.ArrayList]::new()

Expand DownExpand Up@@ -46,7 +46,7 @@ try {
 }

 Write-Host 'done.'
}
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
Expand Down
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#6995

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 6 commits into

from

Mar 4, 2024
 Merged


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

Show all changes


6 commits


Select commit
Hold shift + click to select a range
f8501b6

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


dotnet-maestro[bot] Feb 12, 2024
7d4b380

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


dotnet-maestro[bot] Feb 19, 2024
614f124

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


dotnet-maestro[bot] Feb 26, 2024
d8d6c7f

Merge branch 'main' into darc-main-79f7d1b5-c99c-42c7-b7bf-b57aae2d315f


ericstj Feb 28, 2024
d82638d

Fix merge conflict in global.json


ericstj Mar 1, 2024
bfdbc78

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


dotnet-maestro[bot] Mar 4, 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


28 changes: 14 additions & 14 deletions
eng/Version.Details.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -7,33 +7,33 @@
 </Dependency>
 </ProductDependencies>
 <ToolsetDependencies>
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SignTool" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24102.4">
 <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24151.5">
 <Uri>https://github.com/dotnet/arcade</Uri>
 <Sha>2fb543a45580400a559b5ae41c96a815ea14dac5</Sha>
 <Sha>87d89025bdd8827c016e4083660d31f497670e5c</Sha>
 </Dependency>
 </ToolsetDependencies>
</Dependencies>

2 changes: 1 addition & 1 deletion
eng/Versions.props

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -79,7 +79,7 @@
 <DotNetRuntime80Version>8.0.1</DotNetRuntime80Version>
 <FluentAssertionVersion>5.10.2</FluentAssertionVersion>
 <MicrosoftCodeAnalysisTestingVersion>1.1.2-beta1.23431.1</MicrosoftCodeAnalysisTestingVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24102.4</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24151.5</MicrosoftDotNetXUnitExtensionsVersion>
 <MicrosoftExtensionsDependencyModelVersion>2.1.0</MicrosoftExtensionsDependencyModelVersion>
 <MicrosoftExtensionsTestVersion>3.0.1</MicrosoftExtensionsTestVersion>
 <MicrosoftMLOnnxTestModelsVersion>0.0.6-test</MicrosoftMLOnnxTestModelsVersion>
Expand Down

80 changes: 38 additions & 42 deletions
eng/common/native/init-distro-rid.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# getNonPortableDistroRid
#
Expand All@@ -11,67 +11,66 @@
# non-portable rid
getNonPortableDistroRid()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir="$3"
local nonPortableRid=""
 targetOs="$1"
 targetArch="$2"
 rootfsDir="$3"
 nonPortableRid=""

 if [ "$targetOs" = "linux" ]; then
 # shellcheck disable=SC1091
 if [ -e "${rootfsDir}/etc/os-release" ]; then
 source "${rootfsDir}/etc/os-release"

 if [[ "${ID}" == "rhel" || "${ID}" == "rocky" || "${ID}" == "alpine" ]]; then
 # remove the last version digit
 VERSION_ID="${VERSION_ID%.*}"
 . "${rootfsDir}/etc/os-release"
 if [ "${ID}" = "rhel" ] || [ "${ID}" = "rocky" ] || [ "${ID}" = "alpine" ]; then
 VERSION_ID="${VERSION_ID%.*}" # Remove the last version digit for these distros
 fi

 if [[ "${VERSION_ID:-}" =~ ^([[:digit:]]|\.)+$ ]]; then
 if echo "${VERSION_ID:-}" | grep -qE '^([[:digit:]]|\.)+$'; then
 nonPortableRid="${ID}.${VERSION_ID}-${targetArch}"
 else
 # Rolling release distros either do not set VERSION_ID, set it as blank or
 # set it to non-version looking string (such as TEMPLATE_VERSION_ID on ArchLinux);
 # so omit it here to be consistent with everything else.
 nonPortableRid="${ID}-${targetArch}"
 fi

 elif [ -e "${rootfsDir}/android_platform" ]; then
 source "$rootfsDir"/android_platform
 # shellcheck disable=SC1091
 . "${rootfsDir}/android_platform"
 nonPortableRid="$RID"
 fi
 fi

 if [ "$targetOs" = "freebsd" ]; then
 # $rootfsDir can be empty. freebsd-version is shell script and it should always work.
 __freebsd_major_version=$($rootfsDir/bin/freebsd-version | { read v; echo "${v%%.*}"; })
 # $rootfsDir can be empty. freebsd-version is a shell script and should always work.
 __freebsd_major_version=$("$rootfsDir"/bin/freebsd-version | cut -d'.' -f1)
 nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}"
 elif command -v getprop && getprop ro.product.system.model 2>&1 | grep -qi android; then
 elif command -v getprop >/dev/null && getprop ro.product.system.model | grep -qi android; then
 __android_sdk_version=$(getprop ro.build.version.sdk)
 nonPortableRid="android.$__android_sdk_version-${targetArch}"
 elif [ "$targetOs" = "illumos" ]; then
 __uname_version=$(uname -v)
 case "$__uname_version" in
 omnios-*)
 __omnios_major_version=$(echo "${__uname_version:8:2}")
 nonPortableRid=omnios."$__omnios_major_version"-"$targetArch"
 ;;
 __omnios_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="omnios.$__omnios_major_version-${targetArch}"
;;
 joyent_*)
 __smartos_major_version=$(echo "${__uname_version:7:4}")
 nonPortableRid=smartos."$__smartos_major_version"-"$targetArch"
 ;;
illumos_*)
 nonPortableRid=openindiana-"$targetArch"
 ;;
 __smartos_major_version=$(echo "$__uname_version" | cut -c9-10)
 nonPortableRid="smartos.$__smartos_major_version-${targetArch}"
;;
 *)
 nonPortableRid="illumos-${targetArch}"
;;
 esac
 elif [ "$targetOs" = "solaris" ]; then
 __uname_version=$(uname -v)
 __solaris_major_version=$(echo "${__uname_version%.*}")
 nonPortableRid=solaris."$__solaris_major_version"-"$targetArch"
 __solaris_major_version=$(echo "$__uname_version" | cut -d'.' -f1)
 nonPortableRid="solaris.$__solaris_major_version-${targetArch}"
 elif [ "$targetOs" = "haiku" ]; then
 __uname_release=$(uname -r)
 __uname_release="$(uname -r)"
 nonPortableRid=haiku.r"$__uname_release"-"$targetArch"
 fi

 echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')"
 echo "$nonPortableRid" | tr '[:upper:]' '[:lower:]'
}

# initDistroRidGlobal
Expand All@@ -85,26 +84,23 @@ getNonPortableDistroRid()
# None
#
# Notes:
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
#
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
#
# It is important to note that the function does not return anything, but it
# exports the following variables on success:
# __DistroRid : Non-portable rid of the target platform.
# __PortableTargetOS : OS-part of the portable rid that corresponds to the target platform.
initDistroRidGlobal()
{
local targetOs="$1"
local targetArch="$2"
local rootfsDir=""
 if [ "$#" -ge 3 ]; then
 targetOs="$1"
 targetArch="$2"
 rootfsDir=""
 if [ $# -ge 3 ]; then
 rootfsDir="$3"
 fi

 if [ -n "${rootfsDir}" ]; then
 # We may have a cross build. Check for the existence of the rootfsDir
 if [ ! -e "${rootfsDir}" ]; then
 echo "Error rootfsDir has been passed, but the location is not valid."
 echo "Error: rootfsDir has been passed, but the location is not valid."
 exit 1
 fi
 fi
Expand All@@ -119,7 +115,7 @@ initDistroRidGlobal()
 STRINGS="$(command -v llvm-strings || true)"
 fi

 # Check for musl-based distros (e.g Alpine Linux, Void Linux).
 # Check for musl-based distros (e.g. Alpine Linux, Void Linux).
 if "${rootfsDir}/usr/bin/ldd" --version 2>&1 | grep -q musl ||
 ( [ -n "$STRINGS" ] && "$STRINGS" "${rootfsDir}/usr/bin/ldd" 2>&1 | grep -q musl ); then
 __PortableTargetOS="linux-musl"
Expand Down

7 changes: 6 additions & 1 deletion
eng/common/native/init-os-and-arch.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash
#!/bin/sh

# Use uname to determine what the OS is.
OSName=$(uname -s | tr '[:upper:]' '[:lower:]')
Expand DownExpand Up@@ -35,6 +35,10 @@ fi
case "$CPUName" in
 arm64|aarch64)
 arch=arm64
 if [ "$(getconf LONG_BIT)" -lt 64 ]; then
 # This is 32-bit OS running on 64-bit CPU (for example Raspberry Pi OS)
 arch=arm
 fi
 ;;

 loongarch64)
Expand All@@ -50,6 +54,7 @@ case "$CPUName" in
 ;;

 armv7l|armv8l)
 # shellcheck disable=SC1091
 if (NAME=""; . /etc/os-release; test "$NAME" = "Tizen"); then
 arch=armel
 else
Expand Down

4 changes: 2 additions & 2 deletions
eng/common/post-build/publish-using-darc.ps1

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,7 +12,7 @@ param(
try {
 . $PSScriptRoot\post-build-utils.ps1

 $darc = Get-Darc
 $darc = Get-Darc

 $optionalParams = [System.Collections.ArrayList]::new()

Expand DownExpand Up@@ -46,7 +46,7 @@ try {
 }

 Write-Host 'done.'
}
}
catch {
 Write-Host $_
 Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels."
Expand Down
Loading