diff options
author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2022-10-10 15:24:04 +0300 |
---|---|---|
committer | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2022-10-10 15:24:04 +0300 |
commit | 3396e8470d42be6934c67b36b34fb5308bfcfbdf (patch) | |
tree | 933e6bea11a610e0d1ac6e8bca3b2dcd7793bf95 | |
parent | b3c15a9247e59508d343a14eb1cbd93f338862aa (diff) |
Update dependencies from https://github.com/dotnet/arcade build 20221003.1darc-main-3b32978d-728f-45e2-8268-258a6e6430f0
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.22473.1 -> To Version 8.0.0-beta.22503.1
-rw-r--r-- | eng/Version.Details.xml | 8 | ||||
-rw-r--r-- | eng/Versions.props | 2 | ||||
-rwxr-xr-x | eng/common/cross/build-rootfs.sh | 7 | ||||
-rw-r--r-- | eng/common/templates/steps/source-build.yml | 6 | ||||
-rw-r--r-- | global.json | 2 |
5 files changed, 16 insertions, 9 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 454307c95..d4e11294d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,14 +3,14 @@ <ProductDependencies> </ProductDependencies> <ToolsetDependencies> - <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22480.2"> + <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22503.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha> + <Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha> <SourceBuild RepoName="arcade" ManagedOnly="true" /> </Dependency> - <Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22480.2"> + <Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22503.1"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha> + <Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha> </Dependency> <Dependency Name="Microsoft.NET.Sdk.IL" Version="7.0.0-rtm.22473.12"> <Uri>https://github.com/dotnet/runtime</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index 6ab96dfae..1d728376b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -18,7 +18,7 @@ <SystemReflectionMetadataVersion>5.0.0</SystemReflectionMetadataVersion> <MicrosoftBuildFrameworkVersion>17.0.0-preview-21267-01</MicrosoftBuildFrameworkVersion> <MicrosoftBuildUtilitiesCoreVersion>17.0.0-preview-21267-01</MicrosoftBuildUtilitiesCoreVersion> - <MicrosoftDotNetApiCompatVersion>8.0.0-beta.22480.2</MicrosoftDotNetApiCompatVersion> + <MicrosoftDotNetApiCompatVersion>8.0.0-beta.22503.1</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.21271.1</MicrosoftDotNetCodeAnalysisVersion> <MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.10.0-2.final</MicrosoftCodeAnalysisCSharpCodeStyleVersion> <MicrosoftCodeAnalysisVersion>4.4.0-1.final</MicrosoftCodeAnalysisVersion> diff --git a/eng/common/cross/build-rootfs.sh b/eng/common/cross/build-rootfs.sh index 5680980fa..eddb4c380 100755 --- a/eng/common/cross/build-rootfs.sh +++ b/eng/common/cross/build-rootfs.sh @@ -391,9 +391,9 @@ elif [[ "$__CodeName" == "illumos" ]]; then --with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \ --disable-libquadmath-support --disable-shared --enable-tls make -j "$JOBS" && make install && cd .. - BaseUrl=https://pkgsrc.joyent.com + BaseUrl=https://pkgsrc.smartos.org if [[ "$__UseMirror" == 1 ]]; then - BaseUrl=http://pkgsrc.smartos.skylime.net + BaseUrl=https://pkgsrc.smartos.skylime.net fi BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All" echo "Downloading manifest" @@ -402,7 +402,8 @@ elif [[ "$__CodeName" == "illumos" ]]; then read -ra array <<<"$__IllumosPackages" for package in "${array[@]}"; do echo "Installing '$package'" - package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')" + # find last occurrence of package in listing and extract its name + package="$(sed -En '/.*href="('"$package"'-[0-9].*).tgz".*/h;$!d;g;s//\1/p' All)" echo "Resolved name '$package'" wget "$BaseUrl"/"$package".tgz ar -x "$package".tgz diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 4ec5577d2..a97a185a3 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -80,6 +85,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true \ /p:AssetManifestFileName=$assetManifestFileName diff --git a/global.json b/global.json index 2c26e4fa9..5236b14e7 100644 --- a/global.json +++ b/global.json @@ -9,7 +9,7 @@ "xcopy-msbuild": "17.2.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22480.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22503.1", "Microsoft.FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "7.0.0-rtm.22473.12" } |