Skip to content

Commit 55b6028

Browse files
gfoidlgfoidl
authored
Updates for .NET 5.0 (#80)
* Update references * CI to use .NET 5.0 * Fix CI * Nullability fixes * Fix CI Pt. II
1 parent 24a9300 commit 55b6028

28 files changed

+125
-92
lines changed

‎.azure/pipelines/jobs/build_and_test.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ jobs:
1010
release-build:
1111
BUILD_CONFIG: Release
1212
steps:
13+
- template: steps/dotnet-install.yml
14+
1315
- bash: |
1416
echo 'installed sdks:'
1517
dotnet --list-sdks

‎.azure/pipelines/jobs/e2e_tests.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ jobs:
44
pool:
55
vmImage: 'ubuntu-18.04'
66
steps:
7+
- template: steps/dotnet-install.yml
8+
79
- bash: |
810
sudo apt update
911
sudo apt install -y libxml2-utils

‎.azure/pipelines/jobs/steps/dotnet-install.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
steps:
2+
- task: UseDotNet@2
3+
displayName: 'Use dotnet sdk 5.0'
4+
inputs:
5+
version: 5.x
6+
includePreviewVersions: true
7+
8+
- task: UseDotNet@2
9+
displayName: 'Use dotnet sdk 3.1'
10+
inputs:
11+
version: 3.1.x
12+
includePreviewVersions: true
13+
14+
- task: UseDotNet@2
15+
displayName: 'Use dotnet sdk 2.1'
16+
inputs:
17+
version: 2.1.x
18+
includePreviewVersions: true

‎Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project>
1+
<Project>
22

33
<PropertyGroup>
44
<VersionMajor Condition="'$(VersionMajor)' == ''">1</VersionMajor>
@@ -15,7 +15,7 @@
1515
</PropertyGroup>
1616

1717
<PropertyGroup>
18-
<LangVersion>8.0</LangVersion>
18+
<LangVersion>latest</LangVersion>
1919
</PropertyGroup>
2020

2121
<PropertyGroup>

‎samples/Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
<Project>
1+
<Project>
22

33
<Import Project="../Directory.Build.props" />
44

55
<PropertyGroup>
6-
<SampleTfm>netcoreapp3.0</SampleTfm>
6+
<SampleTfm>net5.0</SampleTfm>
77
<IsPackable>false</IsPackable>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1212
</ItemGroup>
1313

1414
</Project>

‎samples/MsTestSample/MsTestSample.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(SampleTfm)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="MSTest.TestAdapter" Version="1.3.2" />
9-
<PackageReference Include="MSTest.TestFramework" Version="1.3.2" />
8+
<PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
9+
<PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
1010
</ItemGroup>
1111

1212
</Project>

‎samples/NUnitSample/NUnitSample.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(SampleTfm)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="NUnit" Version="3.11.0" />
9-
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
8+
<PackageReference Include="NUnit" Version="3.12.0" />
9+
<PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
1010
</ItemGroup>
1111

1212
</Project>

‎samples/XUnitSample/XUnitSample.csproj‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<TargetFramework>$(SampleTfm)</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="xunit" Version="2.4.0" />
9-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
8+
<PackageReference Include="xunit" Version="2.4.1" />
9+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
10+
<PrivateAssets>all</PrivateAssets>
11+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
12+
</PackageReference>
1013
</ItemGroup>
1114

1215
</Project>

‎source/trx2junit/Abstractions/IFileSystem.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System.Collections.Generic;
1+
using System.Collections.Generic;
22
using System.IO;
33

44
namespace trx2junit
55
{
66
public interface IFileSystem
77
{
8-
Stream OpenRead(string? path);
9-
void CreateDirectory(string? directory);
10-
IEnumerable<string> EnumerateFiles(string? path, string? pattern);
8+
Stream OpenRead(string path);
9+
void CreateDirectory(string directory);
10+
IEnumerable<string> EnumerateFiles(string path, string pattern);
1111
}
1212
}

‎source/trx2junit/Abstractions/IGlobHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
namespace trx2junit
1+
namespace trx2junit
22
{
33
public interface IGlobHandler
44
{
5-
void ExpandWildcards(WorkerOptions? options);
5+
void ExpandWildcards(WorkerOptions options);
66
}
77
}

0 commit comments

Comments
 (0)