Merge branch 'main' into topic/refactor-test-projects

# Conflicts: # .github/workflows/ci.yml
TestableIO · Feb 22, 2025 · 9ceb200 · 9ceb200
2 parents 4763559 + 9a0630b
commit 9ceb200
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 55 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,12 +33,8 @@ jobs:
           name: Code coverage ${{ matrix.os }}
           path: "**/coverage.cobertura.xml"
   api-test:
-    name: Test
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-    runs-on: ${{ matrix.os }}
+    name: API Test
+    runs-on: ubuntu-latest
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -48,7 +44,12 @@ jobs:
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
+            6.0.x
+            7.0.x
             8.0.x
+            9.0.x
+      - name: Build solution
+        run: dotnet build
       - name: Run tests
         run: dotnet test --filter FullyQualifiedName~TestableIO.System.IO.Abstractions.Api.Tests --logger "GitHubActions"
   coverage:

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -19,7 +19,7 @@
         <PackageIcon>icon_256x256.png</PackageIcon>
     </PropertyGroup>
     <ItemGroup>
-        <None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\"/>
+        <None Include="$(SolutionDir)/images/icon_256x256.png" Pack="true" PackagePath="/" Link="/icon_256x256.png"/>
     </ItemGroup>
 
     <ItemGroup>
@@ -28,5 +28,5 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
-    
+
 </Project>
diff --git a/src/System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj b/src/System.IO.Abstractions.TestingHelpers/System.IO.Abstractions.TestingHelpers.csproj
@@ -1,15 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-      <AssemblyName>System.IO.Abstractions.TestingHelpers</AssemblyName>
-      <RootNamespace>System.IO.Abstractions.TestingHelpers</RootNamespace>
-      <Description>A set of pre-built mocks to help when testing file system interactions.</Description>
-      <TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
-      <PackageIcon>icon_256x256.png</PackageIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TestableIO.System.IO.Abstractions.TestingHelpers\TestableIO.System.IO.Abstractions.TestingHelpers.csproj" />
-</ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
+
+    <PropertyGroup>
+        <AssemblyName>System.IO.Abstractions.TestingHelpers</AssemblyName>
+        <RootNamespace>System.IO.Abstractions.TestingHelpers</RootNamespace>
+        <Description>A set of pre-built mocks to help when testing file system interactions.</Description>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\TestableIO.System.IO.Abstractions.TestingHelpers\TestableIO.System.IO.Abstractions.TestingHelpers.csproj"/>
+    </ItemGroup>
+
 </Project>
diff --git a/src/System.IO.Abstractions/System.IO.Abstractions.csproj b/src/System.IO.Abstractions/System.IO.Abstractions.csproj
@@ -1,16 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>System.IO.Abstractions</AssemblyName>
-    <RootNamespace>System.IO.Abstractions</RootNamespace>
-    <Description>A set of abstractions to help make file system interactions testable.</Description>
-    <TargetFrameworks>net8.0;net6.0;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
-    <PackageIcon>icon_256x256.png</PackageIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\TestableIO.System.IO.Abstractions\TestableIO.System.IO.Abstractions.csproj" />
-    <ProjectReference Include="..\TestableIO.System.IO.Abstractions.Wrappers\TestableIO.System.IO.Abstractions.Wrappers.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
+
+    <PropertyGroup>
+        <AssemblyName>System.IO.Abstractions</AssemblyName>
+        <RootNamespace>System.IO.Abstractions</RootNamespace>
+        <Description>A set of abstractions to help make file system interactions testable.</Description>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\TestableIO.System.IO.Abstractions\TestableIO.System.IO.Abstractions.csproj"/>
+        <ProjectReference Include="..\TestableIO.System.IO.Abstractions.Wrappers\TestableIO.System.IO.Abstractions.Wrappers.csproj"/>
+    </ItemGroup>
+
 </Project>
diff --git a/src/TestableIO.System.IO.Abstractions/TestableIO.System.IO.Abstractions.csproj b/src/TestableIO.System.IO.Abstractions/TestableIO.System.IO.Abstractions.csproj
@@ -1,21 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>TestableIO.System.IO.Abstractions</AssemblyName>
-    <RootNamespace>System.IO.Abstractions</RootNamespace>
-    <Description>A set of abstractions to help make file system interactions testable.</Description>
-    <TargetFrameworks>net9.0;net8.0;net6.0;netstandard2.1;netstandard2.0;net472</TargetFrameworks>
-    <PackageIcon>icon_256x256.png</PackageIcon>
-    <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Nullable">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Testably.Abstractions.FileSystem.Interface" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\images\icon_256x256.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
-</Project>
+
+    <PropertyGroup>
+        <AssemblyName>TestableIO.System.IO.Abstractions</AssemblyName>
+        <RootNamespace>System.IO.Abstractions</RootNamespace>
+        <Description>A set of abstractions to help make file system interactions testable.</Description>
+        <Nullable>enable</Nullable>
+        <LangVersion>preview</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Nullable">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Testably.Abstractions.FileSystem.Interface"/>
+    </ItemGroup>
+
+</Project>