Skip to content

Commit 2fec040

Browse files
committed
chore: increase vstest timeout and update test sdk version
1 parent 7cad308 commit 2fec040

File tree

9 files changed

+13
-7
lines changed

9 files changed

+13
-7
lines changed

.github/workflows/run-tests-selected.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ on:
4242
description: Count of test loop (It's expected to be used for flaky tests)
4343
required: true
4444
default: 1
45+
46+
env:
47+
VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: "30000" # 30 seconds (Default: 100 [ms])
4548

4649
jobs:
4750
test:

.github/workflows/run-tests.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ on:
55
pull_request:
66
push:
77
workflow_dispatch:
8+
9+
env:
10+
VSTEST_TESTHOST_SHUTDOWN_TIMEOUT: "1000" # 30 seconds (Default: 100 [ms])
811

912
concurrency:
1013
group: ${{ github.workflow }}-${{ github.head_ref || github.ref || github.run_id }}

samples/BenchmarkDotNet.Samples.FSharp/BenchmarkDotNet.Samples.FSharp.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
<ItemGroup>
2727
<PackageReference Update="FSharp.Core" Version="9.0.300" />
2828
<PackageReference Update="System.ValueTuple" Version="4.6.1" />
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
29+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3030
</ItemGroup>
3131
</Project>

samples/BenchmarkDotNet.Samples/BenchmarkDotNet.Samples.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<ItemGroup>
3030
<PackageReference Include="System.Drawing.Common" Version="9.0.5" />
3131
<!-- The Test SDK is required only for the VSTest Adapter to work -->
32-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
32+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3333
<!-- This package enables the Visual Studio Profiler integration IntroVisualStudioProfiler.cs -->
3434
<PackageReference Include="Microsoft.VisualStudio.DiagnosticsHub.BenchmarkDotNetDiagnosers" Version="18.0.36302.1" />
3535
</ItemGroup>

tests/BenchmarkDotNet.Exporters.Plotting.Tests/BenchmarkDotNet.Exporters.Plotting.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<ProjectReference Include="..\BenchmarkDotNet.Tests\BenchmarkDotNet.Tests.csproj" />
1717
</ItemGroup>
1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
19+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
2020
<PackageReference Include="xunit" Version="2.9.3" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="[2.8.2]">
2222
<PrivateAssets>all</PrivateAssets>

tests/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks/BenchmarkDotNet.IntegrationTests.ManualRunning.MultipleFrameworks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
</ItemGroup>
4343
<ItemGroup>
4444
<!-- Microsoft.NET.Test.Sdk breaks netcoreapp2.0 -->
45-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" Condition=" '$(TargetFramework)' != 'netcoreapp2.0' " />
45+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" Condition=" '$(TargetFramework)' != 'netcoreapp2.0' " />
4646
<PackageReference Include="xunit" Version="2.9.3" />
4747
<!-- We use older version 2.4.1 for combatibility with netcoreapp2.0. -->
4848
<PackageReference Include="xunit.runner.visualstudio" Version="[2.4.1]">

tests/BenchmarkDotNet.IntegrationTests.ManualRunning/BenchmarkDotNet.IntegrationTests.ManualRunning.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.Windows\BenchmarkDotNet.Diagnostics.Windows.csproj" />
3535
</ItemGroup>
3636
<ItemGroup>
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3838
<PackageReference Include="xunit" Version="2.9.3" />
3939
<PackageReference Include="xunit.runner.visualstudio" Version="[2.8.2]">
4040
<PrivateAssets>all</PrivateAssets>

tests/BenchmarkDotNet.IntegrationTests/BenchmarkDotNet.IntegrationTests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ProjectReference Include="..\..\src\BenchmarkDotNet.Diagnostics.dotMemory\BenchmarkDotNet.Diagnostics.dotMemory.csproj" />
3535
</ItemGroup>
3636
<ItemGroup>
37-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
37+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
3838
</ItemGroup>
3939
<ItemGroup>
4040
<!-- Use v9.0.0 as baseline package for WithNuGet tests -->

tests/BenchmarkDotNet.Tests/BenchmarkDotNet.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
</Content>
1616
</ItemGroup>
1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
18+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
1919
<PackageReference Include="Verify.Xunit" Version="30.3.1" />
2020
<PackageReference Include="xunit" Version="2.9.3" />
2121
<PackageReference Include="xunit.runner.visualstudio" Version="[2.8.2]">

0 commit comments

Comments
 (0)