Skip to content

Commit 53ee218

Browse files
MattGalmmitche
andauthored
Update arcade to Preview 5 (#9769)
* Update arcade to Preview 4 * Update global.json * Update DotNetCli.props * Remove Debian 9 (EOL in 10 days), set ulimit -c to 0 to not spend time uploading dumps in arcade tests Co-authored-by: Matt Mitchell <[email protected]>
1 parent a264eb1 commit 53ee218

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "7.0.100-preview.2.22153.17"
3+
"dotnet": "7.0.100-preview.5.22307.18"
44
},
55
"msbuild-sdks": {
66
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22324.1",

src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<PropertyGroup>
33
<IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
44
<!-- TODO (https://github.com/dotnet/arcade/issues/7787): When bumping this, we should do #7787 -->
5-
<AspNetCoreRuntimeVersion>7.0.0-preview.2.22153.2</AspNetCoreRuntimeVersion>
5+
<AspNetCoreRuntimeVersion>7.0.0-preview.5.22303.8</AspNetCoreRuntimeVersion>
66
<DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
77
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
88
<!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->

tests/UnitTests.proj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
</ItemGroup>
5959

6060
<ItemGroup Condition=" '$(HelixAccessToken)' != '' ">
61-
<HelixTargetQueue Include="Debian.9.Amd64"/>
6261
<HelixTargetQueue Include="RedHat.7.Amd64"/>
6362
<HelixTargetQueue Include="Windows.10.Amd64"/>
6463
<HelixTargetQueue Include="(Debian.10.Amd64)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673"/>
@@ -71,7 +70,6 @@
7170
</PropertyGroup>
7271

7372
<ItemGroup Condition=" '$(HelixAccessToken)' == '' ">
74-
<HelixTargetQueue Include="Debian.9.Amd64.Open"/>
7573
<HelixTargetQueue Include="RedHat.7.Amd64.Open"/>
7674
<HelixTargetQueue Include="Windows.10.Amd64.Open"/>
7775
<HelixTargetQueue Include="(Debian.10.Amd64.Open)[email protected]/dotnet-buildtools/prereqs:debian-10-helix-amd64-20210304164434-56c6673"/>
@@ -80,6 +78,8 @@
8078
<PropertyGroup Condition="!$(HelixTargetQueue.StartsWith('Windows'))">
8179
<HelixPreCommands>$(HelixPreCommands);find $HELIX_CORRELATION_PAYLOAD -type f</HelixPreCommands>
8280
<HelixPreCommands>$(HelixPreCommands);find . -type f</HelixPreCommands>
81+
<!-- Remote Executor tests tend to make too many dumps for some OSes, and we're not testing dump functionality in Arcade's tests -->
82+
<HelixPreCommands>$(HelixPreCommands);ulimit -c 0</HelixPreCommands>
8383
</PropertyGroup>
8484

8585
<PropertyGroup Condition="$(HelixTargetQueue.StartsWith('Windows'))">

0 commit comments

Comments
 (0)