fix: Use correct condition to include package references

testcontainers · Nov 29, 2024 · 6a13dad · 6a13dad
1 parent ba20c96
commit 6a13dad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -10,18 +10,19 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        framework:
-          - 8.0
-          - 9.0
+        frameworks: [
+          { framework: "net8.0", version: "8.0.x" },
+          { framework: "net9.0", version: "9.0.x" },
+        ]
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup .NET Core
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: ${{ matrix.framework }}.x
+          dotnet-version: ${{ matrix.frameworks.version }}
       - name: Build
-        run: dotnet build -c Release --framework net${{ matrix.framework }}
+        run: dotnet build -c Release --framework ${{ matrix.frameworks.framework }}
       - name: Test
-        run: dotnet test -c Release --framework net${{ matrix.framework }} --no-build
+        run: dotnet test -c Release --framework ${{ matrix.frameworks.framework }} --no-build
diff --git a/src/Docker.DotNet/Docker.DotNet.csproj b/src/Docker.DotNet/Docker.DotNet.csproj
@@ -5,15 +5,13 @@
     <AssemblyName>Docker.DotNet</AssemblyName>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
+    <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFrameworkIdentifier) == '.NETStandard'">
     <PackageReference Include="System.Buffers" Version="4.5.1" />
     <PackageReference Include="System.IO.Pipelines" Version="8.0.0" />
     <PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
-  <ItemGroup Condition="$(TargetFrameworkIdentifier) == 'net9.0'">
-    <PackageReference Include="System.IO.Pipelines" Version="9.0.0" />
-    <PackageReference Include="System.Net.Http.Json" Version="9.0.0" />
-    <PackageReference Include="System.Text.Json" Version="9.0.0" />
-  </ItemGroup>
 </Project>