Merge pull request #26 from jpdillingham/master

Updated to reflect updates to SDK.Packaging library

Author: jpdillingham

OpenIIoT.Tools.Packager.Tests/Data/manifest.json

@@ -7,12 +7,10 @@
   "Copyright": "Copyright (c) 2017 OpenIIoT",
   "License": "AGPLv3",
   "Url": "http://github.com/openiiot",
-  "Files": {
-    "WebIndex": [
-      {
-        "Source": "index.html",
-        "Checksum": ""
-      }
-    ]
-  }
+  "Files": [
+    {
+      "Source": "index.html",
+      "Checksum": ""
+    }
+  ]
 }

OpenIIoT.Tools.Packager.Tests/Data/package.zip

@@ -42,8 +42,8 @@
     <DocumentationFile>bin\Release\OpenIIoT.Tools.Packager.Tests.XML</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="OpenIIoT.SDK.Packaging, Version=0.9.0.23796, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenIIoT.SDK.Packaging.0.9.0.23796-beta\lib\OpenIIoT.SDK.Packaging.dll</HintPath>
+    <Reference Include="OpenIIoT.SDK.Packaging, Version=0.9.1.26849, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenIIoT.SDK.Packaging.0.9.1.26849-beta\lib\OpenIIoT.SDK.Packaging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

OpenIIoT.Tools.Packager.Tests/Data/signedpackage.zip

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="OpenCover" version="4.6.519" targetFramework="net452" />
-  <package id="OpenIIoT.SDK.Packaging" version="0.9.0.23796-beta" targetFramework="net452" />
+  <package id="OpenIIoT.SDK.Packaging" version="0.9.1.26849-beta" targetFramework="net452" />
   <package id="StyleCop.Analyzers" version="1.0.2" targetFramework="net452" developmentDependency="true" />
   <package id="xunit" version="2.2.0" targetFramework="net452" />
   <package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />

OpenIIoT.Tools.Packager.Tests/OpenIIoT.Tools.Packager.Tests.csproj

@@ -201,12 +201,11 @@ private static void PrintManifestHelp()
             lineBreak();
 
             prefixed("<-d|--directory <directory>>\tThe directory containing payload files.");
-            prefixed("[-i|--include-resources]\t\tInclude non-binary/web files.");
             prefixed("[-h|--hash]\t\t\tMark files to be hashed during packaging.");
             prefixed("[-m|--manifest <file>]\t\tThe output manifest file.");
 
             lineBreak();
-            prefixed("! ex: 'manifest -hi -d \"desktop\\coolPlugin\" -o \"manifest.json\"'");
+            prefixed("! ex: 'manifest -h -d \"desktop\\coolPlugin\" -o \"manifest.json\"'");
             PrintFooter();
         }
 

OpenIIoT.Tools.Packager.Tests/packages.config

@@ -39,8 +39,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="OpenIIoT.SDK.Packaging, Version=0.9.0.23796, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenIIoT.SDK.Packaging.0.9.0.23796-beta\lib\OpenIIoT.SDK.Packaging.dll</HintPath>
+    <Reference Include="OpenIIoT.SDK.Packaging, Version=0.9.1.26849, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenIIoT.SDK.Packaging.0.9.1.26849-beta\lib\OpenIIoT.SDK.Packaging.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />

OpenIIoT.Tools.Packager/HelpPrinter.cs

@@ -41,7 +41,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using OpenIIoT.SDK.Packaging;
 using OpenIIoT.SDK.Packaging.Manifest;
 using OpenIIoT.SDK.Packaging.Operations;
@@ -68,12 +67,6 @@ public class Program
         [Argument('h', "hash-files")]
         private static bool HashFiles { get; set; }
 
-        /// <summary>
-        ///     Gets or sets a value indicating whether resource files are included when generating a manifest.
-        /// </summary>
-        [Argument('i', "include-resources")]
-        private static bool IncludeResources { get; set; }
-
         /// <summary>
         ///     Gets or sets the Keybase.io username of the account hosting the PGP public key used for digest verification.
         /// </summary>
@@ -174,7 +167,7 @@ public static void Process(string args = "")
                     ManifestGenerator generator = new ManifestGenerator();
                     generator.Updated += Update;
 
-                    PackageManifest manifest = generator.GenerateManifest(Directory, IncludeResources, HashFiles, ManifestFile);
+                    PackageManifest manifest = generator.GenerateManifest(Directory, HashFiles, ManifestFile);
 
                     if (string.IsNullOrEmpty(ManifestFile) && manifest != default(PackageManifest))
                     {

OpenIIoT.Tools.Packager/OpenIIoT.Tools.Packager.csproj

@@ -11,4 +11,4 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("ebe1344b-38fd-4266-a5d9-06ad10fe0aee")]
-[assembly: AssemblyVersion("1.0.1")]
+[assembly: AssemblyVersion("1.1.0")]

OpenIIoT.Tools.Packager/Program.cs

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenIIoT.SDK.Packaging" version="0.9.0.23796-beta" targetFramework="net452" />
+  <package id="OpenIIoT.SDK.Packaging" version="0.9.1.26849-beta" targetFramework="net452" />
   <package id="StyleCop.Analyzers" version="1.1.0-beta001" targetFramework="net452" developmentDependency="true" />
   <package id="Utility.BigFont" version="2.1.2" targetFramework="net452" />
   <package id="Utility.CommandLine.Arguments" version="1.3.0" targetFramework="net452" />

OpenIIoT.Tools.Packager/Properties/AssemblyInfo.cs

@@ -65,23 +65,17 @@ the Manifest should look something like the following:
   "Copyright": "Copyright (c) 2017 OpenIIoT",
   "License": "AGPLv3",
   "Url": "http://github.com/openiiot",
-  "Files": {
-    "Binary": [
-      {
+  "Files": [
+    {
         "Source": "binary.dll"
-      }
-    ],
-    "WebIndex": [
-      {
+    },
+    {
         "Source": "index.html"
-      }
-    ],
-    "Resource": [
-      {
+    },
+    {
         "Source": "resource.bmp"
-      }
-    ]
-  }
+    }
+  ]
 }
 ```
 

OpenIIoT.Tools.Packager/packages.config

@@ -1,4 +1,4 @@
-version: 0.9.0.{build}
+version: 1.1.0.{build}
 before_build:
 - cmd: nuget restore
 build: