Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 2 commits into from
Oct 10, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d33014e
Correct folder mapping, update Nuget packages, fix for ADO compatibility
lemccomb Oct 10, 2023
6cf0ed6
Update changelog for release
actions-user Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 CoseSignTool/.editorconfig → .editorconfig
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dotnet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
0 ...nUnitTests/CertificateStoreHelperTests.cs → ...dler.Tests/CertificateStoreHelperTests.cs
View file
Open in desktop
File renamed without changes.
0 .../CoseSignUnitTests/CoseExtensionsTests.cs → CoseHandler.Tests/CoseExtensionsTests.cs
View file
Open in desktop
File renamed without changes.
36 changes: 36 additions & 0 deletions CoseHandler.Tests/CoseHandler.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
0 ...sts/CoseParserSignWithKeyProviderTests.cs → ...sts/CoseParserSignWithKeyProviderTests.cs
View file
Open in desktop
File renamed without changes.
0 ...oseSignUnitTests/CoseSignValidateTests.cs → CoseHandler.Tests/CoseSignValidateTests.cs
View file
Open in desktop
File renamed without changes.
0 ...ignUnitTests/CoseX509CertificatesTests.cs → ...andler.Tests/CoseX509CertificatesTests.cs
View file
Open in desktop
File renamed without changes.
10 changes: 4 additions & 6 deletions ...CoseSignUnitTests/CoseX509HeadersTests.cs → CoseHandler.Tests/CoseX509HeadersTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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]
Expand All @@ -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()));
}


