Skip to content

Commit 9ceb200

Browse files
vbreussvbreuss
committed
Merge branch 'main' into topic/refactor-test-projects
# Conflicts: # .github/workflows/ci.yml
2 parents 4763559 + 9a0630b commit 9ceb200

File tree

5 files changed

+50
-55
lines changed

5 files changed

+50
-55
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,8 @@ jobs:
3333
name: Code coverage ${{ matrix.os }}
3434
path: "**/coverage.cobertura.xml"
3535
api-test:
36-
name: Test
37-
strategy:
38-
fail-fast: false
39-
matrix:
40-
os: [ubuntu-latest, windows-latest, macos-latest]
41-
runs-on: ${{ matrix.os }}
36+
name: API Test
37+
runs-on: ubuntu-latest
4238
steps:
4339
- name: Checkout sources
4440
uses: actions/checkout@v4
@@ -48,7 +44,12 @@ jobs:
4844
uses: actions/setup-dotnet@v4
4945
with:
5046
dotnet-version: |
47+
6.0.x
48+
7.0.x
5149
8.0.x
50+
9.0.x
51+
- name: Build solution
52+
run: dotnet build
5253
- name: Run tests
5354
run: dotnet test --filter FullyQualifiedName~TestableIO.System.IO.Abstractions.Api.Tests --logger "GitHubActions"
5455
coverage:

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<PackageIcon>icon_256x256.png</PackageIcon>
2020
</PropertyGroup>
2121
<ItemGroup>
22-
<None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\"/>
22+
<None Include="$(SolutionDir)/images/icon_256x256.png" Pack="true" PackagePath="/" Link="/icon_256x256.png"/>
2323
</ItemGroup>
2424

2525
<ItemGroup>
@@ -28,5 +28,5 @@
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
3030
</ItemGroup>
31-
31+
3232
</Project>

‎src/System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<AssemblyName>System.IO.Abstractions.TestingHelpers</AssemblyName>
4-
<RootNamespace>System.IO.Abstractions.TestingHelpers</RootNamespace>
5-
<Description>A set of pre-built mocks to help when testing file system interactions.</Description>
6-
<TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
7-
<PackageIcon>icon_256x256.png</PackageIcon>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<ProjectReference Include="..\TestableIO.System.IO.Abstractions.TestingHelpers\TestableIO.System.IO.Abstractions.TestingHelpers.csproj" />
11-
</ItemGroup>
12-
<ItemGroup>
13-
<None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\" />
14-
</ItemGroup>
2+
3+
<PropertyGroup>
4+
<AssemblyName>System.IO.Abstractions.TestingHelpers</AssemblyName>
5+
<RootNamespace>System.IO.Abstractions.TestingHelpers</RootNamespace>
6+
<Description>A set of pre-built mocks to help when testing file system interactions.</Description>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="..\TestableIO.System.IO.Abstractions.TestingHelpers\TestableIO.System.IO.Abstractions.TestingHelpers.csproj"/>
11+
</ItemGroup>
12+
1513
</Project>

‎src/System.IO.Abstractions/System.IO.Abstractions.csproj‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<AssemblyName>System.IO.Abstractions</AssemblyName>
4-
<RootNamespace>System.IO.Abstractions</RootNamespace>
5-
<Description>A set of abstractions to help make file system interactions testable.</Description>
6-
<TargetFrameworks>net8.0;net6.0;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
7-
<PackageIcon>icon_256x256.png</PackageIcon>
8-
</PropertyGroup>
9-
<ItemGroup>
10-
<ProjectReference Include="..\TestableIO.System.IO.Abstractions\TestableIO.System.IO.Abstractions.csproj" />
11-
<ProjectReference Include="..\TestableIO.System.IO.Abstractions.Wrappers\TestableIO.System.IO.Abstractions.Wrappers.csproj" />
12-
</ItemGroup>
13-
<ItemGroup>
14-
<None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\" />
15-
</ItemGroup>
2+
3+
<PropertyGroup>
4+
<AssemblyName>System.IO.Abstractions</AssemblyName>
5+
<RootNamespace>System.IO.Abstractions</RootNamespace>
6+
<Description>A set of abstractions to help make file system interactions testable.</Description>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<ProjectReference Include="..\TestableIO.System.IO.Abstractions\TestableIO.System.IO.Abstractions.csproj"/>
11+
<ProjectReference Include="..\TestableIO.System.IO.Abstractions.Wrappers\TestableIO.System.IO.Abstractions.Wrappers.csproj"/>
12+
</ItemGroup>
13+
1614
</Project>

‎src/TestableIO.System.IO.Abstractions/TestableIO.System.IO.Abstractions.csproj‎

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<AssemblyName>TestableIO.System.IO.Abstractions</AssemblyName>
4-
<RootNamespace>System.IO.Abstractions</RootNamespace>
5-
<Description>A set of abstractions to help make file system interactions testable.</Description>
6-
<TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
7-
<PackageIcon>icon_256x256.png</PackageIcon>
8-
<Nullable>enable</Nullable>
9-
<LangVersion>preview</LangVersion>
10-
</PropertyGroup>
11-
<ItemGroup>
12-
<PackageReference Include="Nullable">
13-
<PrivateAssets>all</PrivateAssets>
14-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15-
</PackageReference>
16-
<PackageReference Include="Testably.Abstractions.FileSystem.Interface" />
17-
</ItemGroup>
18-
<ItemGroup>
19-
<None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\" />
20-
</ItemGroup>
21-
</Project>
2+
3+
<PropertyGroup>
4+
<AssemblyName>TestableIO.System.IO.Abstractions</AssemblyName>
5+
<RootNamespace>System.IO.Abstractions</RootNamespace>
6+
<Description>A set of abstractions to help make file system interactions testable.</Description>
7+
<Nullable>enable</Nullable>
8+
<LangVersion>preview</LangVersion>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<PackageReference Include="Nullable">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
16+
<PackageReference Include="Testably.Abstractions.FileSystem.Interface"/>
17+
</ItemGroup>
18+
19+
</Project>

0 commit comments

Comments
 (0)