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.

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

Get some missing fixes merged in #51

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 10 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,26 @@ solution: COSE.Std10.sln

matrix:
include:
- dotnet: 2.2
- dotnet: 3.1
mono: none
env:
- SLN=COSE.Std10.sln
TARGET=Std10
VERSION=Release
NUGET=dotnet
FRAMEWORK=netcoreapp2.0
os: osx
- dotnet: 2.2
- dotnet: 3.1
mono: none
env:
- SLN=COSE.Std10.sln
VERSION=Release
NUGET=dotnet
FRAMEWORK=netcoreapp2.0
os: linux
- dotnet: 2.1
mono: none
env:
- SLN=COSE.Std10.sln
TARGET=Std10
VERSION=Release
NUGET=dotnet
FRAMEWORK=netcoreapp2.0
Expand Down
7 changes: 5 additions & 2 deletions COSE/COSE.Std10.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<TargetFrameworks>netstandard2.0;net462;netcoreapp2.0</TargetFrameworks>
<PackageId>Com.AugustCellars.COSE</PackageId>
<Id>Com.AugustCellars.COSE</Id>
<PackageVersion>1.6.0</PackageVersion>
<Version>1.6.0</Version>
<PackageVersion>1.7.0</PackageVersion>
<Version>1.7.0</Version>
<Authors>Jim Schaad</Authors>
<Description>An implementation of the CBOR Object Signing and Encryption standards.</Description>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
Expand All @@ -14,6 +14,9 @@
<PackageLicenseExpression>EPL-2.0</PackageLicenseExpression>

<PackageReleaseNotes>
1.7.0
- Add the hash signature algorithm HSS-LSS
- Get the Countersign1 code working
1.6.0
- Update to use CBOR version 4.0 due to a security parsing problem.
- Update to 1.8.5 of BouncyCastle
Expand Down
41 changes: 0 additions & 41 deletions COSE/Properties/AssemblyInfo.cs.bak

This file was deleted.

5 changes: 0 additions & 5 deletions COSE/packages.config

This file was deleted.

5 changes: 3 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,18 @@ ls

echo $SLN
echo $VERSION
echo $TARGET
echo $FRAMEWORK

ls

cd COSE

#mono ../nuget.exe restore $SLN
#nuget.exe restore $SLN

# $NUGET restore $SLN
dotnet restore --verbosity detailed $SLN
dotnet build --framework=$FRAMEWORK $SLN
dotnet test --framework=$FRAMEWORK $SLN
#xbuild /p:Configuration=$VERSION $SLN

# mono ../testrunner/NUnit.ConsoleRunner.3.5.0/tools/nunit3-console.exe ./COSE.Tests/bin/$VERSION/$TARGET/COSE.Tests.dll
Expand Down