Merge pull request #51 from microsoft/user/lemccomb/adobackport

Correct folder mapping, update Nuget packages, fix for ADO compatibility

.github/workflows/codeql.yml

@@ -44,7 +44,7 @@ jobs:
 
     # Use the Dotnet Build command to load dependencies and build the code.        
     - name: Build debug
-      run: dotnet build --verbosity normal CoseSignTool/CoseSignTool.sln
+      run: dotnet build --verbosity normal CoseSignTool.sln
 
     # Do the analysis
     - name: Perform CodeQL Analysis

.github/workflows/dotnet.yml

@@ -99,7 +99,7 @@ jobs:
 
     # Use the Dotnet Test command to load dependencies, build, and test the code.        
     - name: Build and Test debug
-      run: dotnet test --verbosity normal CoseSignTool/CoseSignTool.sln
+      run: dotnet test --verbosity normal CoseSignTool.sln
 
     # List the contents of the working directory to make sure all the artifacts are there.  
     - name: List working directory
@@ -207,8 +207,8 @@ jobs:
     # Note: We have to use the solution files to get the right output paths, due to the mix of .NET 7 and .NET Standard projects.
     - name: Publish outputs
       run: |
-        dotnet publish --configuration Debug --output published/debug CoseSignTool/CoseSignTool.sln
-        dotnet publish --configuration Release --output published/release CoseSignTool/CoseSignTool.sln
+        dotnet publish --configuration Debug --output published/debug CoseSignTool.sln
+        dotnet publish --configuration Release --output published/release CoseSignTool.sln
 
     # Create zip files for release.
     - name: Create zip files for the release

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [Unreleased](https://github.com/microsoft/CoseSignTool/tree/HEAD)
+
+[Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.12...HEAD)
+
+**Merged pull requests:**
+
+- implement detached signature factory, tests and helper extension methods. [\#47](https://github.com/microsoft/CoseSignTool/pull/47) ([JeromySt](https://github.com/JeromySt))
+
 ## [v0.3.1-pre.12](https://github.com/microsoft/CoseSignTool/tree/v0.3.1-pre.12) (2023-10-02)
 
 [Full Changelog](https://github.com/microsoft/CoseSignTool/compare/v0.3.1-pre.11...v0.3.1-pre.12)

CoseHandler.Tests/CoseHandler.Tests.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+	<LangVersion>latest</LangVersion>
+    <IsPackable>false</IsPackable>
+	<IsPublishable>false</IsPublishable>
+    <IsTestProject>true</IsTestProject>
+	<SignAssembly>True</SignAssembly>
+	<DelaySign>True</DelaySign>
+	<Nullable>enable</Nullable>
+	<AssemblyOriginatorKeyFile>..\StrongNameKeys\272MSSharedLibSN2048.snk</AssemblyOriginatorKeyFile>
+  </PropertyGroup>
+
+    <ItemGroup>
+	    <!-- Because this is a test project, don't run code coverage -->
+	    <AssemblyAttribute Include="System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" />
+    </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\CoseHandler\CoseHandler.csproj" />
+    <ProjectReference Include="..\CoseSign1.Abstractions\CoseSign1.Abstractions.csproj" />
+    <ProjectReference Include="..\CoseSign1.Tests.Common\CoseSign1.Tests.Common.csproj" />
+  </ItemGroup>
+
+</Project>

CoseSignTool/CoseSignUnitTests/CoseX509HeadersTests.cs → CoseHandler.Tests/CoseX509HeadersTests.cs

@@ -123,8 +123,7 @@ public void CoseX509Thumbprint_EmptyEnvelope()
     {
         CborWriter writer = new(CborConformanceMode.Strict);
         writer.WriteByteString(Array.Empty<byte>());
-
-        var thumbprint = CoseX509Thumprint.Deserialize(new CborReader(writer.Encode()));
+        _ = CoseX509Thumprint.Deserialize(new CborReader(writer.Encode()));
     }
 
     [TestMethod]
@@ -135,8 +134,7 @@ public void CoseX509Thumbprint_ArrayWrongSize()
         writer.WriteStartArray(1);
         writer.WriteInt32(42);
         writer.WriteEndArray();
-
-        var thumbprint = CoseX509Thumprint.Deserialize(new CborReader(writer.Encode()));
+        _ = CoseX509Thumprint.Deserialize(new CborReader(writer.Encode()));
     }
 
     [TestMethod]
@@ -149,7 +147,7 @@ public void CoseX509Thumbprint_ArrayFirstElementWrongType()
         writer.WriteByteString(Array.Empty<byte>());
         writer.WriteEndArray();
 
-        var thumbprint = CoseX509Thumprint.Deserialize(new CborReader(writer.Encode()));
+        _ = CoseX509Thumprint.Deserialize(new CborReader(writer.Encode()));
     }
 
 
@@ -163,6 +161,6 @@ public void CoseX509Thumbprint_ArraySecondElementWrongType()
         writer.WriteInt32(42);
         writer.WriteEndArray();
 
-        var thumbprint = CoseX509Thumprint.Deserialize(new CborReader(writer.Encode()));
+        _ = CoseX509Thumprint.Deserialize(new CborReader(writer.Encode()));
     }
 }

