chore(release): 1.31.0

aws · Jul 9, 2021 · 6fa403d · 6fa403d
2 parents adae23f + 225bfc7
commit 6fa403d
Show file tree

Hide file tree

Showing 50 changed files with 1,833 additions and 225 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -1159,6 +1159,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "ansgarm",
+      "name": "Ansgar Mertens",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1112056?v=4",
+      "profile": "https://ansgar.dev",
+      "contributions": [
+        "maintenance"
+      ]
     }
   ],
   "repoType": "github",
@@ -1168,4 +1177,4 @@
     "README.md"
   ],
   "contributorsPerLine": 7
-}
+}
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.md b/.github/ISSUE_TEMPLATE/2-feature-request.md
@@ -10,7 +10,7 @@ labels: feature-request, needs-triage
 <!--
 Check the box (with an X) for any language runtime that you know is affected by
 the reported bug. If you're uncertain whether a language is affected or not,
-please leave the bux un-checked.
+please leave the box un-checked.
 -->
 - [ ] `TypeScript` or `Javascript`
 - [ ] `Python`

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -27,7 +27,7 @@ jobs:
         run: |-
           echo "::set-output name=pip-cache::$(python3 -m pip cache dir)"
       - name: Cache
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: ${{ steps.cache-locations.outputs.pip-cache }}
           key: ${{ runner.os }}-${{ hashFiles('**/requirements-dev.txt') }}

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -60,7 +60,7 @@ jobs:
           echo "::set-output name=pip-cache::$(python3 -m pip cache dir)"
           echo "::set-output name=yarn-cache::$(yarn cache dir)"
       - name: Cache
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: |-
             ${{ steps.cache-locations.outputs.pip-cache }}
@@ -154,7 +154,7 @@ jobs:
           echo "::set-output name=pip-cache::$(python3 -m pip cache dir)"
           echo "::set-output name=yarn-cache::$(yarn cache dir)"
       - name: Cache
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: |-
             ${{ steps.cache-locations.outputs.pip-cache }}
@@ -316,7 +316,7 @@ jobs:
           echo "::set-output name=pip-cache::$(python3 -m pip cache dir)"
           echo "::set-output name=yarn-cache::$(yarn cache dir)"
       - name: Cache
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: |-
             ${{ steps.cache-locations.outputs.pip-cache }}

diff --git a/.github/workflows/yarn-upgrade.yml b/.github/workflows/yarn-upgrade.yml
@@ -27,7 +27,7 @@ jobs:
         run: echo "::set-output name=dir::$(yarn cache dir)"
 
       - name: Restore Yarn cache
