Get the build to run on Circle-CI

* Update packages used by COSE * Push up the 1.2 build Ready to drop a 1.2 version * syntax error in travis * Change the sdk version * Remove unused line * Change build matrix * try a different 'nuget' for dotnet * Stop trying to do a dotnet build for now * 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. * Ok - builds don't work because of problems with nuget * We are fialing builds on travis let's try it on appveyor * trigger build * Need to move to right directory * syntax err * Try an older mono version * fix typo Fix type * Use the right branch * Change command * Change directory to build * don't need quotes? * look for things * get directory case right * Only build one framework * try and run tests as well * Correct path processing issues? * More path fixes * Fix build error. * Compile it locally * Only mac os for travis - but it does not work * Add back linux Sometime need to figure out why this is failing. * Change version and get the 1.4.0 comments back in. * Correct travis build options It wont work but clean out that error at least.
jimsch · Sep 11, 2019 · 4c4a4dd · 4c4a4dd
1 parent efaf7f1
commit 4c4a4dd
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 38 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,5 +10,13 @@ jobs:
        - checkout
 
        - run:
-         name: Unit Tests
-         command: dotnet cose\COSE.Std10.sln
+           name: Get Examples
+           command: git clone --depth 1 https://github.com/cose-wg/Examples Regressions
+
+       - run:
+           name: Unit Tests
+           command: |
+              ls
+              cd COSE
+              dotnet build --framework=netcoreapp2.0 COSE.Std10.sln
+              dotnet test --framework=netcoreapp2.0 COSE.Std10.sln
diff --git a/.travis.yml b/.travis.yml
@@ -3,6 +3,14 @@ solution: COSE.Std10.sln
 
 matrix:
   include:
+    - dotnet: 2.2
+      mono: none
+      env:
+        - SLN=COSE.Std10.sln
+          TARGET=Std10
+          VERSION=Release
+          NUGET=dotnet
+      os: osx
     - dotnet: 2.2
       mono: none
       env:
@@ -11,34 +19,6 @@ matrix:
           VERSION=Release
           NUGET=dotnet
       os: linux
-#    - mono: latest
-#      env:
-#        - SLN=COSE.Std10.sln
-#          TARGET=Std10
-#          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
-#          TARGET=Std10
-#          VERSION=Release
-#          NUGET=../nuget.exe
-#      os: osx
 
 install:
 #   - curl -L -o nuget.exe https://dist.nuget.org/win-x86-commandline/latest/nuget.exe

diff --git a/COSE/COSE.Std10.csproj b/COSE/COSE.Std10.csproj
@@ -4,21 +4,25 @@
     <TargetFrameworks>netstandard2.0;net462;netcoreapp2.0</TargetFrameworks>
     <PackageId>Com.AugustCellars.COSE</PackageId>
     <Id>Com.AugustCellars.COSE</Id>
-    <PackageVersion>1.4.0</PackageVersion>
-    <Version>1.4.0</Version>
+    <PackageVersion>1.5.0</PackageVersion>
+    <Version>1.5.0</Version>
     <Authors>Jim Schaad</Authors>
     <Description>An implementation of the CBOR Object Signing and Encryption standards.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Copyright>Copyright @2016-8 Jim Schaad</Copyright>
+    <Copyright>Copyright @2016-9 Jim Schaad</Copyright>
     <PackageTags>COSE CBOR</PackageTags>
 
     <PackageReleaseNotes>
-1.4.0
+1.5.0
   - Add NetStandard2.0 as a new target
   - Internal changes to make clr compliant
   - Fix errors using X25519 and X448 as encryption algorithms
   - Add fuctions to create OneKey from imported BouncyCastle keys
   - Add public functions to be able to sign and verify with OneKey objects
+1.4.0
+  - Move to use Bouncy Castle version of EdDSA
+  - Add full counter signature support
+  - Pit in an initial hash signature for HSS-LMS, not finalized
 1.3.0
   - Upgrade version of Bouncy Castle being used
   - Produce a larger number of versions specifically NetStandard 1.0 and 2.0

diff --git a/COSE/Tests/Regression.cs b/COSE/Tests/Regression.cs
@@ -41,7 +41,7 @@ public static Collection<Object> data()
 
         @Parameter // first data value (0) is default
 #endif
-        public /* NOT private */ String directoryName = "..\\Regressions";
+        public /* NOT private */ String directoryName = Path.Combine("..", "Regressions");
 
         public int CFails = 0;
 
@@ -56,8 +56,8 @@ public void ProcessDirectory()
             try {
                 directory = new DirectoryInfo(directoryName);
                 if (!directory.Exists) {
-                    directory = new DirectoryInfo("..\\..\\..\\..\\" + directoryName);
-                    if (!directory.Exists) {
+                    directory = new DirectoryInfo(Path.Combine("..", "..", "..", "..", directoryName));
+                    if (!directory.Exists && Path.VolumeSeparatorChar == ':') {
                         directory = new DirectoryInfo("d:\\Projects\\cose\\Examples");
                         if (!directory.Exists)
                         {

diff --git a/build.sh b/build.sh
@@ -15,7 +15,7 @@ cd COSE
 #nuget.exe restore $SLN
 
 # $NUGET restore $SLN
-dotnet build --configuration $VERSION /p:platform=x86 $SLN
+dotnet build --configuration $VERSION  $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