Expand All @@ -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()));
}
}
0 ...eSignUnitTests/CoseX509ThumbprintTests.cs → CoseHandler.Tests/CoseX509ThumbprintTests.cs
View file
Open in desktop
File renamed without changes.
0 ...SignUnitTests/TestsForTheUnderlyingAPI.cs → ...Handler.Tests/TestsForTheUnderlyingAPI.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseSignUnitTests/Usings.cs → CoseHandler.Tests/Usings.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseHandler/CoseHandler.cs → CoseHandler/CoseHandler.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseHandler/CoseHandler.csproj → CoseHandler/CoseHandler.csproj
View file
Open in desktop
File renamed without changes.
0 ...gnTool/CoseHandler/CoseValidationError.cs → CoseHandler/CoseValidationError.cs
View file
Open in desktop
File renamed without changes.
0 ...oseHandler/Extensions/ObjectExtensions.cs → CoseHandler/Extensions/ObjectExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...Tool/CoseHandler/ValidationFailureCode.cs → CoseHandler/ValidationFailureCode.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseHandler/ValidationResult.cs → CoseHandler/ValidationResult.cs
View file
Open in desktop
File renamed without changes.
0 ...bstractions/CoseSign1.Abstractions.csproj → ...bstractions/CoseSign1.Abstractions.csproj
View file
Open in desktop
File renamed without changes.
0 ...Abstractions/CoseSign1MessageValidator.cs → ...Abstractions/CoseSign1MessageValidator.cs
View file
Open in desktop
File renamed without changes.
0 ...Abstractions/CoseSign1ValidationResult.cs → ...Abstractions/CoseSign1ValidationResult.cs
View file
Open in desktop
File renamed without changes.
0 ...ractions/Exceptions/CoseSign1Exception.cs → ...ractions/Exceptions/CoseSign1Exception.cs
View file
Open in desktop
File renamed without changes.
0 ...actions/Interfaces/ICoseHeaderExtender.cs → ...actions/Interfaces/ICoseHeaderExtender.cs
View file
Open in desktop
File renamed without changes.
0 ...ons/Interfaces/ICoseSigningKeyProvider.cs → ...ons/Interfaces/ICoseSigningKeyProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...SignTool/CoseSign1.Abstractions/Usings.cs → CoseSign1.Abstractions/Usings.cs
View file
Open in desktop
File renamed without changes.
0 ...CertificateCoseSigningKeyProviderTests.cs → ...CertificateCoseSigningKeyProviderTests.cs
View file
Open in desktop
File renamed without changes.
12 changes: 8 additions & 4 deletions ...Tests/CoseSign1.Certificates.Tests.csproj → ...Tests/CoseSign1.Certificates.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 ...s.Tests/CoseSign1MessageValidatorTests.cs → ...s.Tests/CoseSign1MessageValidatorTests.cs
View file
Open in desktop
File renamed without changes.
0 .../TestCertificateCoseSigningKeyProvider.cs → .../TestCertificateCoseSigningKeyProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...TestX509Certificate2SigningKeyProvider.cs → ...TestX509Certificate2SigningKeyProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...ol/CoseSign1.Certificates.Tests/Usings.cs → CoseSign1.Certificates.Tests/Usings.cs
View file
Open in desktop
File renamed without changes.
0 .../X509Certificate2MessageValidatorTests.cs → .../X509Certificate2MessageValidatorTests.cs
View file
Open in desktop
File renamed without changes.
0 ...509Certificate2SigningKeyProviderTests.cs → ...509Certificate2SigningKeyProviderTests.cs
View file
Open in desktop
File renamed without changes.
0 ...rtificates.Tests/X509ChainBuilderTests.cs → ...rtificates.Tests/X509ChainBuilderTests.cs
View file
Open in desktop
File renamed without changes.
0 ...tes.Tests/X509ChainTrustValidatorTests.cs → ...tes.Tests/X509ChainTrustValidatorTests.cs
View file
Open in desktop
File renamed without changes.
0 ...tes.Tests/X509CommonNameValidatorTests.cs → ...tes.Tests/X509CommonNameValidatorTests.cs
View file
Open in desktop
File renamed without changes.
0 ...rtificates/CertificateCoseHeaderLabels.cs → ...rtificates/CertificateCoseHeaderLabels.cs
View file
Open in desktop
File renamed without changes.
0 ...ates/CertificateCoseSigningKeyProvider.cs → ...ates/CertificateCoseSigningKeyProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...ertificates/CoseSign1.Certificates.csproj → ...ertificates/CoseSign1.Certificates.csproj
View file
Open in desktop
File renamed without changes.
0 ...eSign1.Certificates/CoseX509Thumbprint.cs → CoseSign1.Certificates/CoseX509Thumbprint.cs
View file
Open in desktop
File renamed without changes.
0 ...ceptions/CoseSign1CertificateException.cs → ...ceptions/CoseSign1CertificateException.cs
View file
Open in desktop
File renamed without changes.
0 ...tes/Exceptions/CoseValidationException.cs → ...tes/Exceptions/CoseValidationException.cs
View file
Open in desktop
File renamed without changes.
0 ...tes/Exceptions/CoseX509FormatException.cs → ...tes/Exceptions/CoseX509FormatException.cs
View file
Open in desktop
File renamed without changes.
0 ...icates/Extensions/CborReaderExtensions.cs → ...icates/Extensions/CborReaderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...icates/Extensions/CborWriterExtensions.cs → ...icates/Extensions/CborWriterExtensions.cs
View file
Open in desktop
File renamed without changes.
0 .../Extensions/CoseSign1MessageExtensions.cs → .../Extensions/CoseSign1MessageExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...ons/ICertificateChainBuilderExtensions.cs → ...ons/ICertificateChainBuilderExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...s/X509Certificate2CollectionExtensions.cs → ...s/X509Certificate2CollectionExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...es/Interfaces/ICertificateChainBuilder.cs → ...es/Interfaces/ICertificateChainBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...ators/X509Certificate2MessageValidator.cs → ...ators/X509Certificate2MessageValidator.cs
View file
Open in desktop
File renamed without changes.
0 ...cal/Validators/X509ChainTrustValidator.cs → ...cal/Validators/X509ChainTrustValidator.cs
View file
Open in desktop
File renamed without changes.
0 ...cal/Validators/X509CommonNameValidator.cs → ...cal/Validators/X509CommonNameValidator.cs
View file
Open in desktop
File renamed without changes.
0 ...X509Certificate2CoseSigningKeyProvider.cs → ...X509Certificate2CoseSigningKeyProvider.cs
View file
Open in desktop
File renamed without changes.
0 ...n1.Certificates/Local/X509ChainBuilder.cs → ...n1.Certificates/Local/X509ChainBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ....Certificates/Local/X509ChainSortOrder.cs → ....Certificates/Local/X509ChainSortOrder.cs
View file
Open in desktop
File renamed without changes.
0 ...1.Certificates/Properties/AssemblyInfo.cs → ...1.Certificates/Properties/AssemblyInfo.cs
View file
Open in desktop
File renamed without changes.
0 ...SignTool/CoseSign1.Certificates/Usings.cs → CoseSign1.Certificates/Usings.cs
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...ign1.Nuspec/CoseSign1.Abstractions.nuspec → ...ign1.Nuspec/CoseSign1.Abstractions.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions ...ign1.Nuspec/CoseSign1.Certificates.nuspec → ...ign1.Nuspec/CoseSign1.Certificates.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 4 additions & 4 deletions ...ignTool/CoseSign1.Nuspec/CoseSign1.nuspec → CoseSign1.Nuspec/CoseSign1.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
0 ...ign1.Tests.Common/ContentTypeConstants.cs → ...ign1.Tests.Common/ContentTypeConstants.cs
View file
Open in desktop
File renamed without changes.
0 ...ests.Common/CoseSign1.Tests.Common.csproj → ...ests.Common/CoseSign1.Tests.Common.csproj
View file
Open in desktop
File renamed without changes.
0 ...CoseSign1.Tests.Common/FileSystemUtils.cs → CoseSign1.Tests.Common/FileSystemUtils.cs
View file
Open in desktop
File renamed without changes.
0 ...ign1.Tests.Common/TestCertificateUtils.cs → ...ign1.Tests.Common/TestCertificateUtils.cs
View file
Open in desktop
File renamed without changes.
0 ...SignTool/CoseSign1.Tests.Common/Usings.cs → CoseSign1.Tests.Common/Usings.cs
View file
Open in desktop
File renamed without changes.
12 changes: 8 additions & 4 deletions ...ol/CoseSign1.Tests/CoseSign1.Tests.csproj → CoseSign1.Tests/CoseSign1.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
0 ...s/CoseSign1IntegrationTestsWithBuilder.cs → ...s/CoseSign1IntegrationTestsWithBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...s/CoseSign1IntegrationTestsWithFactory.cs → ...s/CoseSign1IntegrationTestsWithFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...gn1.Tests/CoseSign1MessageBuilderTests.cs → ...gn1.Tests/CoseSign1MessageBuilderTests.cs
View file
Open in desktop
File renamed without changes.
0 ...essageDetachedSignatureExtensionsTests.cs → ...essageDetachedSignatureExtensionsTests.cs
View file
Open in desktop
File renamed without changes.
0 ...gn1.Tests/CoseSign1MessageFactoryTests.cs → ...gn1.Tests/CoseSign1MessageFactoryTests.cs
View file
Open in desktop
File renamed without changes.
0 ...n1.Tests/DetachedSignatureFactoryTests.cs → ...n1.Tests/DetachedSignatureFactoryTests.cs
View file
Open in desktop
File renamed without changes.
0 .../CoseSign1.Tests/StreamExtensionsTests.cs → CoseSign1.Tests/StreamExtensionsTests.cs
View file
Open in desktop
File renamed without changes.
0 ...nTool/CoseSign1.Tests/TestChainBuilder.cs → CoseSign1.Tests/TestChainBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...ool/CoseSign1.Tests/TestHeaderExtender.cs → CoseSign1.Tests/TestHeaderExtender.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseSign1.Tests/Usings.cs → CoseSign1.Tests/Usings.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseSign1/CoseSign1.csproj → CoseSign1/CoseSign1.csproj
View file
Open in desktop
File renamed without changes.
0 ...Tool/CoseSign1/CoseSign1MessageBuilder.cs → CoseSign1/CoseSign1MessageBuilder.cs
View file
Open in desktop
File renamed without changes.
0 ...Tool/CoseSign1/CoseSign1MessageFactory.cs → CoseSign1/CoseSign1MessageFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...ool/CoseSign1/DetachedSignatureFactory.cs → CoseSign1/DetachedSignatureFactory.cs
View file
Open in desktop
File renamed without changes.
0 ...eSign1/Exceptions/CoseSigningException.cs → CoseSign1/Exceptions/CoseSigningException.cs
View file
Open in desktop
File renamed without changes.
0 ...ign1MessageDetachedSignatureExtensions.cs → ...ign1MessageDetachedSignatureExtensions.cs
View file
Open in desktop
File renamed without changes.
0 .../CoseSign1/Extensions/StreamExtensions.cs → CoseSign1/Extensions/StreamExtensions.cs
View file
Open in desktop
File renamed without changes.
0 ...ignTool/CoseSign1/Interfaces/Constants.cs → CoseSign1/Interfaces/Constants.cs
View file
Open in desktop
File renamed without changes.
0 ...n1/Interfaces/ICoseSign1MessageFactory.cs → ...n1/Interfaces/ICoseSign1MessageFactory.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseSign1/Usings.cs → CoseSign1/Usings.cs
View file
Open in desktop
File renamed without changes.
48 changes: 35 additions & 13 deletions CoseSignTool/CoseSignTool.sln → CoseSignTool.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
0 ...ol/CoseSignTool.tests/CoseCommandTests.cs → CoseSignTool.tests/CoseCommandTests.cs
View file
Open in desktop
File renamed without changes.
16 changes: 10 additions & 6 deletions ...eSignTool.tests/CoseSignTool.tests.csproj → CoseSignTool.tests/CoseSignTool.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
0 ...ool/CoseSignTool.tests/GetCommandTests.cs → CoseSignTool.tests/GetCommandTests.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseSignTool.tests/MainTests.cs → CoseSignTool.tests/MainTests.cs
View file
Open in desktop
File renamed without changes.
0 ...ol/CoseSignTool.tests/SignCommandTests.cs → CoseSignTool.tests/SignCommandTests.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseSignTool.tests/Usings.cs → CoseSignTool.tests/Usings.cs
View file
Open in desktop
File renamed without changes.
0 ...oseSignTool.tests/ValidateCommandTests.cs → CoseSignTool.tests/ValidateCommandTests.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseSignTool/CoseCommand.cs → CoseSignTool/CoseCommand.cs
View file
Open in desktop
File renamed without changes.
0 CoseSignTool/CoseSignTool/CoseSignTool.cs → CoseSignTool/CoseSignTool.cs
View file
Open in desktop
File renamed without changes.
0 ...SignTool/CoseSignTool/CoseSignTool.csproj → CoseSignTool/CoseSignTool.csproj
View file
Open in desktop
File renamed without changes.
42 changes: 0 additions & 42 deletions CoseSignTool/CoseSignTool.tests/CoseTool.tests.csproj
View file
Open in desktop

This file was deleted.

Loading