From a1f891dc700c0e88acadbcc2acde0b11f0b0d925 Mon Sep 17 00:00:00 2001 From: Jim Schaad Date: Sun, 28 Jun 2020 10:06:44 -0700 Subject: [PATCH 1/4] Get some missing fixes merged in --- .travis.yml | 4 ++-- COSE/COSE.Std10.csproj | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9d6289..62644b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ solution: COSE.Std10.sln matrix: include: - - dotnet: 2.2 + - dotnet: 3.1.5 mono: none env: - SLN=COSE.Std10.sln @@ -12,7 +12,7 @@ matrix: NUGET=dotnet FRAMEWORK=netcoreapp2.0 os: osx - - dotnet: 2.2 + - dotnet: 3.1.5 mono: none env: - SLN=COSE.Std10.sln diff --git a/COSE/COSE.Std10.csproj b/COSE/COSE.Std10.csproj index a4b29e8..c464b4e 100644 --- a/COSE/COSE.Std10.csproj +++ b/COSE/COSE.Std10.csproj @@ -4,8 +4,8 @@ netstandard2.0;net462;netcoreapp2.0 Com.AugustCellars.COSE Com.AugustCellars.COSE - 1.6.0 - 1.6.0 + 1.7.0 + 1.7.0 Jim Schaad An implementation of the CBOR Object Signing and Encryption standards. false @@ -14,6 +14,9 @@ EPL-2.0 +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 From 2ddd8cd3a4e1afbcb66c998366597714cb530526 Mon Sep 17 00:00:00 2001 From: Jim Schaad Date: Sun, 28 Jun 2020 10:08:31 -0700 Subject: [PATCH 2/4] Different version --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 62644b7..f4c6af0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ solution: COSE.Std10.sln matrix: include: - - dotnet: 3.1.5 + - dotnet: 3.1 mono: none env: - SLN=COSE.Std10.sln @@ -12,7 +12,7 @@ matrix: NUGET=dotnet FRAMEWORK=netcoreapp2.0 os: osx - - dotnet: 3.1.5 + - dotnet: 3.1 mono: none env: - SLN=COSE.Std10.sln From 6d785ce2953a4c1d9c2f6bfeff21d8042add1c57 Mon Sep 17 00:00:00 2001 From: Jim Schaad Date: Sun, 28 Jun 2020 10:51:07 -0700 Subject: [PATCH 3/4] Add another build try --- .travis.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index f4c6af0..ad76564 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,6 +21,15 @@ matrix: 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 + os: linux install: # - curl -L -o nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe From 3e151f6e68ee818d96cbda9262aa46f827631960 Mon Sep 17 00:00:00 2001 From: Jim Schaad Date: Sun, 28 Jun 2020 11:17:44 -0700 Subject: [PATCH 4/4] Tell it to be noisy on the restore --- .travis.yml | 3 --- COSE/Properties/AssemblyInfo.cs.bak | 41 ----------------------------- COSE/packages.config | 5 ---- build.sh | 5 ++-- 4 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 COSE/Properties/AssemblyInfo.cs.bak delete mode 100644 COSE/packages.config diff --git a/.travis.yml b/.travis.yml index ad76564..8856bfa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,6 @@ matrix: mono: none env: - SLN=COSE.Std10.sln - TARGET=Std10 VERSION=Release NUGET=dotnet FRAMEWORK=netcoreapp2.0 @@ -16,7 +15,6 @@ matrix: mono: none env: - SLN=COSE.Std10.sln - TARGET=Std10 VERSION=Release NUGET=dotnet FRAMEWORK=netcoreapp2.0 @@ -25,7 +23,6 @@ matrix: mono: none env: - SLN=COSE.Std10.sln - TARGET=Std10 VERSION=Release NUGET=dotnet FRAMEWORK=netcoreapp2.0 diff --git a/COSE/Properties/AssemblyInfo.cs.bak b/COSE/Properties/AssemblyInfo.cs.bak deleted file mode 100644 index f167c8c..0000000 --- a/COSE/Properties/AssemblyInfo.cs.bak +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("COSE")] -[assembly: AssemblyDescription("CBOR Object Signing and Encryption Library")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("August Cellars")] -[assembly: AssemblyProduct("COSE")] -[assembly: AssemblyCopyright("Copyright © August Cellars 2016-2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] -[assembly: CLSCompliant(true)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("4d68fcbc-efd5-48c8-a3f6-130a3da19534")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.4.0")] -[assembly: AssemblyFileVersion("1.0.4.0")] -// [assembly: InternalsVisibleTo("COSE.Net40.Tests")] -// [assembly: InternalsVisibleTo("COSE.Explorables")] - diff --git a/COSE/packages.config b/COSE/packages.config deleted file mode 100644 index 7dcfd31..0000000 --- a/COSE/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/build.sh b/build.sh index 6fde5fc..a7dc5c0 100755 --- a/build.sh +++ b/build.sh @@ -5,9 +5,8 @@ ls echo $SLN echo $VERSION -echo $TARGET +echo $FRAMEWORK -ls cd COSE @@ -15,7 +14,9 @@ cd COSE #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