Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

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

Jump to bottom

[main] Update dependencies from dotnet/arcade #76605

Merged
merged 1 commit into from
Oct 5, 2022
Merged

[main] Update dependencies from dotnet/arcade #76605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,77 +86,77 @@
</Dependency>
</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>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</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.DotNet.GenAPI" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22480.2">
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22476.1">
<Uri>https://github.com/dotnet/runtime-assets</Uri>
Expand Down Expand Up @@ -274,9 +274,9 @@
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>db24a6d8a7fd009688425151e3da19cb5c4ca47f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22480.2">
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22503.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
</Dependency>
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
Expand Down
32 changes: 16 additions & 16 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,22 +57,22 @@
<!-- SDK dependencies -->
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-alpha.1.22462.3</MicrosoftDotNetApiCompatTaskVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22480.2</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22480.2</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22480.2</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22480.2</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22480.2</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22480.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22480.2</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22480.2</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22480.2</MicrosoftDotNetPackageTestingVersion>
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22503.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22503.1</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22503.1</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22503.1</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22503.1</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22503.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22503.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22503.1</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22503.1</MicrosoftDotNetPackageTestingVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
Expand Down
7 changes: 4 additions & 3 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"dotnet": "7.0.100-rc.1.22431.12"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22480.2",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22480.2",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22480.2",
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22503.1",
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22503.1",
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22503.1",
"Microsoft.Build.NoTargets": "3.5.0",
"Microsoft.Build.Traversal": "3.1.6",
"Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22502.5"
Expand Down