-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[release/3.0] Update dependencies from dotnet/arcade (#6938)
* Update dependencies from https://github.com/dotnet/arcade build 20231220.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.SwaggerGenerator.MSBuild , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23265.1 -> To Version 8.0.0-beta.23620.2 * Fixed version update breaks. * Update XUnitVersion * Update MicrosoftMLOnnxRuntimeVersion to 1.16.3 * Rollback OnnxRuntime and suppress warning * Update to Xunit with fix for xunit/xunit#2821 * Update Centos docker containers * Fix packaging step * Try including stdint.h to fix missing uint8_t on centos * Update Centos test queue * Attempt to use runtime centos-stream8-helix container for tests * Use centos-stream8-mlnet-helix container for testing * Undo changes to test data * Make NETFRAMEWORK ifdef versionless * Only use semi-colons for NoWarn * Fix assert by only accessing idx (#6924) Asserting on `_rowCount < Utils.Size(_valueBoundaries)` was catching a case where `_rowCount`'s update was reordered before `_valueBoundaries` This was unnecessary, since this method doesn't need to use `_rowCount`. Instead, make the asserts use only `idx` which will be maintained consistent with the waiter logic in this cache. �Ensure we only ever use `_rowCount` from the caching thread, so write reordering won't matter. * Don't include the SDK in our helix payload (#6918) * Don't include the SDK in our helix payload I noticed that the tests included the latest SDK - including the host - in our helix payloads. This is a large amount of unnecessary downloads and it also makes it so we use the latest host on the older frameworks which can fail when the latest host drops support for distros. Since our tests shouldn't need the full CLI, remove this from our helix payloads. We'll instead get just the runtime we need through `AdditionalDotNetPackage` * Place Helix downloaded runtime on the PATH Helix only sets the path when the CLI is included, however we don't need the CLI. * Make double assertions compare with tolerance instead of precision (#6923) Precision might cause small differences to round to a different number. Instead compare with a tolerance which is not sensitive to rounding. --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Michael Sharp <misharp@microsoft.com> Co-authored-by: Eric StJohn <ericstj@microsoft.com>
- Loading branch information
4 people
committed
Jan 9, 2024
1 parent
4f268c7
commit f602581
Showing
83 changed files
with
700 additions
and
366 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| #!/usr/bin/env bash | ||
|
|
||
| # getNonPortableDistroRid | ||
| # | ||
| # Input: | ||
| # targetOs: (str) | ||
| # targetArch: (str) | ||
| # rootfsDir: (str) | ||
| # | ||
| # Return: | ||
| # non-portable rid | ||
| getNonPortableDistroRid() | ||
| { | ||
| local targetOs="$1" | ||
| local targetArch="$2" | ||
| local rootfsDir="$3" | ||
| local nonPortableRid="" | ||
|
|
||
| if [ "$targetOs" = "linux" ]; then | ||
| 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%.*}" | ||
| fi | ||
|
|
||
| if [[ "${VERSION_ID:-}" =~ ^([[: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 | ||
| 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%%.*}"; }) | ||
| nonPortableRid="freebsd.$__freebsd_major_version-${targetArch}" | ||
| elif command -v getprop && getprop ro.product.system.model 2>&1 | 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" | ||
| ;; | ||
| joyent_*) | ||
| __smartos_major_version=$(echo "${__uname_version:7:4}") | ||
| nonPortableRid=smartos."$__smartos_major_version"-"$targetArch" | ||
| ;; | ||
| illumos_*) | ||
| nonPortableRid=openindiana-"$targetArch" | ||
| ;; | ||
| esac | ||
| elif [ "$targetOs" = "solaris" ]; then | ||
| __uname_version=$(uname -v) | ||
| __solaris_major_version=$(echo "${__uname_version%.*}") | ||
| nonPortableRid=solaris."$__solaris_major_version"-"$targetArch" | ||
| elif [ "$targetOs" = "haiku" ]; then | ||
| __uname_release=$(uname -r) | ||
| nonPortableRid=haiku.r"$__uname_release"-"$targetArch" | ||
| fi | ||
|
|
||
| echo "$(echo $nonPortableRid | tr '[:upper:]' '[:lower:]')" | ||
| } | ||
|
|
||
| # initDistroRidGlobal | ||
| # | ||
| # Input: | ||
| # os: (str) | ||
| # arch: (str) | ||
| # rootfsDir?: (nullable:string) | ||
| # | ||
| # Return: | ||
| # 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. | ||
| # | ||
| initDistroRidGlobal() | ||
| { | ||
| local targetOs="$1" | ||
| local targetArch="$2" | ||
| local 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." | ||
| exit 1 | ||
| fi | ||
| fi | ||
|
|
||
| __DistroRid=$(getNonPortableDistroRid "${targetOs}" "${targetArch}" "${rootfsDir}") | ||
|
|
||
| if [ -z "${__PortableTargetOS:-}" ]; then | ||
| __PortableTargetOS="$targetOs" | ||
|
|
||
| STRINGS="$(command -v strings || true)" | ||
| if [ -z "$STRINGS" ]; then | ||
| STRINGS="$(command -v llvm-strings || true)" | ||
| fi | ||
|
|
||
| # 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" | ||
| fi | ||
| fi | ||
|
|
||
| export __DistroRid __PortableTargetOS | ||
| } |
Oops, something went wrong.