-        uses: actions/cache@v2.1.5
+        uses: actions/cache@v2.1.6
         with:
           path: ${{ steps.yarn-cache.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.31.0](https://github.com/aws/jsii/compare/v1.30.0...v1.31.0) (2021-07-09)
+
+
+### Features
+
+* **jsii-rosetta transliterate:** transliterate a jsii assembly ([#2869](https://github.com/aws/jsii/issues/2869)) ([d9028c8](https://github.com/aws/jsii/commit/d9028c8cf91297a44cd4b1f128f769716bf0e74e))
+* **rosetta:** transliterate loose mode ([#2892](https://github.com/aws/jsii/issues/2892)) ([43e6dfd](https://github.com/aws/jsii/commit/43e6dfd0591b0f38a8c636edd3896400c96676e3))
+
+
+### Bug Fixes
+
+* **pacmak/go:** missing go.sum entry ([#2893](https://github.com/aws/jsii/issues/2893)) ([6e6ad69](https://github.com/aws/jsii/commit/6e6ad693230e18f36990e8feaf3734da7c01dbd5))
+* **rosetta:** extract does not respect strict metadata entry ([#2863](https://github.com/aws/jsii/issues/2863)) ([5d2392b](https://github.com/aws/jsii/commit/5d2392b7713cb6dfea6092c4ac3ee45360a5d28a)), closes [#2861](https://github.com/aws/jsii/issues/2861)
+* **rosetta:** hangs on 'markdown' command when a file is provided ([#2871](https://github.com/aws/jsii/issues/2871)) ([e538b36](https://github.com/aws/jsii/commit/e538b36c6ccf53ace908ff4c342dc9a4435ce353))
+
 ## [1.30.0](https://github.com/aws/jsii/compare/v1.29.0...v1.30.0) (2021-05-27)
 
 

diff --git a/README.md b/README.md
diff --git a/gh-pages/content/user-guides/lib-author/configuration/targets/dotnet.md b/gh-pages/content/user-guides/lib-author/configuration/targets/dotnet.md
@@ -8,9 +8,6 @@ The `dotnet` target requires the following configuration:
   transparent background is recommended. See the [.NET documentation] for more information.
 - `versionSuffix` - an optional suffix that will be appended at the end of the NuGet package's `version` field. The
   suffix must start with a `-`.
-- `signAssembly` - whether the assembly should be strong-name signed. Defaults to `false` when not specified.
-- `assemblyOriginatorKeyFile`- the path to the strong-name signing key to be used. When not specified or if the file
-  referred to does not exist, the assembly will not be strong-name signed.
 
 Example:
 
@@ -21,8 +18,6 @@ Example:
       "namespace": "Acme.HelloJsii",              // Required
       "packageId": "Acme.HelloJsii",              // Required
       "iconUrl": "https://cdn.acme.com/icon.png", // Optional
-      "signAssembly": true,                       // Optional
-      "assemblyOriginatorKeyFile": "./key.snk",   // Optional
       "versionSuffix": "-preview"                 // Optional
     },
     // ...

diff --git a/gh-pages/requirements-dev.txt b/gh-pages/requirements-dev.txt
@@ -1,4 +1,4 @@
-mkdocs~=1.1.2
+mkdocs~=1.2.1
 mkdocs-awesome-pages-plugin~=2.5.0
-mkdocs-material~=7.1.3
+mkdocs-material~=7.1.9
 mkdocs-git-revision-date-plugin~=0.3.1
diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
       "rejectCycles": true
     }
   },
-  "version": "1.30.0"
+  "version": "1.31.0"
 }
diff --git a/packages/@jsii/Directory.Build.targets b/packages/@jsii/Directory.Build.targets
@@ -6,11 +6,11 @@
     <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.9.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.10.0" />
     <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" />
     <PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2" />
 
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Update="NSubstitute" Version="4.2.2" />
     <PackageReference Update="xunit" Version="2.4.1" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />

diff --git a/packages/@jsii/dotnet-runtime/NuGet.Metadata.props.t.js b/packages/@jsii/dotnet-runtime/NuGet.Metadata.props.t.js
@@ -20,9 +20,6 @@ process.stdout.write(`<Project>
     <IncludeSource>True</IncludeSource>
 
     <PackageOutputPath>..\\..\\bin\\$(Configuration)\\NuGet\\</PackageOutputPath>
-
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-    <SignAssembly Condition="Exists('$(AssemblyOriginatorKeyFile)')">True</SignAssembly>
   </PropertyGroup>
 </Project>
 `);
diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/JsonModel/AssemblyTests.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/JsonModel/AssemblyTests.cs
@@ -37,8 +37,6 @@ public void ShouldSerializeAllMembers()
                     targets: new AssemblyTargets(new AssemblyTargets.DotNetTarget(
                         @namespace: "Dot.Net.Namespace",
                         packageId: "Dot.Net.PackageId",
-                        signAssembly: true,
-                        assemblyOriginatorKeyFile: "key.snk",
                         iconUrl: "http://www.example.com/icon.png"
                     )),
                     dependencies: new Dictionary<string, PackageVersion>(),
@@ -92,8 +90,6 @@ public void ShouldSerializeAllMembers()
     ""dotnet"": {
       ""namespace"": ""Dot.Net.Namespace"",
       ""packageId"": ""Dot.Net.PackageId"",
-      ""signAssembly"": true,
-      ""assemblyOriginatorKeyFile"": ""key.snk"",
       ""iconUrl"": ""http://www.example.com/icon.png""
     }
   }
@@ -120,8 +116,6 @@ public void ShouldThrowOnMissingName()
                     targets: new AssemblyTargets(new AssemblyTargets.DotNetTarget(
                         @namespace: "Dot.Net.Namespace",
                         packageId: "Dot.Net.PackageId",
-                        signAssembly: true,
-                        assemblyOriginatorKeyFile: "key.snk",
                         iconUrl: "http://www.example.com/icon.png"
                     )),
                     dependencies: new Dictionary<string, PackageVersion>(),
@@ -149,8 +143,6 @@ public void ShouldThrowOnMissingVersion()
                     targets: new AssemblyTargets(new AssemblyTargets.DotNetTarget(
                         @namespace: "Dot.Net.Namespace",
                         packageId: "Dot.Net.PackageId",
-                        signAssembly: true,
-                        assemblyOriginatorKeyFile: "key.snk",
                         iconUrl: "http://www.example.com/icon.png"
                     )),
                     types: new Dictionary<string, Amazon.JSII.JsonModel.Spec.Type>(),
@@ -176,8 +168,6 @@ public void ShouldNotSerializeMissingDependencies()
                     targets: new AssemblyTargets(new AssemblyTargets.DotNetTarget(
                         @namespace: "Dot.Net.Namespace",
                         packageId: "Dot.Net.PackageId",
-                        signAssembly: true,
-                        assemblyOriginatorKeyFile: "key.snk",
                         iconUrl: "http://www.example.com/icon.png"
                     )),
                     types: new Dictionary<string, Amazon.JSII.JsonModel.Spec.Type>(),
@@ -210,8 +200,6 @@ public void ShouldNotSerializeMissingDependencies()
     ""dotnet"": {
       ""namespace"": ""Dot.Net.Namespace"",
       ""packageId"": ""Dot.Net.PackageId"",
-      ""signAssembly"": true,
-      ""assemblyOriginatorKeyFile"": ""key.snk"",
       ""iconUrl"": ""http://www.example.com/icon.png""
     }
   }
@@ -236,8 +224,6 @@ public void ShouldNotSerializeMissingBundled()
                     targets: new AssemblyTargets(new AssemblyTargets.DotNetTarget(
                         @namespace: "Dot.Net.Namespace",
                         packageId: "Dot.Net.PackageId",
-                        signAssembly: true,
-                        assemblyOriginatorKeyFile: "key.snk",
                         iconUrl: "http://www.example.com/icon.png"
                     )),
                     types: new Dictionary<string, Amazon.JSII.JsonModel.Spec.Type>(),
@@ -270,8 +256,6 @@ public void ShouldNotSerializeMissingBundled()
     ""dotnet"": {
       ""namespace"": ""Dot.Net.Namespace"",
       ""packageId"": ""Dot.Net.PackageId"",
-      ""signAssembly"": true,
-      ""assemblyOriginatorKeyFile"": ""key.snk"",
       ""iconUrl"": ""http://www.example.com/icon.png""
     }
   }
@@ -296,8 +280,6 @@ public void ShouldNotSerializeMissingDocs()
                     targets: new AssemblyTargets(new AssemblyTargets.DotNetTarget(
                         @namespace: "Dot.Net.Namespace",
                         packageId: "Dot.Net.PackageId",
-                        signAssembly: true,
-                        assemblyOriginatorKeyFile: "key.snk",
                         iconUrl: "http://www.example.com/icon.png"
                     )),
                     types: new Dictionary<string, Amazon.JSII.JsonModel.Spec.Type>(),
@@ -330,8 +312,6 @@ public void ShouldNotSerializeMissingDocs()
     ""dotnet"": {
       ""namespace"": ""Dot.Net.Namespace"",
       ""packageId"": ""Dot.Net.PackageId"",
-      ""signAssembly"": true,
-      ""assemblyOriginatorKeyFile"": ""key.snk"",
       ""iconUrl"": ""http://www.example.com/icon.png""
     }
   }
@@ -429,8 +409,6 @@ public void ShouldDeserializeAllMembersWithDotNetTarget()
     ""dotnet"": {
       ""namespace"": ""Dot.Net.Namespace"",
       ""packageId"": ""Dot.Net.PackageId"",
-      ""signAssembly"": true,
-      ""assemblyOriginatorKeyFile"": ""key.snk"",
       ""iconUrl"": ""http://www.example.com/icon.png""
     },
     ""java"": { ""package"": ""com.amazonaws.cdk.Test"" }
@@ -463,8 +441,6 @@ public void ShouldDeserializeAllMembersWithDotNetTarget()
                 Assert.NotNull(dotNetTarget);
                 Assert.Equal("Dot.Net.Namespace", dotNetTarget?.Namespace);
                 Assert.Equal("Dot.Net.PackageId", dotNetTarget?.PackageId);
-                Assert.True(dotNetTarget?.SignAssembly);
-                Assert.Equal("key.snk", dotNetTarget?.AssemblyOriginatorKeyFile);
                 Assert.Equal("http://www.example.com/icon.png", dotNetTarget?.IconUrl);
 
                 Assert.Equal("myVersion", actual.Version, ignoreLineEndingDifferences: true);

diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/JsonModel/Spec/AssemblyTargets.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/JsonModel/Spec/AssemblyTargets.cs
@@ -23,8 +23,6 @@ public DotNetTarget
                 string @namespace,
                 string packageId,
                 string? title = null,
-                bool signAssembly = false,
-                string? assemblyOriginatorKeyFile = null,
                 string? iconUrl = null,
                 string? versionSuffix = null
             )
@@ -33,8 +31,6 @@ public DotNetTarget
                 PackageId = packageId ?? throw new ArgumentNullException(nameof(packageId));
 
                 Title = title;
-                SignAssembly = signAssembly;
-                AssemblyOriginatorKeyFile = assemblyOriginatorKeyFile;
                 IconUrl = iconUrl;
                 VersionSuffix = versionSuffix;
 
@@ -53,12 +49,6 @@ public DotNetTarget
             [JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)]
             public string? Title { get; }
 
-            [JsonProperty("signAssembly", NullValueHandling = NullValueHandling.Ignore)]
-            public bool SignAssembly { get; }
-
-            [JsonProperty("assemblyOriginatorKeyFile", NullValueHandling = NullValueHandling.Ignore)]
-            public string? AssemblyOriginatorKeyFile { get; }
-
             [JsonProperty("iconUrl", NullValueHandling = NullValueHandling.Ignore)]
             public string? IconUrl { get; }
 

diff --git a/packages/@jsii/go-runtime/go.mod b/packages/@jsii/go-runtime/go.mod
@@ -4,5 +4,5 @@ go 1.15
 
 require (
 	golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5
-	golang.org/x/tools v0.1.2
+	golang.org/x/tools v0.1.4
 )
diff --git a/packages/@jsii/go-runtime/go.sum b/packages/@jsii/go-runtime/go.sum
@@ -25,8 +25,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.1.2 h1:kRBLX7v7Af8W7Gdbbc908OJcdgtK8bOz9Uaj8/F1ACA=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.4 h1:cVngSRcfgyZCzys3KYOpCFa+4dqX/Oub9tAq00ttGVs=
+golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=

diff --git a/packages/@jsii/python-runtime/requirements.txt b/packages/@jsii/python-runtime/requirements.txt
@@ -1,9 +1,9 @@
-black~=21.4b2
+black~=21.6b0
 mypy==0.812
 pip~=21.1
 pytest~=6.2
 pytest-mypy~=0.8
-setuptools~=56.0
+setuptools~=57.0
 wheel~=0.36
 
 -e .
diff --git a/packages/@jsii/spec/lib/configuration.ts b/packages/@jsii/spec/lib/configuration.ts
@@ -77,16 +77,6 @@ export interface Config {
        * version field
        */
       versionSuffix?: string;
-
-      /**
-       * whether the assembly should be strong-name signed
-       */
-      signAssembly?: boolean;
-
-      /**
-       * path to the strong-name signing key to be used
-       */
-      assemblyOriginatorFile?: string;
     };
   };
 

diff --git a/packages/jsii-config/README.md b/packages/jsii-config/README.md
@@ -2,7 +2,7 @@
 
 jsii-config is a command line utility for configuring [jsii enabled modules](../../README.md). It is useful to help convert an existing typescript module to a jsii module. It can also be used to revise existing jsii compiler configuration optiions, such as adding a new language target.
 
-[See the jsii documentation](../../docs/configuration.md) for more information on how the configuration options affect jsii's output.
+[See the jsii documentation](https://aws.github.io/jsii/user-guides/lib-author/configuration/) for more information on how the configuration options affect jsii's output.
 
 ## Usage
 
@@ -14,7 +14,7 @@ jsii-config requires an existing package.json with the following fields:
 - main
 - author
 
-For details on the content of these fields, [see the jsii documentation](../../docs/configuration.md#additional-requirements--extensions).
+For details on the content of these fields, [see the jsii documentation](https://aws.github.io/jsii/user-guides/lib-author/configuration/#additional-requirements-extensions).
 
 jsii-config can be called via npx.
 

diff --git a/packages/jsii-config/lib/schema.ts b/packages/jsii-config/lib/schema.ts
@@ -179,26 +179,6 @@ const schema: ConfigPromptsSchema = {
             return true;
           },
         },
-        signAssembly: {
-          type: 'confirm',
-          default: false,
-          message:
-            '.NET Sign Assembly - whether the assembly should be strong-name signed. Defaults to false when not specified',
-          when: targetEnabled('dotnet'),
-        },
-        assemblyOriginatorKeyFile: {
-          type: 'input',
-          default: '',
-          message:
-            '.NET Assembly Originator Key File - path to the strong-name signing key to be used (e.g. "../../key.snk")',
-          when: (answers: any) => {
-            return (
-              targetEnabled('dotnet')(answers) &&
-              Boolean(answers.jsii.targets.dotnet.signAssembly)
-            );
-          },
-          validate: hasLength,
-        },
       },
     },
   },