CoseSignTool/CoseSign1.Certificates.Tests/CoseSign1.Certificates.Tests.csproj → CoseSign1.Certificates.Tests/CoseSign1.Certificates.Tests.csproj

@@ -17,13 +17,17 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.10.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+        <PackageReference Include="FluentAssertions" Version="6.12.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+        <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
         <PackageReference Include="NUnit" Version="3.13.3" />
         <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
         <PackageReference Include="NUnit.Analyzers" Version="3.5.0" />
-        <PackageReference Include="Moq" Version="4.16.1" />
-        <PackageReference Include="coverlet.collector" Version="3.1.2" />
+        <PackageReference Include="Moq" Version="4.20.69" />
+        <PackageReference Include="coverlet.collector" Version="3.2.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>

CoseSignTool/CoseSign1.Nuspec/CoseSign1.Abstractions.nuspec → CoseSign1.Nuspec/CoseSign1.Abstractions.nuspec

@@ -17,8 +17,8 @@ Abstractions required to extend or enhance Create CoseSign1 functionality.
   <files>
     <file src="..\CoseSign1.Abstractions\bin\Release\netstandard2.0\CoseSign1.Abstractions.dll" target="lib\netstandard2.0" />
     <file src="..\CoseSign1.Abstractions\bin\Release\netstandard2.0\CoseSign1.Abstractions.pdb" target="Build\symbols" />
-    <file src="..\CoseSign1.Abstractions\bin\Release\netstandard2.0\_manifest\manifest.json" target="Build\sbom" />
-    <file src="..\CoseSign1.Abstractions\bin\Release\netstandard2.0\_manifest\manifest.json.sha256" target="Build\sbom" />
+    <file src="..\CoseSign1.Abstractions\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.cat" target="Build\sbom\spdx_2.2" />
+    <file src="..\CoseSign1.Abstractions\bin\Release\netstandard2.0\_manifest\spdx_2.2\bsi.json" target="Build\sbom\spdx_2.2" />
     <file src="..\CoseSign1.Abstractions\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.spdx.json" target="Build\sbom\spdx_2.2" />
     <file src="..\CoseSign1.Abstractions\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.spdx.json.sha256" target="Build\sbom\spdx_2.2" />
 </files>

CoseSignTool/CoseSign1.Nuspec/CoseSign1.Certificates.nuspec → CoseSign1.Nuspec/CoseSign1.Certificates.nuspec

@@ -18,8 +18,8 @@ Abstractions and classes required to extend or enhance Microsoft.CoseSign1.Abstr
   <files>
     <file src="..\CoseSign1.Certificates\bin\Release\netstandard2.0\CoseSign1.Certificates.dll" target="lib\netstandard2.0" />
     <file src="..\CoseSign1.Certificates\bin\Release\netstandard2.0\CoseSign1.Certificates.pdb" target="Build\symbols" />
-    <file src="..\CoseSign1.Certificates\bin\Release\netstandard2.0\_manifest\manifest.json" target="Build\sbom" />
-    <file src="..\CoseSign1.Certificates\bin\Release\netstandard2.0\_manifest\manifest.json.sha256" target="Build\sbom" />
+    <file src="..\CoseSign1.Certificates\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.cat" target="Build\sbom\spdx_2.2" />
+    <file src="..\CoseSign1.Certificates\bin\Release\netstandard2.0\_manifest\spdx_2.2\bsi.json" target="Build\sbom\spdx_2.2" />
     <file src="..\CoseSign1.Certificates\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.spdx.json" target="Build\sbom\spdx_2.2" />
     <file src="..\CoseSign1.Certificates\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.spdx.json.sha256" target="Build\sbom\spdx_2.2" />
   </files>

CoseSignTool/CoseSign1.Nuspec/CoseSign1.nuspec → CoseSign1.Nuspec/CoseSign1.nuspec

@@ -17,9 +17,9 @@ Factory Implementations required to Create CoseSign1 Message.
   <files>
     <file src="..\CoseSign1\bin\Release\netstandard2.0\CoseSign1.dll" target="lib\netstandard2.0" />
     <file src="..\CoseSign1\bin\Release\netstandard2.0\CoseSign1.pdb" target="Build\symbols" />
