Update test project frameworks and github actions

Eastrall · Nov 11, 2022 · e82c5be · e82c5be
1 parent 3e7f1e6
commit e82c5be
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 50 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,13 +9,22 @@ on:
 jobs:
   build-library:
     runs-on: ubuntu-latest
+
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout repository
+      uses: actions/checkout@v3
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: | 
+          3.1.x
+          5.0.x
+          6.0.x
+          7.0.x
+
+    - name: Display .NET version
+      run: dotnet --version
 
     - name: Restore dependencies
       run: dotnet restore
@@ -24,10 +33,13 @@ jobs:
       run: dotnet build EntityFrameworkCore.DataEncryption.sln --configuration Release -f net6.0 --no-restore
 
     - name: Run unit tests
-      run: dotnet test EntityFrameworkCore.DataEncryption.sln --configuration Release /p:CollectCoverage=true /p:Exclude="[xunit*]*" /p:CoverletOutputFormat=opencover /p:CoverletOutput="../TestResults/TestResults.xml" /maxcpucount:1 -f net6.0 --no-build --verbosity normal
+      run: dotnet test --configuration Release --collect:"XPlat Code Coverage" --settings ./test/EntityFrameworkCore.DataEncryption.Test/runsettings.xml
+
+    - name: Copy coverage results
+      run:  cp ./test/EntityFrameworkCore.DataEncryption.Test/TestResults/**/*.xml ./test/EntityFrameworkCore.DataEncryption.Test/TestResults/
 
     - name: Upload code coverage
       uses: codecov/codecov-action@v3
       with:
-        files: ./test/TestResults/TestResults.xml
+        files: ./test/EntityFrameworkCore.DataEncryption.Test/TestResults/coverage.opencover.xml
         fail_ci_if_error: true
diff --git a/src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj b/src/EntityFrameworkCore.DataEncryption/EntityFrameworkCore.DataEncryption.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net7.0;net6.0;net5.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
 		<LangVersion>10.0</LangVersion>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<AssemblyName>EntityFrameworkCore.DataEncryption</AssemblyName>
@@ -37,9 +37,6 @@
 	<ItemGroup Condition="('$(TargetFramework)' == 'netstandard2.1')">
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5,)" />
 	</ItemGroup>
-	<ItemGroup Condition="('$(TargetFramework)' == 'net5.0')">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5,)" />
-	</ItemGroup>
 	<ItemGroup Condition="('$(TargetFramework)' == 'net6.0')">
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6,)" />
 	</ItemGroup>

diff --git a/test/EntityFrameworkCore.DataEncryption.Test/EntityFrameworkCore.DataEncryption.Test.csproj b/test/EntityFrameworkCore.DataEncryption.Test/EntityFrameworkCore.DataEncryption.Test.csproj
@@ -1,47 +1,31 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-	<TargetFramework>net6.0</TargetFramework>
-	<LangVersion>10</LangVersion>
-	<IsPackable>false</IsPackable>
-	<AssemblyName>Microsoft.EntityFrameworkCore.Encryption.Test</AssemblyName>
-	<RootNamespace>Microsoft.EntityFrameworkCore.Encryption.Test</RootNamespace>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net6.0</TargetFramework>
+		<LangVersion>10</LangVersion>
+		<IsPackable>false</IsPackable>
+		<AssemblyName>Microsoft.EntityFrameworkCore.Encryption.Test</AssemblyName>
+		<RootNamespace>Microsoft.EntityFrameworkCore.Encryption.Test</RootNamespace>
+	</PropertyGroup>
 
-  <ItemGroup>
-	<PackageReference Include="Bogus" Version="34.0.2" />
-	<PackageReference Include="coverlet.msbuild" Version="3.1.2">
-	  <PrivateAssets>all</PrivateAssets>
-	  <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-	</PackageReference>
-
-	<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-	<PackageReference Include="xunit" Version="2.4.2" />
-	<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
-	  <PrivateAssets>all</PrivateAssets>
-	  <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-	</PackageReference>
-	<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
-  </ItemGroup>
-
-  <ItemGroup>
-	<ProjectReference Include="..\..\src\EntityFrameworkCore.DataEncryption\EntityFrameworkCore.DataEncryption.csproj" />
-  </ItemGroup>
-
-	<ItemGroup Condition="('$(TargetFramework)' == 'netcoreapp3.1')">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[3.1,6)" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[3.1,6)" />
-	</ItemGroup>
-	<ItemGroup Condition="('$(TargetFramework)' == 'net5.0')">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[5,)" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[5,)" />
-	</ItemGroup>
-	<ItemGroup Condition="('$(TargetFramework)' == 'net6.0')">
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="[6,)" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="[6,)" />
-	</ItemGroup>
 	<ItemGroup>
-	  <Folder Include="Migration\" />
+		<ProjectReference Include="..\..\src\EntityFrameworkCore.DataEncryption\EntityFrameworkCore.DataEncryption.csproj" />
 	</ItemGroup>
 
+	<ItemGroup>
+		<PackageReference Include="Bogus" Version="34.0.2" />
+		<PackageReference Include="coverlet.collector" Version="3.2.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.11" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.11" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+		<PackageReference Include="xunit" Version="2.4.2" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+	</ItemGroup>
 </Project>
diff --git a/test/EntityFrameworkCore.DataEncryption.Test/runsettings.xml b/test/EntityFrameworkCore.DataEncryption.Test/runsettings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<RunSettings>
+	<DataCollectionRunSettings>
+		<DataCollectors>
+			<DataCollector friendlyName="XPlat code coverage">
+				<Configuration>
+					<Format>opencover</Format>
+				</Configuration>
+			</DataCollector>
+		</DataCollectors>
+	</DataCollectionRunSettings>
+</RunSettings>