Skip to content

Commit dd96637

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 2022100.1 (dotnet#76605)
Microsoft.DotNet.ApiCompat , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.22480.2 -> To Version 8.0.0-beta.22503.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 8d4c2c2 commit dd96637

File tree

4 files changed

+61
-60
lines changed

4 files changed

+61
-60
lines changed

‎eng/Version.Details.xml

+38-38
Original file line numberDiff line numberDiff line change
@@ -86,77 +86,77 @@
8686
</Dependency>
8787
</ProductDependencies>
8888
<ToolsetDependencies>
89-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22480.2">
89+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.22503.1">
9090
<Uri>https://github.com/dotnet/arcade</Uri>
91-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
91+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
9292
</Dependency>
93-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22480.2">
93+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.22503.1">
9494
<Uri>https://github.com/dotnet/arcade</Uri>
95-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
95+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22480.2">
97+
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="8.0.0-beta.22503.1">
9898
<Uri>https://github.com/dotnet/arcade</Uri>
99-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
99+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
100100
</Dependency>
101-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22480.2">
101+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="8.0.0-beta.22503.1">
102102
<Uri>https://github.com/dotnet/arcade</Uri>
103-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
103+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
104104
</Dependency>
105-
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22480.2">
105+
<Dependency Name="Microsoft.DotNet.GenFacades" Version="8.0.0-beta.22503.1">
106106
<Uri>https://github.com/dotnet/arcade</Uri>
107-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
107+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
108108
</Dependency>
109-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22480.2">
109+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.22503.1">
110110
<Uri>https://github.com/dotnet/arcade</Uri>
111-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
111+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
112112
</Dependency>
113-
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22480.2">
113+
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.5.1-beta.22503.1">
114114
<Uri>https://github.com/dotnet/arcade</Uri>
115-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
115+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
116116
</Dependency>
117-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22480.2">
117+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="8.0.0-beta.22503.1">
118118
<Uri>https://github.com/dotnet/arcade</Uri>
119-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
119+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
120120
</Dependency>
121-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22480.2">
121+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Packaging" Version="8.0.0-beta.22503.1">
122122
<Uri>https://github.com/dotnet/arcade</Uri>
123-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
123+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22480.2">
125+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.22503.1">
126126
<Uri>https://github.com/dotnet/arcade</Uri>
127-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
127+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
128128
</Dependency>
129-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22480.2">
129+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="8.0.0-beta.22503.1">
130130
<Uri>https://github.com/dotnet/arcade</Uri>
131-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
131+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
132132
</Dependency>
133-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22480.2">
133+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="8.0.0-beta.22503.1">
134134
<Uri>https://github.com/dotnet/arcade</Uri>
135-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
135+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
136136
</Dependency>
137-
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22480.2">
137+
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="8.0.0-beta.22503.1">
138138
<Uri>https://github.com/dotnet/arcade</Uri>
139-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
139+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
140140
</Dependency>
141-
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22480.2">
141+
<Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework" Version="8.0.0-beta.22503.1">
142142
<Uri>https://github.com/dotnet/arcade</Uri>
143-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
143+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
144144
</Dependency>
145-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22480.2">
145+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="8.0.0-beta.22503.1">
146146
<Uri>https://github.com/dotnet/arcade</Uri>
147-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
147+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
148148
</Dependency>
149-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22480.2">
149+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="8.0.0-beta.22503.1">
150150
<Uri>https://github.com/dotnet/arcade</Uri>
151-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
151+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
152152
</Dependency>
153-
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22480.2">
153+
<Dependency Name="Microsoft.DotNet.VersionTools.Tasks" Version="8.0.0-beta.22503.1">
154154
<Uri>https://github.com/dotnet/arcade</Uri>
155-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
155+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
156156
</Dependency>
157-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22480.2">
157+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="8.0.0-beta.22503.1">
158158
<Uri>https://github.com/dotnet/arcade</Uri>
159-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
159+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
160160
</Dependency>
161161
<Dependency Name="System.ComponentModel.TypeConverter.TestData" Version="7.0.0-beta.22476.1">
162162
<Uri>https://github.com/dotnet/runtime-assets</Uri>
@@ -274,9 +274,9 @@
274274
<Uri>https://github.com/dotnet/xharness</Uri>
275275
<Sha>db24a6d8a7fd009688425151e3da19cb5c4ca47f</Sha>
276276
</Dependency>
277-
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22480.2">
277+
<Dependency Name="Microsoft.DotNet.PackageTesting" Version="8.0.0-beta.22503.1">
278278
<Uri>https://github.com/dotnet/arcade</Uri>
279-
<Sha>60e9ab3c31d68167f8dac5b8e2c536deb12ef737</Sha>
279+
<Sha>d2d39276af2db3da7816ee2dc543e120d7e5781e</Sha>
280280
</Dependency>
281281
<Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.22415.6">
282282
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>

‎eng/Versions.props

+16-16
Original file line numberDiff line numberDiff line change
@@ -57,22 +57,22 @@
5757
<!-- SDK dependencies -->
5858
<MicrosoftDotNetApiCompatTaskVersion>8.0.100-alpha.1.22462.3</MicrosoftDotNetApiCompatTaskVersion>
5959
<!-- Arcade dependencies -->
60-
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22480.2</MicrosoftDotNetApiCompatVersion>
61-
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksFeedVersion>
62-
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22480.2</MicrosoftDotNetCodeAnalysisVersion>
63-
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22480.2</MicrosoftDotNetGenAPIVersion>
64-
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22480.2</MicrosoftDotNetGenFacadesVersion>
65-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22480.2</MicrosoftDotNetXUnitExtensionsVersion>
66-
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22480.2</MicrosoftDotNetXUnitConsoleRunnerVersion>
67-
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksArchivesVersion>
68-
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksInstallersVersion>
69-
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksPackagingVersion>
70-
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
71-
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksTemplatingVersion>
72-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22480.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
73-
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22480.2</MicrosoftDotNetRemoteExecutorVersion>
74-
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22480.2</MicrosoftDotNetVersionToolsTasksVersion>
75-
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22480.2</MicrosoftDotNetPackageTestingVersion>
60+
<MicrosoftDotNetApiCompatVersion>8.0.0-beta.22503.1</MicrosoftDotNetApiCompatVersion>
61+
<MicrosoftDotNetBuildTasksFeedVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksFeedVersion>
62+
<MicrosoftDotNetCodeAnalysisVersion>8.0.0-beta.22503.1</MicrosoftDotNetCodeAnalysisVersion>
63+
<MicrosoftDotNetGenAPIVersion>8.0.0-beta.22503.1</MicrosoftDotNetGenAPIVersion>
64+
<MicrosoftDotNetGenFacadesVersion>8.0.0-beta.22503.1</MicrosoftDotNetGenFacadesVersion>
65+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.22503.1</MicrosoftDotNetXUnitExtensionsVersion>
66+
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22503.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
67+
<MicrosoftDotNetBuildTasksArchivesVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksArchivesVersion>
68+
<MicrosoftDotNetBuildTasksInstallersVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksInstallersVersion>
69+
<MicrosoftDotNetBuildTasksPackagingVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksPackagingVersion>
70+
<MicrosoftDotNetBuildTasksTargetFrameworkVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksTargetFrameworkVersion>
71+
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksTemplatingVersion>
72+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>8.0.0-beta.22503.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
73+
<MicrosoftDotNetRemoteExecutorVersion>8.0.0-beta.22503.1</MicrosoftDotNetRemoteExecutorVersion>
74+
<MicrosoftDotNetVersionToolsTasksVersion>8.0.0-beta.22503.1</MicrosoftDotNetVersionToolsTasksVersion>
75+
<MicrosoftDotNetPackageTestingVersion>8.0.0-beta.22503.1</MicrosoftDotNetPackageTestingVersion>
7676
<!-- NuGet dependencies -->
7777
<NuGetBuildTasksPackVersion>6.0.0-preview.1.102</NuGetBuildTasksPackVersion>
7878
<!-- Installer dependencies -->

‎eng/common/cross/build-rootfs.sh

+4-3
Original file line numberDiff line numberDiff line change
@@ -391,9 +391,9 @@ elif [[ "$__CodeName" == "illumos" ]]; then
391391
--with-gnu-ld --disable-nls --disable-libgomp --disable-libquadmath --disable-libssp --disable-libvtv --disable-libcilkrts --disable-libada --disable-libsanitizer \
392392
--disable-libquadmath-support --disable-shared --enable-tls
393393
make -j "$JOBS" && make install && cd ..
394-
BaseUrl=https://pkgsrc.joyent.com
394+
BaseUrl=https://pkgsrc.smartos.org
395395
if [[ "$__UseMirror" == 1 ]]; then
396-
BaseUrl=http://pkgsrc.smartos.skylime.net
396+
BaseUrl=https://pkgsrc.smartos.skylime.net
397397
fi
398398
BaseUrl="$BaseUrl/packages/SmartOS/trunk/${__illumosArch}/All"
399399
echo "Downloading manifest"
@@ -402,7 +402,8 @@ elif [[ "$__CodeName" == "illumos" ]]; then
402402
read -ra array <<<"$__IllumosPackages"
403403
for package in "${array[@]}"; do
404404
echo "Installing '$package'"
405-
package="$(grep ">$package-[0-9]" All | sed -En 's/.*href="(.*)\.tgz".*/\1/p')"
405+
# find last occurrence of package in listing and extract its name
406+
package="$(sed -En '/.*href="('"$package"'-[0-9].*).tgz".*/h;$!d;g;s//\1/p' All)"
406407
echo "Resolved name '$package'"
407408
wget "$BaseUrl"/"$package".tgz
408409
ar -x "$package".tgz

‎global.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
"dotnet": "7.0.100-rc.1.22431.12"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22480.2",
12-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22480.2",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22480.2",
11+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.22503.1",
12+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.22503.1",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.22503.1",
1414
"Microsoft.Build.NoTargets": "3.5.0",
1515
"Microsoft.Build.Traversal": "3.1.6",
1616
"Microsoft.NET.Sdk.IL": "8.0.0-alpha.1.22502.5"

0 commit comments

Comments
 (0)