Skip to content

Commit

Permalink
Get the NetStandard 1.3 build running (#33)
Browse files Browse the repository at this point in the history
* Setup to release

Add more framewords to drop
Update bouncy castle
Move tests from nunit to mstest in the hope we can get multiple framework testing of cose.dll as some point.
  • Loading branch information
jimsch authored Sep 16, 2018
1 parent f9a3bc1 commit 35b53e3
Show file tree
Hide file tree
Showing 21 changed files with 392 additions and 458 deletions.
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,20 @@ matrix:
VERSION=Release
NUGET=../nuget.exe
os: linux
- mono: latest
env:
- SLN=COSE.Std10.sln
TARGET=Std10
VERSION=Debug
NUGET=../nuget.exe
os: linux
- mono: 5.14.0
env:
- SLN=COSE.Std10.sln
TARGET=Std10
VERSION=Debug
NUGET=../nuget.exe
os: linux
- mono: latest
env:
- SLN=COSE.Std10.sln
Expand Down
19 changes: 12 additions & 7 deletions COSE/COSE.Std10.csproj
Original file line number Diff line number Diff line change
@@ -1,18 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.0</TargetFramework>
<TargetFrameworks>netstandard1.0;netstandard2.0;net462</TargetFrameworks>
<PackageId>Com.AugustCellars.COSE</PackageId>
<Id>Com.AugustCellars.COSE</Id>
<PackageVersion>1.2.0</PackageVersion>
<Version>1.2.0</Version>
<PackageVersion>1.3.0</PackageVersion>
<Version>1.3.0</Version>
<Authors>Jim Schaad</Authors>
<Description>An implementation of the CBOR Object Signing and Encryption standards.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<Copyright>Copyright @2016-7 Jim Schaad</Copyright>
<Copyright>Copyright @2016-8 Jim Schaad</Copyright>
<PackageTags>COSE CBOR</PackageTags>

<PackageReleaseNotes>
1.3.0
- Upgrade version of Bouncy Castle being used
- Produce a larger number of versions specifically NetStandard 1.0 and 2.0
1.2.0
- Update the version of CBOR library used again
- Add EdDSA signature algorithm and testing
Expand Down Expand Up @@ -48,8 +51,10 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|Any CPU' ">
<AssemblyOriginatorKeyFile>AugustCellarsStrongKey.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<IntermediateOutputPath>obj\Deploy\Std10</IntermediateOutputPath>
<OutputPath>bin\Deploy\Std10\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Deploy|AnyCPU' ">
<AssemblyOriginatorKeyFile>AugustCellarsStrongKey.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DefineConstants>TRACE;DEBUG;NETSTANDARD1_0</DefineConstants>
Expand All @@ -58,7 +63,7 @@

<ItemGroup>
<PackageReference Include="PeterO.Cbor" Version="3.0.3" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.2" />
<PackageReference Include="Portable.BouncyCastle" Version="1.8.3" />
</ItemGroup>
<ItemGroup>
<Compile Include="Attributes.cs" />
Expand Down
23 changes: 13 additions & 10 deletions COSE/COSE.Std10.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.30110.0
# Visual Studio 15
VisualStudioVersion = 15.0.28010.2026
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "COSE", "COSE.Std10.csproj", "{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "COSE.Std10", "COSE.Std10.csproj", "{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "COSE.Tests", "COSE.Tests\COSE.Std10.Tests.csproj", "{C97453B9-68FC-4C69-91BC-C777AEFE2688}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "Tests\Tests.csproj", "{9B8ABBDC-CE39-4DE9-B51D-C312992F4F05}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -20,14 +20,17 @@ Global
{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Release|Any CPU.Build.0 = Release|Any CPU
{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
{D02F476F-BC2C-4D01-BEDE-EB8E79DD050E}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Release|Any CPU.Build.0 = Release|Any CPU
{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Deploy|Any CPU.ActiveCfg = Deploy|Any CPU
{C97453B9-68FC-4C69-91BC-C777AEFE2688}.Deploy|Any CPU.Build.0 = Deploy|Any CPU
{9B8ABBDC-CE39-4DE9-B51D-C312992F4F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9B8ABBDC-CE39-4DE9-B51D-C312992F4F05}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9B8ABBDC-CE39-4DE9-B51D-C312992F4F05}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9B8ABBDC-CE39-4DE9-B51D-C312992F4F05}.Release|Any CPU.Build.0 = Release|Any CPU
{9B8ABBDC-CE39-4DE9-B51D-C312992F4F05}.Deploy|Any CPU.ActiveCfg = Release|Any CPU
{9B8ABBDC-CE39-4DE9-B51D-C312992F4F05}.Deploy|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6EF60996-1F27-4E5A-8C26-A86D068EFB67}
EndGlobalSection
EndGlobal
124 changes: 0 additions & 124 deletions COSE/COSE.Tests/COSE.Std10.Tests.csproj

This file was deleted.

Binary file removed COSE/COSE.Tests/Properties/AssemblyInfo.cs
Binary file not shown.
Binary file removed COSE/COSE.Tests/Properties/PexAssemblyInfo.cs
Binary file not shown.
7 changes: 0 additions & 7 deletions COSE/COSE.Tests/packages.config

This file was deleted.

4 changes: 4 additions & 0 deletions COSE/Message.cs
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@ public class CoseKeyKeys
public static readonly CBORObject x5c = CBORObject.FromObject("x5c");
public static readonly CBORObject x5t = CBORObject.FromObject("x5t");
public static readonly CBORObject x5t_sha_256 = CBORObject.FromObject("x5t#S256");
public static readonly CBORObject slt = CBORObject.FromObject(8);
public static readonly CBORObject kdf = CBORObject.FromObject(9);
public static readonly CBORObject clientId = CBORObject.FromObject(10);
public static readonly CBORObject serverId = CBORObject.FromObject(11);
}

public class CoseKeyParameterKeys
Expand Down
Binary file not shown.
Loading

0 comments on commit 35b53e3

Please sign in to comment.