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

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

Merged
merged 11 commits into from
Aug 15, 2018
Merged
4 changes: 3 additions & 1 deletion packages/jsii-calc-base-of-base/package.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -15,7 +16,8 @@
}
},
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator.BaseOfBase"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId"
},
"sphinx": {}
}
Expand Down
7 changes: 4 additions & 3 deletions packages/jsii-calc-base-of-base/test/assembly.jsii
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"fingerprint": "I/HF4zJK5eV4ZLmNLDEzShkHVsxngX3K/y2SEYjXsxU=",
"fingerprint": "2YF/qObQgbuJSs52vT9/Z7sgEO0mc2zP0jCuFWGUM4w=",
"author": {
"name": "Amazon Web Services",
"organization": true,
Expand All @@ -8,7 +8,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",
Expand All @@ -19,7 +19,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": {
Expand Down
4 changes: 3 additions & 1 deletion packages/jsii-calc-base/package.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -15,7 +16,8 @@
}
},
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator.Base"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
},
"sphinx": {}
}
Expand Down
10 changes: 6 additions & 4 deletions packages/jsii-calc-base/test/assembly.jsii
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"fingerprint": "b+UZfT/No0vxqTQ1n3lIsyw7olqARDbeGj853lNFoE8=",
"fingerprint": "3lcys0/Cd5ZbPR/CXccsL3Fdb66mNsVBs8jb+ySL0oU=",
"author": {
"name": "Amazon Web Services",
"organization": true,
Expand All @@ -12,7 +12,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": {
Expand All @@ -28,7 +29,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",
Expand All @@ -39,7 +40,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": {
Expand Down
4 changes: 3 additions & 1 deletion packages/jsii-calc-lib/package.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -15,7 +16,8 @@
}
},
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator.Lib"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace.LibNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId.LibPackageId"
},
"sphinx": {}
}
Expand Down
13 changes: 8 additions & 5 deletions packages/jsii-calc-lib/test/assembly.jsii
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"fingerprint": "qwjIHOtTOSWOv5qzVdHj4SDgxmnWYsacVvR7BkAVlo8=",
"fingerprint": "euaH0hTUT38hFuqtItWxu9uK4iO1iSCGEHecTSHwY5o=",
"author": {
"name": "Amazon Web Services",
"organization": true,
Expand All @@ -14,7 +14,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": {
Expand All @@ -32,7 +33,8 @@
},
"targets": {
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator.Base"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
},
"java": {
"maven": {
Expand All @@ -48,7 +50,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",
Expand All @@ -59,7 +61,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": {
Expand Down
4 changes: 3 additions & 1 deletion packages/jsii-calc/package.json
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -15,7 +16,8 @@
}
},
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId"
},
"sphinx": {}
}
Expand Down
22 changes: 14 additions & 8 deletions packages/jsii-calc/test/assembly.jsii
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"fingerprint": "nIH7ZdupMWqiPid9t2N934g0BDqSHVKuq6mrGdRpuYk=",
"fingerprint": "TTYo91AyKTcjF5jv1DjNFwJ1qLxMdEUIY8f3WkFycBQ=",
"author": {
"name": "Amazon Web Services",
"organization": true,
Expand Down Expand Up @@ -40,7 +40,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": {
Expand All @@ -58,7 +59,8 @@
},
"targets": {
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator.Base"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
},
"java": {
"maven": {
Expand All @@ -80,7 +82,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": {
Expand All @@ -98,7 +101,8 @@
},
"targets": {
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator.Base"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId.BasePackageId"
},
"java": {
"maven": {
Expand All @@ -116,7 +120,8 @@
},
"targets": {
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator.Lib"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace.LibNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId.LibPackageId"
},
"java": {
"maven": {
Expand All @@ -132,7 +137,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",
Expand All @@ -146,7 +151,8 @@
"schema": "jsii/1.0",
"targets": {
"dotnet": {
"namespace": "Amazon.JSII.Tests.Calculator"
"namespace": "Amazon.JSII.Tests.CalculatorNamespace",
"packageId": "Amazon.JSII.Tests.CalculatorPackageId"
},
"java": {
"maven": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
Loading