Emit new package-related properties in generated C# project file. (#169)

Emit new package-related properties in generated C# project file.
aws · Aug 15, 2018 · fd424ee · fd424ee
1 parent 755c26d
commit fd424ee
Show file tree

Hide file tree

Showing 138 changed files with 1,661 additions and 576 deletions.
diff --git a/README.md b/README.md
@@ -86,7 +86,8 @@ Edit your `package.json`:
         }
       },
       "dotnet": {
-        "namespace": "Acme.Hello"
+        "namespace": "Acme.HelloNamespace",
+        "packageId": "Acme.HelloPackage"
       },
       "sphinx": { }
     }
@@ -136,7 +137,8 @@ You should also see a `.jsii` file in the root:
   "schema": "jsii/1.0",
   "targets": {
     "dotnet": {
-      "namespace": "Acme.Hello"
+      "namespace": "Acme.HelloNamespace",
+      "packageId": "Acme.HelloPackage"
     },
     "java": {
       "maven": {
@@ -262,10 +264,26 @@ The following targets are currently supported:
 
 * `dotnet` - packages the module as a .NET/NuGet package. Requires the following config:
 
-```json
+```js
 {
   "dotnet": {
-    "namespace": "Acme.Hello"
+    /* Required. */
+    "namespace": "Acme.HelloNamespace",
+
+    /* Required. */
+    "packageId": "Acme.HelloPackage",
+
+    /* Optional. Default: Value of packageId. */
+    "title": "ACME Hello",
+
+    /* Optional. Default: null (no icon). */
+    "iconUrl": "path/to/icon.svg",
+
+    /* Optional. Used in conjunction with assemblyOriginatorKey. Default: false. */
+    "signAssembly": true,
+
+    /* Optional. Used in conjunction with signAssembly. Default: null. */
+    "assemblyOriginatorKey": "path/to/key.snk"
   }
 }
 ```

diff --git a/packages/jsii-calc-base-of-base/package.json b/packages/jsii-calc-base-of-base/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@scope/jsii-calc-base-of-base",
   "version": "0.6.4",
+  "description": "An example transitive dependency for jsii-calc.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "private": true,
@@ -15,7 +16,8 @@
         }
       },
       "dotnet": {
-        "namespace": "Amazon.JSII.Tests.Calculator.BaseOfBase"
+        "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace",
+        "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId"
       },
       "sphinx": {}
     }

diff --git a/packages/jsii-calc-base-of-base/test/assembly.jsii b/packages/jsii-calc-base-of-base/test/assembly.jsii
@@ -7,7 +7,7 @@
     ],
     "url": "https://aws.amazon.com"
   },
-  "description": "@scope/jsii-calc-base-of-base",
+  "description": "An example transitive dependency for jsii-calc.",
   "homepage": "https://github.com/awslabs/jsii.git",
   "license": "Apache-2.0",
   "name": "@scope/jsii-calc-base-of-base",
@@ -18,7 +18,8 @@
   "schema": "jsii/1.0",
   "targets": {
     "dotnet": {
-      "namespace": "Amazon.JSII.Tests.Calculator.BaseOfBase"
+      "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace",
+      "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId"
     },
     "java": {
       "maven": {
@@ -68,5 +69,5 @@
     }
   },
   "version": "0.6.4",
-  "fingerprint": "I/HF4zJK5eV4ZLmNLDEzShkHVsxngX3K/y2SEYjXsxU="
+  "fingerprint": "2YF/qObQgbuJSs52vT9/Z7sgEO0mc2zP0jCuFWGUM4w="
 }
diff --git a/packages/jsii-calc-base/package.json b/packages/jsii-calc-base/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@scope/jsii-calc-base",
   "version": "0.6.4",
+  "description": "An example direct dependency for jsii-calc.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "private": true,
@@ -15,7 +16,8 @@
         }
       },
       "dotnet": {
-        "namespace": "Amazon.JSII.Tests.Calculator.Base"
+        "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
+        "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
       },
       "sphinx": {}
     }

diff --git a/packages/jsii-calc-base/test/assembly.jsii b/packages/jsii-calc-base/test/assembly.jsii
@@ -11,7 +11,8 @@
     "@scope/jsii-calc-base-of-base": {
       "targets": {
         "dotnet": {
-          "namespace": "Amazon.JSII.Tests.Calculator.BaseOfBase"
+          "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace",
+          "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId"
         },
         "java": {
           "maven": {
@@ -27,7 +28,7 @@
       "version": "0.6.4"
     }
   },
-  "description": "@scope/jsii-calc-base",
+  "description": "An example direct dependency for jsii-calc.",
   "homepage": "https://github.com/awslabs/jsii.git",
   "license": "Apache-2.0",
   "name": "@scope/jsii-calc-base",
@@ -38,7 +39,8 @@
   "schema": "jsii/1.0",
   "targets": {
     "dotnet": {
-      "namespace": "Amazon.JSII.Tests.Calculator.Base"
+      "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
+      "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
     },
     "java": {
       "maven": {
@@ -100,5 +102,5 @@
     }
   },
   "version": "0.6.4",
-  "fingerprint": "b+UZfT/No0vxqTQ1n3lIsyw7olqARDbeGj853lNFoE8="
+  "fingerprint": "3lcys0/Cd5ZbPR/CXccsL3Fdb66mNsVBs8jb+ySL0oU="
 }
diff --git a/packages/jsii-calc-lib/package.json b/packages/jsii-calc-lib/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@scope/jsii-calc-lib",
   "version": "0.6.4",
+  "description": "A simple calcuator library built on JSII.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "private": true,
@@ -15,7 +16,8 @@
         }
       },
       "dotnet": {
-        "namespace": "Amazon.JSII.Tests.Calculator.Lib"
+        "namespace": "Amazon.JSII.Tests.CalculatorNamespace.LibNamespace",
+        "packageId": "Amazon.JSII.Tests.CalculatorPackageId.LibPackageId"
       },
       "sphinx": {}
     }

diff --git a/packages/jsii-calc-lib/test/assembly.jsii b/packages/jsii-calc-lib/test/assembly.jsii
@@ -13,7 +13,8 @@
         "@scope/jsii-calc-base-of-base": {
           "targets": {
             "dotnet": {
-              "namespace": "Amazon.JSII.Tests.Calculator.BaseOfBase"
+              "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace",
+              "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId"
             },
             "java": {
               "maven": {
@@ -31,7 +32,8 @@
       },
       "targets": {
         "dotnet": {
-          "namespace": "Amazon.JSII.Tests.Calculator.Base"
+          "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
+          "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
         },
         "java": {
           "maven": {
@@ -47,7 +49,7 @@
       "version": "0.6.4"
     }
   },
-  "description": "@scope/jsii-calc-lib",
+  "description": "A simple calcuator library built on JSII.",
   "homepage": "https://github.com/awslabs/jsii.git",
   "license": "Apache-2.0",
   "name": "@scope/jsii-calc-lib",
@@ -58,7 +60,8 @@
   "schema": "jsii/1.0",
   "targets": {
     "dotnet": {
-      "namespace": "Amazon.JSII.Tests.Calculator.Lib"
+      "namespace": "Amazon.JSII.Tests.CalculatorNamespace.LibNamespace",
+      "packageId": "Amazon.JSII.Tests.CalculatorPackageId.LibPackageId"
     },
     "java": {
       "maven": {
@@ -315,5 +318,5 @@
     }
   },
   "version": "0.6.4",
-  "fingerprint": "MHdlbqyf1RV6moIHslfpKnl7yjQoYVvvZLfxFXWihrU="
+  "fingerprint": "jA30G5c81DZXD/7DMYLvdlY8XwEevVQAMAwkUBmPE64="
 }
diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json
@@ -1,6 +1,7 @@
 {
   "name": "jsii-calc",
   "version": "0.6.4",
+  "description": "A simple calcuator built on JSII.",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "private": true,
@@ -15,7 +16,8 @@
         }
       },
       "dotnet": {
-        "namespace": "Amazon.JSII.Tests.Calculator"
+        "namespace": "Amazon.JSII.Tests.CalculatorNamespace",
+        "packageId": "Amazon.JSII.Tests.CalculatorPackageId"
       },
       "sphinx": {}
     }

diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii
@@ -39,7 +39,8 @@
         "@scope/jsii-calc-base-of-base": {
           "targets": {
             "dotnet": {
-              "namespace": "Amazon.JSII.Tests.Calculator.BaseOfBase"
+              "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace",
+              "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId"
             },
             "java": {
               "maven": {
@@ -57,7 +58,8 @@
       },
       "targets": {
         "dotnet": {
-          "namespace": "Amazon.JSII.Tests.Calculator.Base"
+          "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
+          "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
         },
         "java": {
           "maven": {
@@ -79,7 +81,8 @@
             "@scope/jsii-calc-base-of-base": {
               "targets": {
                 "dotnet": {
-                  "namespace": "Amazon.JSII.Tests.Calculator.BaseOfBase"
+                  "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace",
+                  "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId"
                 },
                 "java": {
                   "maven": {
@@ -97,7 +100,8 @@
           },
           "targets": {
             "dotnet": {
-              "namespace": "Amazon.JSII.Tests.Calculator.Base"
+              "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
+              "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
             },
             "java": {
               "maven": {
@@ -115,7 +119,8 @@
       },
       "targets": {
         "dotnet": {
-          "namespace": "Amazon.JSII.Tests.Calculator.Lib"
+          "namespace": "Amazon.JSII.Tests.CalculatorNamespace.LibNamespace",
+          "packageId": "Amazon.JSII.Tests.CalculatorPackageId.LibPackageId"
         },
         "java": {
           "maven": {
@@ -131,7 +136,7 @@
       "version": "0.6.4"
     }
   },
-  "description": "jsii-calc",
+  "description": "A simple calcuator built on JSII.",
   "homepage": "https://github.com/awslabs/jsii.git",
   "license": "Apache-2.0",
   "name": "jsii-calc",
@@ -145,7 +150,8 @@
   "schema": "jsii/1.0",
   "targets": {
     "dotnet": {
-      "namespace": "Amazon.JSII.Tests.Calculator"
+      "namespace": "Amazon.JSII.Tests.CalculatorNamespace",
+      "packageId": "Amazon.JSII.Tests.CalculatorPackageId"
     },
     "java": {
       "maven": {
@@ -2820,5 +2826,5 @@
     }
   },
   "version": "0.6.4",
-  "fingerprint": "V1fwQARJzmO/FTBQutFnq1v95it317kCGVv350RLqYo="
+  "fingerprint": "gKUNI8uBG+ge5Ccbk0ay+JZ+j4C/4hPATR3jvtVm0Po="
 }
diff --git a/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.CLI/Program.cs b/packages/jsii-dotnet-generator/src/Amazon.JSII.Generator.CLI/Program.cs
@@ -20,7 +20,7 @@ static void HandleParseError(IEnumerable<Error> errors)
 
         static void Generate(Options options)
         {
-            AssemblyGenerator generator = new AssemblyGenerator(options.OutputDirectory, "", "");
+            AssemblyGenerator generator = new AssemblyGenerator(options.OutputDirectory);
 
             generator.Generate(options.JsiiFile, options.Tarball);
         }