-    <file src="..\CoseSign1\bin\Release\netstandard2.0\_manifest\manifest.json" target="Build\sbom" />
-    <file src="..\CoseSign1\bin\Release\netstandard2.0\_manifest\manifest.json.sha256" target="Build\sbom" />
-    <file src="..\CoseSign1\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.spdx.json" target="Build\sbom\spdx_2.2" />
-    <file src="..\CoseSign1\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.spdx.json.sha256" target="Build\sbom\spdx_2.2" />
+	<file src="..\CoseSign1\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.cat" target="Build\sbom\spdx_2.2" />
+	<file src="..\CoseSign1\bin\Release\netstandard2.0\_manifest\spdx_2.2\bsi.json" target="Build\sbom\spdx_2.2" />
+	<file src="..\CoseSign1\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.spdx.json" target="Build\sbom\spdx_2.2" />
+	<file src="..\CoseSign1\bin\Release\netstandard2.0\_manifest\spdx_2.2\manifest.spdx.json.sha256" target="Build\sbom\spdx_2.2" />
    </files>
 </package>

CoseSignTool/CoseSign1.Tests/CoseSign1.Tests.csproj → CoseSign1.Tests/CoseSign1.Tests.csproj

@@ -17,13 +17,17 @@
     </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="FluentAssertions" Version="6.10.0" />
-    <PackageReference Include="Moq" Version="4.16.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Moq" Version="4.20.69" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
     <PackageReference Include="NUnit.Analyzers" Version="3.5.0" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="coverlet.collector" Version="3.2.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="System.Formats.Cbor" Version="7.0.0" />
     <PackageReference Include="System.Security.Cryptography.Cose" Version="7.0.0" />
   </ItemGroup>

CoseSignTool/CoseSignTool.sln → CoseSignTool.sln

@@ -5,9 +5,12 @@ VisualStudioVersion = 17.0.32112.339
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoseSignTool", "CoseSignTool\CoseSignTool.csproj", "{8388C0AF-458F-4407-B5A9-C900D34AE6BB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoseHandler.Tests", "CoseSignUnitTests\CoseHandler.Tests.csproj", "{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0EBBE2F9-CCAE-4129-BCD6-C59647AF9EB8}"
+	ProjectSection(SolutionItems) = preProject
+		LICENSE = LICENSE
+		Nuget.config = Nuget.config
+		README.md = README.md
+	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoseSign1.Abstractions", "CoseSign1.Abstractions\CoseSign1.Abstractions.csproj", "{4E7E48ED-ED6E-4CD1-8052-36FD91EED999}"
 EndProject
@@ -23,7 +26,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoseSign1.Tests.Common", "C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoseSignTool.tests", "CoseSignTool.tests\CoseSignTool.tests.csproj", "{FA48F9DF-CB88-48BC-8594-EC496E193659}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoseHandler", "CoseHandler\CoseHandler.csproj", "{AA28D81F-A0AB-492F-BC66-18EBB2E0BBF9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CoseHandler", "CoseHandler\CoseHandler.csproj", "{AA28D81F-A0AB-492F-BC66-18EBB2E0BBF9}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{36BAA2CE-AE8E-4E29-9234-8EB1953802CD}"
+	ProjectSection(SolutionItems) = preProject
+		docs\Advanced.md = docs\Advanced.md
+		CHANGELOG.md = CHANGELOG.md
+		docs\CODE_OF_CONDUCT.md = docs\CODE_OF_CONDUCT.md
+		docs\CONTRIBUTING.md = docs\CONTRIBUTING.md
+		docs\CoseHandler.md = docs\CoseHandler.md
+		docs\CoseSignTool.md = docs\CoseSignTool.md
+		docs\SECURITY.md = docs\SECURITY.md
+		docs\STYLE.md = docs\STYLE.md
+		docs\SUPPORT.md = docs\SUPPORT.md
+		docs\Troubleshooting.md = docs\Troubleshooting.md
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoseHandler.Tests", "CoseHandler.Tests\CoseHandler.Tests.csproj", "{DD155201-7EDA-4979-9E6D-768EB655C8A8}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -41,14 +60,6 @@ Global
 		{8388C0AF-458F-4407-B5A9-C900D34AE6BB}.Release|Any CPU.Build.0 = Release|x64
 		{8388C0AF-458F-4407-B5A9-C900D34AE6BB}.Release|x64.ActiveCfg = Release|x64
 		{8388C0AF-458F-4407-B5A9-C900D34AE6BB}.Release|x64.Build.0 = Release|x64
-		{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}.Debug|Any CPU.Build.0 = Debug|x64
-		{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}.Debug|x64.ActiveCfg = Debug|x64
-		{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}.Debug|x64.Build.0 = Debug|x64
-		{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}.Release|Any CPU.ActiveCfg = Release|x64
-		{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}.Release|Any CPU.Build.0 = Release|x64
-		{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}.Release|x64.ActiveCfg = Release|x64
-		{A0E2186D-1D88-4FD8-9A19-0D655D6C0815}.Release|x64.Build.0 = Release|x64
 		{4E7E48ED-ED6E-4CD1-8052-36FD91EED999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{4E7E48ED-ED6E-4CD1-8052-36FD91EED999}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4E7E48ED-ED6E-4CD1-8052-36FD91EED999}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -101,8 +112,8 @@ Global
 		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Debug|Any CPU.Build.0 = Debug|x64
 		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Debug|x64.ActiveCfg = Debug|x64
 		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Debug|x64.Build.0 = Debug|x64
-		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Release|Any CPU.ActiveCfg = Release|x64
+		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Release|Any CPU.Build.0 = Release|x64
 		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Release|x64.ActiveCfg = Release|Any CPU
 		{FA48F9DF-CB88-48BC-8594-EC496E193659}.Release|x64.Build.0 = Release|Any CPU
 		{AA28D81F-A0AB-492F-BC66-18EBB2E0BBF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -113,10 +124,21 @@ Global
 		{AA28D81F-A0AB-492F-BC66-18EBB2E0BBF9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{AA28D81F-A0AB-492F-BC66-18EBB2E0BBF9}.Release|x64.ActiveCfg = Release|Any CPU
 		{AA28D81F-A0AB-492F-BC66-18EBB2E0BBF9}.Release|x64.Build.0 = Release|Any CPU
+		{DD155201-7EDA-4979-9E6D-768EB655C8A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DD155201-7EDA-4979-9E6D-768EB655C8A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DD155201-7EDA-4979-9E6D-768EB655C8A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{DD155201-7EDA-4979-9E6D-768EB655C8A8}.Debug|x64.Build.0 = Debug|Any CPU
+		{DD155201-7EDA-4979-9E6D-768EB655C8A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DD155201-7EDA-4979-9E6D-768EB655C8A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DD155201-7EDA-4979-9E6D-768EB655C8A8}.Release|x64.ActiveCfg = Release|Any CPU
+		{DD155201-7EDA-4979-9E6D-768EB655C8A8}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{36BAA2CE-AE8E-4E29-9234-8EB1953802CD} = {0EBBE2F9-CCAE-4129-BCD6-C59647AF9EB8}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7A47A7E7-CC2B-48CE-9D97-3629EF8AC140}
 	EndGlobalSection

CoseSignTool/CoseSignTool.tests/CoseSignTool.tests.csproj → CoseSignTool.tests/CoseSignTool.tests.csproj

@@ -9,7 +9,7 @@
 	<PropertyGroup>
 		<EnablePreviewFeatures>true</EnablePreviewFeatures>
 		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-		<PlatformTarget>AnyCPU</PlatformTarget>
+		<PlatformTarget>x64</PlatformTarget>
 		<SignAssembly>True</SignAssembly>
 		<PublicSign>True</PublicSign>
 		<AssemblyOriginatorKeyFile>..\StrongNameKeys\272MSSharedLibSN2048.snk</AssemblyOriginatorKeyFile>
@@ -26,18 +26,22 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-		<PackageReference Include="Moq" Version="4.16.1" />
+		<PackageReference Include="coverlet.collector" Version="3.2.0">
+		  <PrivateAssets>all</PrivateAssets>
+		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+		<PackageReference Include="Moq" Version="4.20.69" />
 		<PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-		<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-		<PackageReference Include="FluentAssertions" Version="6.10.0" />
+		<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+		<PackageReference Include="FluentAssertions" Version="6.12.0" />
 	</ItemGroup>
 
     <ItemGroup>
+	    <ProjectReference Include="..\CoseHandler.Tests\CoseHandler.Tests.csproj" />
 	    <ProjectReference Include="..\CoseHandler\CoseHandler.csproj" />
 	    <ProjectReference Include="..\CoseSign1.Abstractions\CoseSign1.Abstractions.csproj" />
 	    <ProjectReference Include="..\CoseSign1.Tests.Common\CoseSign1.Tests.Common.csproj" />
 	    <ProjectReference Include="..\CoseSignTool\CoseSignTool.csproj" />
-		<ProjectReference Include="..\CoseSignUnitTests\CoseHandler.Tests.csproj" />
     </ItemGroup>
 </Project>