From 11fff578b90ff364012320683390095634d0b633 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Thu, 6 Feb 2020 23:41:13 +0000 Subject: [PATCH 01/18] chore(deps-dev): bump @types/jest from 25.1.1 to 25.1.2 (#1242) --- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 8 ++++---- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index beeb9a09de..9452688a3f 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -39,7 +39,7 @@ "@scope/jsii-calc-base": "^0.22.0", "@scope/jsii-calc-lib": "^0.22.0", "@types/fs-extra": "^8.0.1", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", "@types/node": "^10.17.14", "@types/tar": "^4.0.3", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 8e8ddac1f6..84238cd84a 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@scope/jsii-calc-base": "^0.22.0", "@scope/jsii-calc-lib": "^0.22.0", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/node": "^10.17.14", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index 469368b966..a51c492458 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -33,7 +33,7 @@ "jsonschema": "^1.2.5" }, "devDependencies": { - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/node": "^10.17.14", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 40ca3e4c41..375994701a 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -37,7 +37,7 @@ "devDependencies": { "@types/decamelize": "^1.2.0", "@types/fs-extra": "^8.0.1", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/node": "^10.17.14", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 968761881d..09a2b7b264 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -19,7 +19,7 @@ }, "devDependencies": { "@types/inquirer": "^6.5.0", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", "@types/node": "^10.17.14", "@types/yargs": "^15.0.3", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 8ac8d4e22a..dbf7c0213b 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -41,7 +41,7 @@ }, "devDependencies": { "@types/fs-extra": "^8.0.1", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", "@types/node": "^10.17.14", "@types/tar-fs": "^1.16.2", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 55f6e8433e..1b02776ac9 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -56,7 +56,7 @@ "@types/clone": "^0.1.30", "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.0.1", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/mock-fs": "^4.10.0", "@types/node": "^10.17.14", "@types/semver": "^7.1.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 9c6738ead8..2853ec3e35 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -42,7 +42,7 @@ "devDependencies": { "@scope/jsii-calc-lib": "^0.22.0", "@types/fs-extra": "^8.0.1", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/node": "^10.17.14", "@types/yargs": "^15.0.3", "eslint": "^6.8.0", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 079912b610..f27bcff323 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.0.1", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/mock-fs": "^4.10.0", "@types/node": "^10.17.14", "@types/yargs": "^15.0.3", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index a3722fd503..5fc1f7e98f 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -50,7 +50,7 @@ "@types/clone": "^0.1.30", "@types/deep-equal": "^1.0.1", "@types/fs-extra": "^8.0.1", - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", "@types/node": "^10.17.14", "@types/semver": "^7.1.0", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 72c6f5a3b6..36df11dbb0 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -30,7 +30,7 @@ "package": "package-js" }, "devDependencies": { - "@types/jest": "^25.1.1", + "@types/jest": "^25.1.2", "@types/node": "^10.17.14", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/yarn.lock b/yarn.lock index e7a74be633..758356e5d0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1409,10 +1409,10 @@ dependencies: "@types/jest" "*" -"@types/jest@*", "@types/jest@^25.1.1": - version "25.1.1" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.1.1.tgz#dcf65a8ee315b91ad39c0d358ae0ddc5602ab0e9" - integrity sha512-bKSZJYZJLzwaoVYNN4W3A0RvKNYsrLm5tsuXaMlfYDxKf4gY2sFrMYneCugNQWGg1gjPW+FHBwNrwPzEi4sIsw== +"@types/jest@*", "@types/jest@^25.1.2": + version "25.1.2" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-25.1.2.tgz#1c4c8770c27906c7d8def5d2033df9dbd39f60da" + integrity sha512-EsPIgEsonlXmYV7GzUqcvORsSS9Gqxw/OvkGwHfAdpjduNRxMlhsav0O5Kb0zijc/eXSO/uW6SJt9nwull8AUQ== dependencies: jest-diff "^25.1.0" pretty-format "^25.1.0" From 422383dc7f75a7522d1e29070f1d8c9e84862955 Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Fri, 7 Feb 2020 11:33:03 +0100 Subject: [PATCH 02/18] chore: upgrade contents of jsii/superchain (#1245) Include dotnet-sdk-3.1 instead of 3.0 (the 3.1 SDK can build projects that target the 3.0 versions of the framework). Upgrade Ruby from 2.4 (EOL end of march) to 2.6. Generally speaking, update the README.md of the image to reflect the current minimal versions included. --- superchain/Dockerfile | 10 +++++----- superchain/README.md | 24 ++++++++++++------------ 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/superchain/Dockerfile b/superchain/Dockerfile index 5f6a951e97..b554a818c8 100644 --- a/superchain/Dockerfile +++ b/superchain/Dockerfile @@ -14,7 +14,7 @@ RUN rpm --import "https://packages.microsoft.com/keys/microsoft.asc" && rpm --import /tmp/mono.asc && rm -f /tmp/mono.asc \ && curl -sSL "https://download.mono-project.com/repo/centos7-stable.repo" \ | tee /etc/yum.repos.d/mono-centos7-stable.repo \ - && yum -y install dotnet-sdk-3.0 mono-devel powershell \ + && yum -y install dotnet-sdk-3.1 mono-devel powershell \ && yum clean all && rm -rf /var/cache/yum \ && dotnet help @@ -23,15 +23,15 @@ RUN yum -y install python3 python3-pip && python3 -m pip install --upgrade pip setuptools wheel twine \ && yum clean all && rm -rf /var/cache/yum -# Install Ruby 2.4+ +# Install Ruby 2.6+ ENV GEM_HOME /usr/local/bundle -RUN amazon-linux-extras install ruby2.4 \ +RUN amazon-linux-extras install ruby2.6 \ && yum -y install gcc make ruby-devel rubygem-rdoc system-rpm-config \ && yum clean all && rm -rf /var/cache/yum \ && echo 'install: --no-document' > /usr/local/etc/gemrc \ && echo 'update: --no-document' >> /usr/local/etc/gemrc \ && mkdir -p "$GEM_HOME" \ - && gem install 'bundler:~>1.17.2' 'bundler:~>2.0.2' + && gem install 'bundler:~>1.17.3' 'bundler:~>2.1.4' ENV BUNDLE_SILENCE_ROOT_WARNING=1 \ PATH="$GEM_HOME/bin:$GEM_HOME/gems/bin:$PATH" @@ -70,7 +70,7 @@ VOLUME /var/lib/docker RUN yum -y install awscli git gzip openssl rsync unzip which zip \ && yum clean all && rm -rf /var/cache/yum -# Install Node 8+ +# Install Node 10+ RUN curl -sL https://rpm.nodesource.com/setup_10.x | bash - \ && yum -y install nodejs \ && yum clean all && rm -rf /var/cache/yum \ diff --git a/superchain/README.md b/superchain/README.md index d22a4c5006..f80d7a50a8 100644 --- a/superchain/README.md +++ b/superchain/README.md @@ -9,28 +9,28 @@ required in order to package [jsii] projects in all supported languages. SDK | Version ----------------|------------------------------------------- -`OpenJDK 8` | Amazon Corretto `>= 8.222.10.2` -`.NET SDK` | `>= 3.0.100` -`mono` | `>= 6.0.0.319` -`Javascript` | `node >= 10.17.0` with `npm >= 6.9.0` +`OpenJDK 8` | Amazon Corretto `>= 8.242.08.1` +`.NET SDK` | `>= 3.1.101` +`mono` | `>= 6.8.0.105` +`Javascript` | `node >= 10.19.0` with `npm >= 6.13.4` `PowerShell` | `pwsh >= 6.2.3` -`Python 3` | `python3 >= 3.7.4` with `pip3 >= 19.3` -`Ruby` | `ruby >= 2.4.7p357` +`Python 3` | `python3 >= 3.7.4` with `pip3 >= 20.0.2` +`Ruby` | `ruby >= 2.6.3p62` ## Included Tools & Utilities Tool / Utility | Version ---------------|-------------------------------------------- -`aws` | `>= 1.16.102` -`bundler` | `>= 1.17.2` and `>= 2.0.2` +`aws` | `>= 1.16.300` +`bundler` | `>= 1.17.3` and `>= 2.1.4` `gcc` | `>= 7.3.1` -`docker` | `>= 18.06.1-ce` -`git` | `>= 2.17.2` +`docker` | `>= 18.09.9-ce` +`git` | `>= 2.23.1` `make` | `>= 3.82` `maven` | `>= 3.6.3` `openssl` | `>= 1.0.2k-fips` -`rsync` | `>= 3.1.2-4` -`yarn` | `>= 1.19.1` +`rsync` | `>= 3.1.2` +`yarn` | `>= 1.21.1` `zip` & `unzip`| `>= 6.0-19` ## License From c32443979548faa283894d5aaf4f4baf31350063 Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Fri, 7 Feb 2020 17:31:18 +0100 Subject: [PATCH 03/18] feat(dotnet): upgrade target framework to netcoreapp3.1 (#1241) As `netcoreapp3.0` is going to be EOL pretty soon (early March 2020), upgrading our target framework to `netcoreapp3.1` early in order to catch any surprises. Since `netcoreapp3.1` is nothing but an LTS version of `netcoreapp3.0` (plus some bug fixes), it should be transparent to users who may only need to upgrade their .NET SDK. --- .../Amazon.JSII.Analyzers.UnitTests.csproj | 2 +- .../Amazon.JSII.JsonModel.UnitTests.csproj | 2 +- .../src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj | 2 +- .../Amazon.JSII.Runtime.IntegrationTests.csproj | 2 +- .../Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs | 2 +- .../Amazon.JSII.Runtime.UnitTests.csproj | 2 +- .../src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj | 2 +- packages/jsii-pacmak/lib/targets/dotnet.ts | 2 +- ...on.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj | 2 +- .../Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj | 2 +- .../Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj | 2 +- .../Amazon.JSII.Tests.CalculatorPackageId.csproj | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj index 426f45e3eb..0d06ffbb13 100644 --- a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj +++ b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 false Amazon.JSII.Analyzers.UnitTests diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj index b01cc9e83f..bfa55bf1d6 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 false Amazon.JSII.JsonModel.UnitTests Amazon.JSII.JsonModel.UnitTests diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj index 6917bcc4ab..8e82179c1a 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj @@ -2,7 +2,7 @@ - netcoreapp3.0 + netcoreapp3.1 Amazon.JSII.JsonModel .NET JsonModel for JSII icon.png diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj index f8b12a9de4..294666587f 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 false diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs index 17a7f10121..1109d2f3b5 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs @@ -924,7 +924,7 @@ public void OptionalAndVariadicArgumentsTest() [Fact(DisplayName = Prefix + nameof(JsiiAgent))] public void JsiiAgent() { - Assert.Equal("DotNet/" + Environment.Version + "/.NETCoreApp,Version=v3.0/1.0.0.0", JsiiAgent_.JsiiAgent); + Assert.Equal("DotNet/" + Environment.Version + "/.NETCoreApp,Version=v3.1/1.0.0.0", JsiiAgent_.JsiiAgent); } [Fact(DisplayName = Prefix + nameof(ReceiveInstanceOfPrivateClass))] diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj index ffdfbae95c..2763dc88b9 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 false diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj index 0cfd79c8fe..32dff55d07 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj @@ -2,7 +2,7 @@ - netcoreapp3.0 + netcoreapp3.1 Amazon.JSII.Runtime .NET Runtime for JSII icon.png diff --git a/packages/jsii-pacmak/lib/targets/dotnet.ts b/packages/jsii-pacmak/lib/targets/dotnet.ts index 1b500ab4ad..c6b76a35e4 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet.ts @@ -9,7 +9,7 @@ import { DotNetGenerator } from './dotnet/dotnetgenerator'; import { TargetBuilder, BuildOptions } from '../builder'; import { JsiiModule } from '../packaging'; -export const TARGET_FRAMEWORK = 'netcoreapp3.0'; +export const TARGET_FRAMEWORK = 'netcoreapp3.1'; /** * Build .NET packages all together, by generating an aggregate solution file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj index e0f006d3aa..6f9c453990 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj @@ -18,7 +18,7 @@ true true snupkg - netcoreapp3.0 + netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj index 574c1e8295..eb1589d629 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj @@ -18,7 +18,7 @@ true true snupkg - netcoreapp3.0 + netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj index 9c0b9c2a8b..dd99e4f551 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj @@ -18,7 +18,7 @@ true true snupkg - netcoreapp3.0 + netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj index a7595f9756..59cc8277b1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj @@ -20,7 +20,7 @@ true true snupkg - netcoreapp3.0 + netcoreapp3.1 From cbc72588b7a70fb2cb1d6d3012bec53d27263001 Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Tue, 11 Feb 2020 03:19:50 +0100 Subject: [PATCH 04/18] feat(csharp): enable nullable reference types (#1246) This allows users to write safter code by being aware of what is nullable and what is not. This does not affect the ABI of the libraries, making them compatible with previous assemblies -- since this is merely additional metadata in the assembly that enables new compiler warnings. --- .../Amazon.JSII.Analyzers.UnitTests.csproj | 3 + .../Helpers/DiagnosticVerifier.Helper.cs | 6 +- .../Verifiers/DiagnosticVerifier.cs | 20 ++-- .../JsiiOptionalAnalyzer.cs | 8 ++ .../Amazon.JSII.JsonModel.UnitTests.csproj | 3 + .../Spec/AssemblyTests.cs | 22 ++-- .../Spec/ClassTypeTests.cs | 14 ++- .../Spec/CollectionKindTests.cs | 4 +- .../Spec/CollectionTypeReferenceTests.cs | 4 +- .../Spec/EnumMemberTests.cs | 8 +- .../Amazon.JSII.JsonModel.csproj | 3 + .../src/Amazon.JSII.JsonModel/Api/Callback.cs | 16 +-- .../src/Amazon.JSII.JsonModel/Api/Override.cs | 12 +- .../Api/Request/BeginRequest.cs | 4 +- .../Api/Request/CompleteRequest.cs | 6 +- .../Api/Request/CreateRequest.cs | 4 +- .../Api/Request/InvokeRequest.cs | 4 +- .../Api/Request/SetRequest.cs | 4 +- .../Api/Request/StaticInvokeRequest.cs | 4 +- .../Api/Request/StaticSetRequest.cs | 4 +- .../Api/Response/ErrorResponse.cs | 4 +- .../Api/Response/GetResponse.cs | 4 +- .../Api/Response/InvokeResponse.cs | 4 +- .../Api/Response/NamingResponse.cs | 2 +- .../Converters/TypeConverter.cs | 4 +- .../Converters/TypeDictionaryConverter.cs | 4 +- .../Amazon.JSII.JsonModel/Converters/Util.cs | 6 +- .../JsonDictionaryBase.cs | 1 + .../Amazon.JSII.JsonModel/Spec/Assembly.cs | 24 ++-- .../Spec/AssemblyTargets.cs | 18 +-- .../Amazon.JSII.JsonModel/Spec/Callable.cs | 12 +- .../Amazon.JSII.JsonModel/Spec/ClassType.cs | 24 ++-- .../Spec/DependencyRoot.cs | 8 +- .../src/Amazon.JSII.JsonModel/Spec/Docs.cs | 30 ++--- .../Amazon.JSII.JsonModel/Spec/EnumMember.cs | 4 +- .../Amazon.JSII.JsonModel/Spec/EnumType.cs | 4 +- .../Spec/IDocumentable.cs | 2 +- .../Spec/IOverridable.cs | 2 +- .../Amazon.JSII.JsonModel/Spec/Initializer.cs | 6 +- .../Spec/InterfaceType.cs | 16 +-- .../src/Amazon.JSII.JsonModel/Spec/Method.cs | 10 +- .../Spec/PackageVersion.cs | 4 +- .../Amazon.JSII.JsonModel/Spec/Parameter.cs | 4 +- .../src/Amazon.JSII.JsonModel/Spec/Person.cs | 8 +- .../Amazon.JSII.JsonModel/Spec/Property.cs | 8 +- .../src/Amazon.JSII.JsonModel/Spec/Type.cs | 8 +- .../Spec/TypeReference.cs | 12 +- ...mazon.JSII.Runtime.IntegrationTests.csproj | 3 + .../ComplianceTests.cs | 18 ++- .../XUnitLogger.cs | 2 +- .../Amazon.JSII.Runtime.UnitTests.csproj | 3 + .../FrameworkToJsiiConverterTests.cs | 76 ++++++------ .../JsiiToFrameworkConverterTests.cs | 79 +++++++------ .../src/Amazon.JSII.Runtime.sln | 6 - .../Amazon.JSII.Runtime.csproj | 3 + .../src/Amazon.JSII.Runtime/AssemblyInfo.cs | 2 +- .../Amazon.JSII.Runtime/CallbackExtensions.cs | 52 ++++----- .../Amazon.JSII.Runtime/Deputy/ByRefValue.cs | 6 +- .../Amazon.JSII.Runtime/Deputy/DeputyBase.cs | 110 +++++++++--------- .../Deputy/JsiiClassAttribute.cs | 2 +- .../Deputy/JsiiMethodAttribute.cs | 6 +- .../Deputy/JsiiTypeAttributeBase.cs | 3 +- .../src/Amazon.JSII.Runtime/JsiiException.cs | 6 +- .../Amazon.JSII.Runtime/ReflectionUtils.cs | 6 +- .../Amazon.JSII.Runtime/Services/Client.cs | 26 ++--- .../Converters/FrameworkToJsiiConverter.cs | 68 +++++------ .../Converters/IFrameworkToJsiiConverter.cs | 2 +- .../Converters/IJsiiToFrameworkConverter.cs | 2 +- .../Converters/JsiiToFrameworkConverter.cs | 42 +++---- .../Services/Converters/ValueConverter.cs | 44 +++---- .../Amazon.JSII.Runtime/Services/IClient.cs | 14 +-- .../Services/IJsiiRuntimeProvider.cs | 2 +- .../Services/IResourceExtractor.cs | 2 +- .../Services/ITypeCache.cs | 35 +++++- .../Services/JsiiRuntimeProvider.cs | 2 +- .../Services/ReferenceMap.cs | 4 +- .../Services/ResourceExtractor.cs | 7 +- .../Services/ServiceContainer.cs | 8 +- .../Amazon.JSII.Runtime/Services/TypeCache.cs | 48 ++++---- .../lib/targets/dotnet/dotnetgenerator.ts | 53 ++++----- .../targets/dotnet/dotnetruntimegenerator.ts | 5 +- .../lib/targets/dotnet/filegenerator.ts | 1 + ...ulatorPackageId.BaseOfBasePackageId.csproj | 1 + .../BaseOfBaseNamespace/IVeryBaseInterface.cs | 2 + .../IVeryBaseInterfaceProxy.cs | 2 + .../BaseOfBaseNamespace/IVeryBaseProps.cs | 2 + .../Internal/DependencyResolution/Anchor.cs | 2 + .../BaseOfBaseNamespace/Very.cs | 2 + .../BaseOfBaseNamespace/VeryBaseProps.cs | 4 + .../BaseOfBaseNamespace/VeryBasePropsProxy.cs | 2 + ...s.CalculatorPackageId.BasePackageId.csproj | 1 + .../CalculatorNamespace/BaseNamespace/Base.cs | 2 + .../BaseNamespace/BaseProps.cs | 4 + .../BaseNamespace/BasePropsProxy.cs | 2 + .../BaseNamespace/BaseProxy.cs | 2 + .../BaseNamespace/IBaseInterface.cs | 2 + .../BaseNamespace/IBaseInterfaceProxy.cs | 2 + .../BaseNamespace/IBaseProps.cs | 2 + .../Internal/DependencyResolution/Anchor.cs | 2 + ...ts.CalculatorPackageId.LibPackageId.csproj | 1 + .../LibNamespace/EnumFromScopedModule.cs | 2 + .../LibNamespace/IDoublable.cs | 2 + .../LibNamespace/IDoublableProxy.cs | 2 + .../LibNamespace/IFriendly.cs | 2 + .../LibNamespace/IFriendlyProxy.cs | 2 + .../LibNamespace/IMyFirstStruct.cs | 4 +- .../LibNamespace/IStructWithOnlyOptionals.cs | 4 +- .../LibNamespace/IThreeLevelsInterface.cs | 2 + .../IThreeLevelsInterfaceProxy.cs | 2 + .../Internal/DependencyResolution/Anchor.cs | 2 + .../LibNamespace/MyFirstStruct.cs | 6 +- .../LibNamespace/MyFirstStructProxy.cs | 6 +- .../LibNamespace/Number.cs | 2 + .../LibNamespace/Operation.cs | 2 + .../LibNamespace/OperationProxy.cs | 2 + .../LibNamespace/StructWithOnlyOptionals.cs | 4 +- .../StructWithOnlyOptionalsProxy.cs | 6 +- .../LibNamespace/ValueProxy.cs | 2 + .../LibNamespace/Value_.cs | 2 + ...azon.JSII.Tests.CalculatorPackageId.csproj | 1 + .../CalculatorNamespace/AbstractClass.cs | 2 + .../CalculatorNamespace/AbstractClassBase.cs | 2 + .../AbstractClassBaseProxy.cs | 2 + .../CalculatorNamespace/AbstractClassProxy.cs | 2 + .../AbstractClassReturner.cs | 2 + .../CalculatorNamespace/AbstractSuite.cs | 2 + .../CalculatorNamespace/AbstractSuiteProxy.cs | 2 + .../JSII/Tests/CalculatorNamespace/Add.cs | 2 + .../Tests/CalculatorNamespace/AllTypes.cs | 2 + .../Tests/CalculatorNamespace/AllTypesEnum.cs | 2 + .../CalculatorNamespace/AllowedMethodNames.cs | 2 + .../AmbiguousParameters.cs | 2 + .../AnonymousImplementationProvider.cs | 2 + .../AsyncVirtualMethods.cs | 2 + .../CalculatorNamespace/AugmentableClass.cs | 2 + .../Tests/CalculatorNamespace/BaseJsii976.cs | 2 + .../JSII/Tests/CalculatorNamespace/Bell.cs | 2 + .../CalculatorNamespace/BinaryOperation.cs | 2 + .../BinaryOperationProxy.cs | 2 + .../Tests/CalculatorNamespace/Calculator.cs | 8 +- .../CalculatorNamespace/CalculatorProps.cs | 2 + .../CalculatorPropsProxy.cs | 2 + .../CalculatorNamespace/ChildStruct982.cs | 4 + .../ChildStruct982Proxy.cs | 2 + ...ClassThatImplementsTheInternalInterface.cs | 2 + .../ClassThatImplementsThePrivateInterface.cs | 2 + .../ClassWithCollections.cs | 2 + .../CalculatorNamespace/ClassWithDocs.cs | 2 + .../ClassWithJavaReservedWords.cs | 2 + .../ClassWithMutableObjectLiteralProperty.cs | 2 + ...rivateConstructorAndAutomaticProperties.cs | 2 + .../CalculatorNamespace/ConfusingToJackson.cs | 6 +- .../ConfusingToJacksonStruct.cs | 4 +- .../ConfusingToJacksonStructProxy.cs | 6 +- .../ConstructorPassesThisOut.cs | 2 + .../Tests/CalculatorNamespace/Constructors.cs | 2 + .../ConsumePureInterface.cs | 2 + .../ConsumerCanRingBell.cs | 2 + .../ConsumersOfThisCrazyTypeSystem.cs | 2 + .../Tests/CalculatorNamespace/DataRenderer.cs | 6 +- .../DefaultedConstructorArgument.cs | 8 +- .../CalculatorNamespace/Demonstrate982.cs | 2 + .../CalculatorNamespace/DeprecatedClass.cs | 4 +- .../CalculatorNamespace/DeprecatedEnum.cs | 2 + .../CalculatorNamespace/DeprecatedStruct.cs | 4 + .../DeprecatedStructProxy.cs | 2 + .../DerivedClassHasNoProperties/Base.cs | 2 + .../DerivedClassHasNoProperties/Derived.cs | 2 + .../CalculatorNamespace/DerivedStruct.cs | 12 +- .../CalculatorNamespace/DerivedStructProxy.cs | 18 +-- .../DiamondInheritanceBaseLevelStruct.cs | 4 + .../DiamondInheritanceBaseLevelStructProxy.cs | 2 + .../DiamondInheritanceFirstMidLevelStruct.cs | 4 + ...mondInheritanceFirstMidLevelStructProxy.cs | 2 + .../DiamondInheritanceSecondMidLevelStruct.cs | 4 + ...ondInheritanceSecondMidLevelStructProxy.cs | 2 + .../DiamondInheritanceTopLevelStruct.cs | 4 + .../DiamondInheritanceTopLevelStructProxy.cs | 2 + .../DisappointingCollectionSource.cs | 2 + .../DoNotOverridePrivates.cs | 2 + .../DoNotRecognizeAnyAsOptional.cs | 6 +- .../CalculatorNamespace/DocumentedClass.cs | 6 +- .../DontComplainAboutVariadicAfterOptional.cs | 6 +- .../CalculatorNamespace/DoubleTrouble.cs | 2 + .../CalculatorNamespace/EnumDispenser.cs | 2 + .../EraseUndefinedHashValues.cs | 2 + .../EraseUndefinedHashValuesOptions.cs | 6 +- .../EraseUndefinedHashValuesOptionsProxy.cs | 10 +- .../CalculatorNamespace/ExperimentalClass.cs | 4 +- .../CalculatorNamespace/ExperimentalEnum.cs | 2 + .../CalculatorNamespace/ExperimentalStruct.cs | 4 + .../ExperimentalStructProxy.cs | 2 + .../CalculatorNamespace/ExportedBaseClass.cs | 2 + .../ExtendsInternalInterface.cs | 4 + .../ExtendsInternalInterfaceProxy.cs | 2 + .../CalculatorNamespace/GiveMeStructs.cs | 2 + .../JSII/Tests/CalculatorNamespace/Greetee.cs | 4 +- .../Tests/CalculatorNamespace/GreeteeProxy.cs | 6 +- .../CalculatorNamespace/GreetingAugmenter.cs | 2 + .../IAnonymousImplementationProvider.cs | 2 + .../IAnonymousImplementationProviderProxy.cs | 2 + .../IAnonymouslyImplementMe.cs | 2 + .../IAnonymouslyImplementMeProxy.cs | 2 + .../IAnotherPublicInterface.cs | 2 + .../IAnotherPublicInterfaceProxy.cs | 2 + .../JSII/Tests/CalculatorNamespace/IBell.cs | 2 + .../Tests/CalculatorNamespace/IBellProxy.cs | 2 + .../Tests/CalculatorNamespace/IBellRinger.cs | 2 + .../CalculatorNamespace/IBellRingerProxy.cs | 2 + .../CalculatorNamespace/ICalculatorProps.cs | 2 + .../CalculatorNamespace/IChildStruct982.cs | 2 + .../IConcreteBellRinger.cs | 2 + .../IConcreteBellRingerProxy.cs | 2 + .../IConfusingToJacksonStruct.cs | 4 +- .../IDeprecatedInterface.cs | 2 + .../IDeprecatedInterfaceProxy.cs | 2 + .../CalculatorNamespace/IDeprecatedStruct.cs | 2 + .../CalculatorNamespace/IDerivedStruct.cs | 8 +- .../IDiamondInheritanceBaseLevelStruct.cs | 2 + .../IDiamondInheritanceFirstMidLevelStruct.cs | 2 + ...IDiamondInheritanceSecondMidLevelStruct.cs | 2 + .../IDiamondInheritanceTopLevelStruct.cs | 2 + .../IEraseUndefinedHashValuesOptions.cs | 6 +- .../IExperimentalInterface.cs | 2 + .../IExperimentalInterfaceProxy.cs | 2 + .../IExperimentalStruct.cs | 2 + .../IExtendsInternalInterface.cs | 2 + .../IExtendsPrivateInterface.cs | 2 + .../IExtendsPrivateInterfaceProxy.cs | 2 + .../Tests/CalculatorNamespace/IFriendlier.cs | 2 + .../CalculatorNamespace/IFriendlierProxy.cs | 2 + .../IFriendlyRandomGenerator.cs | 2 + .../IFriendlyRandomGeneratorProxy.cs | 2 + .../Tests/CalculatorNamespace/IGreetee.cs | 4 +- .../CalculatorNamespace/IImplictBaseOfBase.cs | 2 + .../IInterfaceImplementedByAbstractClass.cs | 2 + ...nterfaceImplementedByAbstractClassProxy.cs | 2 + .../IInterfaceThatShouldNotBeADataType.cs | 2 + ...IInterfaceThatShouldNotBeADataTypeProxy.cs | 2 + .../IInterfaceWithInternal.cs | 2 + .../IInterfaceWithInternalProxy.cs | 2 + .../IInterfaceWithMethods.cs | 2 + .../IInterfaceWithMethodsProxy.cs | 2 + .../IInterfaceWithOptionalMethodArguments.cs | 2 + ...terfaceWithOptionalMethodArgumentsProxy.cs | 4 +- .../IInterfaceWithProperties.cs | 2 + .../IInterfaceWithPropertiesExtension.cs | 2 + .../IInterfaceWithPropertiesExtensionProxy.cs | 2 + .../IInterfaceWithPropertiesProxy.cs | 2 + .../CalculatorNamespace/IJSII417Derived.cs | 2 + .../IJSII417DerivedProxy.cs | 2 + .../IJSII417PublicBaseOfBase.cs | 2 + .../IJSII417PublicBaseOfBaseProxy.cs | 2 + .../CalculatorNamespace/IJsii487External.cs | 2 + .../CalculatorNamespace/IJsii487External2.cs | 2 + .../IJsii487External2Proxy.cs | 2 + .../IJsii487ExternalProxy.cs | 2 + .../Tests/CalculatorNamespace/IJsii496.cs | 2 + .../CalculatorNamespace/IJsii496Proxy.cs | 2 + .../ILoadBalancedFargateServiceProps.cs | 6 +- .../IMutableObjectLiteral.cs | 2 + .../IMutableObjectLiteralProxy.cs | 2 + .../CalculatorNamespace/INestedStruct.cs | 2 + .../INonInternalInterface.cs | 2 + .../INonInternalInterfaceProxy.cs | 2 + .../INullShouldBeTreatedAsUndefinedData.cs | 4 +- .../IObjectWithProperty.cs | 2 + .../IObjectWithPropertyProxy.cs | 2 + .../CalculatorNamespace/IOptionalStruct.cs | 4 +- .../CalculatorNamespace/IParentStruct982.cs | 2 + .../IPrivatelyImplemented.cs | 2 + .../IPrivatelyImplementedProxy.cs | 2 + .../CalculatorNamespace/IPublicInterface.cs | 2 + .../CalculatorNamespace/IPublicInterface2.cs | 2 + .../IPublicInterface2Proxy.cs | 2 + .../IPublicInterfaceProxy.cs | 2 + .../IRandomNumberGenerator.cs | 2 + .../IRandomNumberGeneratorProxy.cs | 2 + .../CalculatorNamespace/IReturnJsii976.cs | 2 + .../IReturnJsii976Proxy.cs | 2 + .../CalculatorNamespace/IReturnsNumber.cs | 2 + .../IReturnsNumberProxy.cs | 2 + .../Tests/CalculatorNamespace/IRootStruct.cs | 4 +- .../CalculatorNamespace/ISecondLevelStruct.cs | 4 +- .../CalculatorNamespace/ISmellyStruct.cs | 2 + .../CalculatorNamespace/IStableInterface.cs | 2 + .../IStableInterfaceProxy.cs | 2 + .../CalculatorNamespace/IStableStruct.cs | 2 + .../Tests/CalculatorNamespace/IStructA.cs | 4 +- .../Tests/CalculatorNamespace/IStructB.cs | 4 +- .../IStructParameterType.cs | 2 + .../IStructReturningDelegate.cs | 2 + .../IStructReturningDelegateProxy.cs | 2 + .../IStructWithJavaReservedWords.cs | 8 +- .../ISupportsNiceJavaBuilderProps.cs | 4 +- .../CalculatorNamespace/ITopLevelStruct.cs | 4 +- .../CalculatorNamespace/IUnionProperties.cs | 4 +- .../ImplementInternalInterface.cs | 2 + .../CalculatorNamespace/Implementation.cs | 2 + .../ImplementsInterfaceWithInternal.cs | 2 + ...ImplementsInterfaceWithInternalSubclass.cs | 2 + .../ImplementsPrivateInterface.cs | 2 + .../CalculatorNamespace/ImplictBaseOfBase.cs | 4 + .../ImplictBaseOfBaseProxy.cs | 2 + .../CalculatorNamespace/InbetweenClass.cs | 2 + .../InterfaceCollections.cs | 2 + .../Foo.cs | 6 +- .../Hello.cs | 4 + .../HelloProxy.cs | 2 + .../IHello.cs | 2 + .../Hello.cs | 4 + .../HelloProxy.cs | 2 + .../IHello.cs | 2 + .../CalculatorNamespace/InterfacesMaker.cs | 2 + .../Internal/DependencyResolution/Anchor.cs | 2 + .../CalculatorNamespace/JSII417Derived.cs | 2 + .../JSII417PublicBaseOfBase.cs | 2 + .../JSObjectLiteralForInterface.cs | 2 + .../JSObjectLiteralToNative.cs | 2 + .../JSObjectLiteralToNativeClass.cs | 2 + .../CalculatorNamespace/JavaReservedWords.cs | 2 + .../CalculatorNamespace/Jsii487Derived.cs | 2 + .../CalculatorNamespace/Jsii496Derived.cs | 2 + .../Tests/CalculatorNamespace/JsiiAgent_.cs | 6 +- .../CalculatorNamespace/JsonFormatter.cs | 6 +- .../LoadBalancedFargateServiceProps.cs | 6 +- .../LoadBalancedFargateServicePropsProxy.cs | 10 +- .../MethodNamedProperty.cs | 2 + .../Tests/CalculatorNamespace/Multiply.cs | 2 + .../Tests/CalculatorNamespace/NamespaceDoc.cs | 2 + .../JSII/Tests/CalculatorNamespace/Negate.cs | 2 + .../Tests/CalculatorNamespace/NestedStruct.cs | 4 + .../CalculatorNamespace/NestedStructProxy.cs | 2 + .../NodeStandardLibrary.cs | 2 + .../NullShouldBeTreatedAsUndefined.cs | 12 +- .../NullShouldBeTreatedAsUndefinedData.cs | 6 +- ...NullShouldBeTreatedAsUndefinedDataProxy.cs | 6 +- .../CalculatorNamespace/NumberGenerator.cs | 2 + .../ObjectRefsInCollections.cs | 2 + .../ObjectWithPropertyProvider.cs | 2 + .../JSII/Tests/CalculatorNamespace/Old.cs | 2 + .../OptionalArgumentInvoker.cs | 2 + .../OptionalConstructorArgument.cs | 4 +- .../CalculatorNamespace/OptionalStruct.cs | 4 +- .../OptionalStructConsumer.cs | 8 +- .../OptionalStructProxy.cs | 6 +- .../OverridableProtectedMember.cs | 2 + .../OverrideReturnsObject.cs | 2 + .../CalculatorNamespace/ParentStruct982.cs | 4 + .../ParentStruct982Proxy.cs | 2 + .../PartiallyInitializedThisConsumer.cs | 2 + .../PartiallyInitializedThisConsumerProxy.cs | 2 + .../Tests/CalculatorNamespace/Polymorphism.cs | 2 + .../JSII/Tests/CalculatorNamespace/Power.cs | 2 + .../PropertyNamedProperty.cs | 2 + .../Tests/CalculatorNamespace/PublicClass.cs | 2 + .../PythonReservedWords.cs | 2 + .../ReferenceEnumFromScopedPackage.cs | 6 +- ...ReturnsPrivateImplementationOfInterface.cs | 2 + .../Tests/CalculatorNamespace/RootStruct.cs | 6 +- .../CalculatorNamespace/RootStructProxy.cs | 6 +- .../RootStructValidator.cs | 2 + .../RuntimeTypeChecking.cs | 12 +- .../CalculatorNamespace/SecondLevelStruct.cs | 6 +- .../SecondLevelStructProxy.cs | 6 +- .../SingleInstanceTwoTypes.cs | 2 + .../Tests/CalculatorNamespace/SingletonInt.cs | 2 + .../CalculatorNamespace/SingletonIntEnum.cs | 2 + .../CalculatorNamespace/SingletonString.cs | 2 + .../SingletonStringEnum.cs | 2 + .../Tests/CalculatorNamespace/SmellyStruct.cs | 4 + .../CalculatorNamespace/SmellyStructProxy.cs | 2 + .../CalculatorNamespace/SomeTypeJsii976.cs | 2 + .../Tests/CalculatorNamespace/StableClass.cs | 4 +- .../Tests/CalculatorNamespace/StableEnum.cs | 2 + .../Tests/CalculatorNamespace/StableStruct.cs | 4 + .../CalculatorNamespace/StableStructProxy.cs | 2 + .../CalculatorNamespace/StaticContext.cs | 2 + .../JSII/Tests/CalculatorNamespace/Statics.cs | 2 + .../Tests/CalculatorNamespace/StringEnum.cs | 2 + .../CalculatorNamespace/StripInternal.cs | 2 + .../JSII/Tests/CalculatorNamespace/StructA.cs | 6 +- .../Tests/CalculatorNamespace/StructAProxy.cs | 6 +- .../JSII/Tests/CalculatorNamespace/StructB.cs | 6 +- .../Tests/CalculatorNamespace/StructBProxy.cs | 6 +- .../StructParameterType.cs | 4 + .../StructParameterTypeProxy.cs | 2 + .../CalculatorNamespace/StructPassing.cs | 2 + .../StructUnionConsumer.cs | 2 + .../StructWithJavaReservedWords.cs | 10 +- .../StructWithJavaReservedWordsProxy.cs | 14 ++- .../JSII/Tests/CalculatorNamespace/Sum.cs | 2 + .../SupportsNiceJavaBuilder.cs | 4 +- .../SupportsNiceJavaBuilderProps.cs | 6 +- .../SupportsNiceJavaBuilderPropsProxy.cs | 6 +- ...upportsNiceJavaBuilderWithRequiredProps.cs | 6 +- .../CalculatorNamespace/SyncVirtualMethods.cs | 2 + .../JSII/Tests/CalculatorNamespace/Thrower.cs | 2 + .../CalculatorNamespace/TopLevelStruct.cs | 6 +- .../TopLevelStructProxy.cs | 6 +- .../CalculatorNamespace/UnaryOperation.cs | 2 + .../UnaryOperationProxy.cs | 2 + .../CalculatorNamespace/UnionProperties.cs | 6 +- .../UnionPropertiesProxy.cs | 6 +- .../UseBundledDependency.cs | 2 + .../Tests/CalculatorNamespace/UseCalcBase.cs | 2 + .../UsesInterfaceWithProperties.cs | 2 + .../CalculatorNamespace/VariadicInvoker.cs | 2 + .../CalculatorNamespace/VariadicMethod.cs | 2 + .../VirtualMethodPlayground.cs | 2 + .../Tests/CalculatorNamespace/VoidCallback.cs | 2 + .../CalculatorNamespace/VoidCallbackProxy.cs | 2 + .../WithPrivatePropertyInConstructor.cs | 4 +- .../composition/CompositeOperation.cs | 2 + .../composition/CompositeOperationProxy.cs | 2 + 415 files changed, 1460 insertions(+), 676 deletions(-) diff --git a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj index 0d06ffbb13..171648cd2c 100644 --- a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj +++ b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Amazon.JSII.Analyzers.UnitTests.csproj @@ -4,6 +4,9 @@ netcoreapp3.1 false Amazon.JSII.Analyzers.UnitTests + + enable + true diff --git a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Helpers/DiagnosticVerifier.Helper.cs b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Helpers/DiagnosticVerifier.Helper.cs index de72e54f8d..4b3663ae48 100755 --- a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Helpers/DiagnosticVerifier.Helper.cs +++ b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Helpers/DiagnosticVerifier.Helper.cs @@ -34,7 +34,7 @@ public abstract partial class DiagnosticVerifier /// The language the source classes are in /// The analyzer to be run on the sources /// An IEnumerable of Diagnostics that surfaced in the source code, sorted by Location - private static Diagnostic[] GetSortedDiagnostics(string[] sources, string language, DiagnosticAnalyzer analyzer) + private static Diagnostic[] GetSortedDiagnostics(string[] sources, string language, DiagnosticAnalyzer? analyzer) { return GetSortedDiagnosticsFromDocuments(analyzer, GetDocuments(sources, language)); } @@ -46,7 +46,7 @@ private static Diagnostic[] GetSortedDiagnostics(string[] sources, string langua /// The analyzer to run on the documents /// The Documents that the analyzer will be run on /// An IEnumerable of Diagnostics that surfaced in the source code, sorted by Location - protected static Diagnostic[] GetSortedDiagnosticsFromDocuments(DiagnosticAnalyzer analyzer, Document[] documents) + protected static Diagnostic[] GetSortedDiagnosticsFromDocuments(DiagnosticAnalyzer? analyzer, Document[] documents) { var projects = new HashSet(); foreach (var document in documents) @@ -162,7 +162,7 @@ private static Project CreateProject(string[] sources, string language = Languag solution = solution.AddDocument(documentId, newFileName, SourceText.From(source)); count++; } - return solution.GetProject(projectId); + return solution.GetProject(projectId)!; } #endregion } diff --git a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs index 8a66157221..b5ea35d61b 100755 --- a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs +++ b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers.UnitTests/Verifiers/DiagnosticVerifier.cs @@ -16,7 +16,7 @@ public abstract partial class DiagnosticVerifier /// /// Get the CSharp analyzer being tested - to be implemented in non-abstract class /// - protected virtual DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer() + protected virtual DiagnosticAnalyzer? GetCSharpDiagnosticAnalyzer() { return null; } @@ -24,7 +24,7 @@ protected virtual DiagnosticAnalyzer GetCSharpDiagnosticAnalyzer() /// /// Get the Visual Basic analyzer being tested (C#) - to be implemented in non-abstract class /// - protected virtual DiagnosticAnalyzer GetBasicDiagnosticAnalyzer() + protected virtual DiagnosticAnalyzer? GetBasicDiagnosticAnalyzer() { return null; } @@ -84,7 +84,7 @@ protected void VerifyBasicDiagnostic(string[] sources, params DiagnosticResult[] /// The language of the classes represented by the source strings /// The analyzer to be run on the source code /// DiagnosticResults that should appear after the analyzer is run on the sources - private void VerifyDiagnostics(string[] sources, string language, DiagnosticAnalyzer analyzer, params DiagnosticResult[] expected) + private void VerifyDiagnostics(string[] sources, string language, DiagnosticAnalyzer? analyzer, params DiagnosticResult[] expected) { var diagnostics = GetSortedDiagnostics(sources, language, analyzer); VerifyDiagnosticResults(diagnostics, analyzer, expected); @@ -100,7 +100,7 @@ private void VerifyDiagnostics(string[] sources, string language, DiagnosticAnal /// The Diagnostics found by the compiler after running the analyzer on the source code /// The analyzer that was being run on the sources /// Diagnostic Results that should have appeared in the code - private static void VerifyDiagnosticResults(IEnumerable actualResults, DiagnosticAnalyzer analyzer, params DiagnosticResult[] expectedResults) + private static void VerifyDiagnosticResults(IEnumerable actualResults, DiagnosticAnalyzer? analyzer, params DiagnosticResult[] expectedResults) { int expectedCount = expectedResults.Count(); int actualCount = actualResults.Count(); @@ -176,7 +176,7 @@ private static void VerifyDiagnosticResults(IEnumerable actualResult /// The diagnostic that was found in the code /// The Location of the Diagnostic found in the code /// The DiagnosticResultLocation that should have been found - private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagnostic diagnostic, Location actual, DiagnosticResultLocation expected) + private static void VerifyDiagnosticLocation(DiagnosticAnalyzer? analyzer, Diagnostic diagnostic, Location actual, DiagnosticResultLocation expected) { var actualSpan = actual.GetLineSpan(); @@ -217,15 +217,19 @@ private static void VerifyDiagnosticLocation(DiagnosticAnalyzer analyzer, Diagno /// The analyzer that this verifier tests /// The Diagnostics to be formatted /// The Diagnostics formatted as a string - private static string FormatDiagnostics(DiagnosticAnalyzer analyzer, params Diagnostic[] diagnostics) + private static string FormatDiagnostics(DiagnosticAnalyzer? analyzer, params Diagnostic[] diagnostics) { var builder = new StringBuilder(); for (int i = 0; i < diagnostics.Length; ++i) { builder.AppendLine("// " + diagnostics[i].ToString()); - var analyzerType = analyzer.GetType(); - var rules = analyzer.SupportedDiagnostics; + var analyzerType = analyzer?.GetType(); + if (analyzerType == null) + { + continue; + } + var rules = analyzer!.SupportedDiagnostics; foreach (var rule in rules) { diff --git a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers/JsiiOptionalAnalyzer.cs b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers/JsiiOptionalAnalyzer.cs index 957a093d44..7facb303d1 100644 --- a/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers/JsiiOptionalAnalyzer.cs +++ b/packages/@jsii/dotnet-analyzers/src/Amazon.JSII.Analyzers/JsiiOptionalAnalyzer.cs @@ -105,6 +105,10 @@ private static void AnalyzeNode(SyntaxNodeAnalysisContext context) /// true if the TypeInfo is related to a Jsii class, false otherwise private static bool IsJsiiClass(TypeInfo typeInfo) { + if (typeInfo.Type == null) + { + return false; + } var typeAttributes = typeInfo.Type.GetAttributes().ToArray(); return typeAttributes.Any(a => a.AttributeClass.Name == "JsiiClassAttribute"); } @@ -119,6 +123,10 @@ private static bool IsJsiiClass(TypeInfo typeInfo) /// true if the TypeInfo is related to a Jsii datatype, false otherwise private static bool IsJsiiDatatype(TypeInfo typeInfo) { + if (typeInfo.Type == null) + { + return false; + } var typeAttributes = typeInfo.Type.GetAttributes().ToArray(); return typeAttributes.Any(a => a.AttributeClass.Name == "JsiiByValueAttribute"); } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj index bfa55bf1d6..03e37b0d36 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Amazon.JSII.JsonModel.UnitTests.csproj @@ -5,6 +5,9 @@ false Amazon.JSII.JsonModel.UnitTests Amazon.JSII.JsonModel.UnitTests + + enable + true diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/AssemblyTests.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/AssemblyTests.cs index 6779b2ef22..fcb7ca006e 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/AssemblyTests.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/AssemblyTests.cs @@ -107,7 +107,9 @@ public void ShouldThrowOnMissingName() { Assert.Throws(() => new Assembly ( +#pragma warning disable CS8625 name: null, +#pragma warning restore CS8625 description: "", homepage: "", repository: new Assembly.AssemblyRepository(type: "", url: ""), @@ -140,7 +142,9 @@ public void ShouldThrowOnMissingVersion() repository: new Assembly.AssemblyRepository(type: "", url: ""), author: new Person(name: "", roles: new string[] { }), fingerprint: "", +#pragma warning disable CS8625 version: null, +#pragma warning restore CS8625 license: "", targets: new AssemblyTargets(new AssemblyTargets.DotNetTarget( @namespace: "Dot.Net.Namespace", @@ -375,7 +379,7 @@ public void ShouldDeserializeAllMembers() Assert.Empty(actual.Types); Assert.Empty(actual.Dependencies); Assert.Empty(actual.Bundled); - Assert.Equal("hello", actual.Docs.Summary); + Assert.Equal("hello", actual.Docs?.Summary); } [Fact(DisplayName = Prefix + nameof(ShouldDeserializeAllMembersWithNoTypes))] @@ -411,7 +415,7 @@ public void ShouldDeserializeAllMembersWithNoTypes() Assert.Null(actual.Types); Assert.Empty(actual.Dependencies); Assert.Empty(actual.Bundled); - Assert.Equal("hello", actual.Docs.Summary); + Assert.Equal("hello", actual.Docs?.Summary); } @@ -455,19 +459,19 @@ public void ShouldDeserializeAllMembersWithDotNetTarget() Assert.Equal("jsii/0.9.0", actual.Schema, ignoreLineEndingDifferences: true); Assert.Equal("myName", actual.Name, ignoreLineEndingDifferences: true); - AssemblyTargets.DotNetTarget dotNetTarget = actual.Targets.DotNet; + AssemblyTargets.DotNetTarget? dotNetTarget = actual.Targets?.DotNet; 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("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); Assert.Empty(actual.Types); Assert.Empty(actual.Dependencies); Assert.Empty(actual.Bundled); - Assert.Equal("hello", actual.Docs.Summary); + Assert.Equal("hello", actual.Docs?.Summary); } [Fact(DisplayName = Prefix + nameof(ShouldThrowOnMissingName))] diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/ClassTypeTests.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/ClassTypeTests.cs index e266fae302..5e25c3a8c2 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/ClassTypeTests.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/ClassTypeTests.cs @@ -1,4 +1,4 @@ -using Amazon.JSII.JsonModel.Spec; +using Amazon.JSII.JsonModel.Spec; using Newtonsoft.Json; using System; using System.Linq; @@ -56,7 +56,9 @@ public void ShouldThrowOnMissingFullyQualifiedName() { Assert.Throws(() => new ClassType ( +#pragma warning disable CS8625 fullyQualifiedName: null, +#pragma warning restore CS8625 assembly: "myModule", name: "myName", @namespace: "myNamespace", @@ -76,7 +78,9 @@ public void ShouldThrowOnMissingAssembly() Assert.Throws(() => new ClassType ( fullyQualifiedName: "myFqn", +#pragma warning disable CS8625 assembly: null, +#pragma warning restore CS8625 name: "myName", @namespace: "myNamespace", isAbstract: true, @@ -96,7 +100,9 @@ public void ShouldThrowOnMissingName() ( fullyQualifiedName: "myFqn", assembly: "myModule", +#pragma warning disable CS8625 name: null, +#pragma warning restore CS8625 @namespace: "myNamespace", isAbstract: true, docs: new Docs(), @@ -388,7 +394,7 @@ public void ShouldDeserializeAllMembers() Assert.Equal("myName", actual.Name, ignoreLineEndingDifferences: true); Assert.Equal("myNamespace", actual.Namespace, ignoreLineEndingDifferences: true); Assert.Equal(TypeKind.Class, actual.Kind); - Assert.Equal("hello", actual.Docs.Summary); + Assert.Equal("hello", actual.Docs?.Summary); } [Fact(DisplayName = Prefix + nameof(ShouldThrowOnMissingFullyQualifiedName))] @@ -623,8 +629,8 @@ public void DeserializesAsyncMethod() ClassType actual = JsonConvert.DeserializeObject(json); - Assert.True(actual.Methods.Length == 1); - Assert.True(actual.Methods[0]?.IsAsync); + Assert.Equal(1, actual.Methods?.Length); + Assert.True(actual.Methods?[0]?.IsAsync); } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/CollectionKindTests.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/CollectionKindTests.cs index e1c058e6cb..84885bb1ed 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/CollectionKindTests.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/CollectionKindTests.cs @@ -1,4 +1,4 @@ -using Amazon.JSII.JsonModel.Spec; +using Amazon.JSII.JsonModel.Spec; using Newtonsoft.Json; using System; using Xunit; @@ -41,7 +41,9 @@ public void ShouldDeserialize(string kind, CollectionKind expected) [Fact(DisplayName = Prefix + nameof(ShouldThrowOnNull))] public void ShouldThrowOnNull() { +#pragma warning disable CS8625 Assert.Throws(() => JsonConvert.DeserializeObject(null)); +#pragma warning restore CS8625 } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/CollectionTypeReferenceTests.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/CollectionTypeReferenceTests.cs index 2800b66e7f..4a6450174d 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/CollectionTypeReferenceTests.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/CollectionTypeReferenceTests.cs @@ -1,4 +1,4 @@ -using Amazon.JSII.JsonModel.Spec; +using Amazon.JSII.JsonModel.Spec; using Newtonsoft.Json; using System; using Xunit; @@ -36,7 +36,9 @@ public void ShouldSerializeAllMembers() [Fact(DisplayName = Prefix + nameof(ShouldThrowOnMissingElementType))] public void ShouldThrowOnMissingElementType() { +#pragma warning disable CS8625 Assert.Throws(() => new CollectionTypeReference(CollectionKind.Array, null)); +#pragma warning restore CS8625 } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/EnumMemberTests.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/EnumMemberTests.cs index c3e43b6224..e56cca7a08 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/EnumMemberTests.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel.UnitTests/Spec/EnumMemberTests.cs @@ -1,4 +1,4 @@ -using Amazon.JSII.JsonModel.Spec; +using Amazon.JSII.JsonModel.Spec; using Newtonsoft.Json; using System; using Xunit; @@ -30,7 +30,9 @@ public void ShouldSerializeAllMembers() [Fact(DisplayName = Prefix + nameof(ShouldThrowOnMissingName))] public void ShouldThrowOnMissingName() { +#pragma warning disable CS8625 Assert.Throws(() => new EnumMember(null, new Docs())); +#pragma warning restore CS8625 } [Fact(DisplayName = Prefix + nameof(ShouldNotSerializeMissingDocs))] @@ -61,8 +63,8 @@ public void ShouldDeserializeAllMembers() EnumMember actual = JsonConvert.DeserializeObject(json); - Assert.Equal("myName", actual.Name, ignoreLineEndingDifferences: true); - Assert.Equal("hello", actual.Docs.Summary); + Assert.Equal("myName", actual?.Name, ignoreLineEndingDifferences: true); + Assert.Equal("hello", actual?.Docs?.Summary); } [Fact(DisplayName = Prefix + nameof(ShouldThrowOnMissingName))] diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj index 8e82179c1a..8c97657b68 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Amazon.JSII.JsonModel.csproj @@ -6,6 +6,9 @@ Amazon.JSII.JsonModel .NET JsonModel for JSII icon.png + + enable + true diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Callback.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Callback.cs index 278c6d6237..64edb813fc 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Callback.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Callback.cs @@ -10,10 +10,10 @@ public class Callback public Callback ( string callbackId, - string cookie = null, - InvokeRequest invoke = null, - GetRequest get = null, - SetRequest set = null + string? cookie = null, + InvokeRequest? invoke = null, + GetRequest? get = null, + SetRequest? set = null ) { CallbackId = callbackId ?? throw new ArgumentNullException(nameof(callbackId)); @@ -27,15 +27,15 @@ public Callback public string CallbackId { get; } [JsonProperty("cookie", NullValueHandling = NullValueHandling.Ignore)] - public string Cookie { get; } + public string? Cookie { get; } [JsonProperty("invoke", NullValueHandling = NullValueHandling.Ignore)] - public InvokeRequest Invoke { get; } + public InvokeRequest? Invoke { get; } [JsonProperty("get", NullValueHandling = NullValueHandling.Ignore)] - public GetRequest Get { get; } + public GetRequest? Get { get; } [JsonProperty("set", NullValueHandling = NullValueHandling.Ignore)] - public SetRequest Set { get; } + public SetRequest? Set { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Override.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Override.cs index acb2e71e99..bfa1ebcf7f 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Override.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Override.cs @@ -7,9 +7,9 @@ public class Override { public Override ( - string method = null, - string property = null, - string cookie = null + string? method = null, + string? property = null, + string? cookie = null ) { Method = method; @@ -18,12 +18,12 @@ public Override } [JsonProperty("method", NullValueHandling = NullValueHandling.Ignore)] - public string Method { get; } + public string? Method { get; } [JsonProperty("property", NullValueHandling = NullValueHandling.Ignore)] - public string Property { get; } + public string? Property { get; } [JsonProperty("cookie", NullValueHandling = NullValueHandling.Ignore)] - public string Cookie { get; } + public string? Cookie { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/BeginRequest.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/BeginRequest.cs index e33fe6a284..c1dd77bacc 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/BeginRequest.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/BeginRequest.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Api.Request [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class BeginRequest : IKernelRequest { - public BeginRequest(ObjectReference objectReference, string method, object[] arguments = null) + public BeginRequest(ObjectReference objectReference, string method, object?[]? arguments = null) { ObjectReference = objectReference ?? throw new ArgumentNullException(nameof(objectReference)); Method = method ?? throw new ArgumentNullException(nameof(method)); @@ -23,6 +23,6 @@ public BeginRequest(ObjectReference objectReference, string method, object[] arg public string Method { get; } [JsonProperty("args", NullValueHandling = NullValueHandling.Ignore)] - public object[] Arguments { get; } + public object?[]? Arguments { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/CompleteRequest.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/CompleteRequest.cs index f9b13eb149..5cf84ffc0b 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/CompleteRequest.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/CompleteRequest.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Api.Request [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class CompleteRequest : IKernelRequest { - public CompleteRequest(string callbackId, string error = null, object result = null) + public CompleteRequest(string callbackId, string? error = null, object? result = null) { CallbackId = callbackId ?? throw new ArgumentNullException(nameof(callbackId)); Error = error; @@ -20,9 +20,9 @@ public CompleteRequest(string callbackId, string error = null, object result = n public string CallbackId { get; } [JsonProperty("err", NullValueHandling = NullValueHandling.Ignore)] - public string Error { get; } + public string? Error { get; } [JsonProperty("result", NullValueHandling = NullValueHandling.Ignore)] - public object Result { get; } + public object? Result { get; } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/CreateRequest.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/CreateRequest.cs index f36ac4bae8..35b465af5e 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/CreateRequest.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/CreateRequest.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Api.Request [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class CreateRequest : IKernelRequest { - public CreateRequest(string fullyQualifiedName, object[] arguments = null, Override[] overrides = null, string[] interfaces = null) + public CreateRequest(string fullyQualifiedName, object?[]? arguments = null, Override[]? overrides = null, string[]? interfaces = null) { FullyQualifiedName = fullyQualifiedName ?? throw new ArgumentNullException(nameof(fullyQualifiedName)); Arguments = arguments; @@ -21,7 +21,7 @@ public CreateRequest(string fullyQualifiedName, object[] arguments = null, Overr public string FullyQualifiedName { get; } [JsonProperty("args", NullValueHandling = NullValueHandling.Ignore)] - public object[] Arguments { get; } + public object?[]? Arguments { get; } [JsonProperty("overrides", NullValueHandling = NullValueHandling.Ignore)] public Override[] Overrides { get; } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/InvokeRequest.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/InvokeRequest.cs index aaf2f6698e..17c953ed29 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/InvokeRequest.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/InvokeRequest.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Api.Request [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class InvokeRequest : IKernelRequest { - public InvokeRequest(ObjectReference objectReference, string method, object[] arguments = null) + public InvokeRequest(ObjectReference objectReference, string method, object?[]? arguments = null) { ObjectReference = objectReference ?? throw new ArgumentNullException(nameof(objectReference)); Method = method ?? throw new ArgumentNullException(nameof(method)); @@ -23,6 +23,6 @@ public InvokeRequest(ObjectReference objectReference, string method, object[] ar public string Method { get; } [JsonProperty("args", NullValueHandling = NullValueHandling.Ignore)] - public object[] Arguments { get; } + public object?[]? Arguments { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/SetRequest.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/SetRequest.cs index 47ca9c31bd..a67162e77d 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/SetRequest.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/SetRequest.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Api.Request [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class SetRequest : IKernelRequest { - public SetRequest(ObjectReference objectReference, string property, object value) + public SetRequest(ObjectReference objectReference, string property, object? value) { ObjectReference = objectReference ?? throw new ArgumentNullException(nameof(objectReference)); Property = property ?? throw new ArgumentNullException(nameof(property)); @@ -23,6 +23,6 @@ public SetRequest(ObjectReference objectReference, string property, object value public string Property { get; } [JsonProperty("value")] - public object Value { get; } + public object? Value { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/StaticInvokeRequest.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/StaticInvokeRequest.cs index fb939a6c11..8a5785d6b6 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/StaticInvokeRequest.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/StaticInvokeRequest.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Api.Request [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class StaticInvokeRequest : IKernelRequest { - public StaticInvokeRequest(string fullyQualifiedName, string method, object[] arguments = null) + public StaticInvokeRequest(string fullyQualifiedName, string method, object?[]? arguments = null) { FullyQualifiedName = fullyQualifiedName ?? throw new ArgumentNullException(nameof(fullyQualifiedName)); Method = method ?? throw new ArgumentNullException(nameof(method)); @@ -23,6 +23,6 @@ public StaticInvokeRequest(string fullyQualifiedName, string method, object[] ar public string Method { get; } [JsonProperty("args", NullValueHandling = NullValueHandling.Ignore)] - public object[] Arguments { get; } + public object?[]? Arguments { get; } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/StaticSetRequest.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/StaticSetRequest.cs index 51b0991cb8..3291c4f8f6 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/StaticSetRequest.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Request/StaticSetRequest.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Api.Request [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class StaticSetRequest : IKernelRequest { - public StaticSetRequest(string fullyQualifiedName, string property, object value) + public StaticSetRequest(string fullyQualifiedName, string property, object? value) { FullyQualifiedName = fullyQualifiedName ?? throw new ArgumentNullException(nameof(fullyQualifiedName)); Property = property ?? throw new ArgumentNullException(nameof(property)); @@ -23,6 +23,6 @@ public StaticSetRequest(string fullyQualifiedName, string property, object value public string Property { get; } [JsonProperty("value")] - public object Value { get; } + public object? Value { get; } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/ErrorResponse.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/ErrorResponse.cs index f7d56dd32e..c2369d8cb7 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/ErrorResponse.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/ErrorResponse.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Api.Response [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class ErrorResponse { - public ErrorResponse(string error, string stack = null) + public ErrorResponse(string error, string? stack = null) { Error = error ?? throw new ArgumentNullException(nameof(error)); Stack = stack; @@ -16,6 +16,6 @@ public ErrorResponse(string error, string stack = null) public string Error { get; } [JsonProperty("stack", NullValueHandling = NullValueHandling.Ignore)] - public string Stack { get; } + public string? Stack { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/GetResponse.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/GetResponse.cs index e0335e4b7f..e40f1ccc9d 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/GetResponse.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/GetResponse.cs @@ -5,12 +5,12 @@ namespace Amazon.JSII.JsonModel.Api.Response [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class GetResponse : IKernelResponse { - public GetResponse(object value) + public GetResponse(object? value) { Value = value; } [JsonProperty("value")] - public object Value { get; } + public object? Value { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/InvokeResponse.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/InvokeResponse.cs index acd3f9dae0..1661d80f74 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/InvokeResponse.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/InvokeResponse.cs @@ -5,12 +5,12 @@ namespace Amazon.JSII.JsonModel.Api.Response [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class InvokeResponse : IKernelResponse { - public InvokeResponse(object result = null) + public InvokeResponse(object? result = null) { Result = result; } [JsonProperty("result", NullValueHandling = NullValueHandling.Ignore)] - public object Result { get; } + public object? Result { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/NamingResponse.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/NamingResponse.cs index 339abc627d..144f4ddccd 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/NamingResponse.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Api/Response/NamingResponse.cs @@ -18,7 +18,7 @@ public NamingResponse(NamingData naming) [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class NamingData { - public NamingData(DotNetNaming dotnet, IDictionary others = null) + public NamingData(DotNetNaming dotnet, IDictionary? others = null) { DotNet = dotnet ?? throw new ArgumentNullException(nameof(dotnet)); } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/TypeConverter.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/TypeConverter.cs index 4a77f4ee16..26e8f778b9 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/TypeConverter.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/TypeConverter.cs @@ -20,12 +20,12 @@ public override bool CanConvert(System.Type objectType) return objectType.IsAssignableFrom(typeof(EnumType)) || objectType.IsAssignableFrom(typeof(ClassType)); } - public override object ReadJson(JsonReader reader, System.Type objectType, object existingValue, JsonSerializer serializer) + public override object? ReadJson(JsonReader reader, System.Type objectType, object? existingValue, JsonSerializer serializer) { throw new NotImplementedException(); } - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { Spec.Type type = value as Spec.Type ?? throw new ArgumentException($"{value} is not a jsii Type", nameof(value)); diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/TypeDictionaryConverter.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/TypeDictionaryConverter.cs index 31bcaa5128..9176b8250f 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/TypeDictionaryConverter.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/TypeDictionaryConverter.cs @@ -16,14 +16,14 @@ public override bool CanConvert(Type objectType) throw new NotImplementedException(); } - public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) + public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer) { var untypedDictionary = JObject.Load(reader); return untypedDictionary.Properties().ToDictionary(p => p.Name, p => Util.ConvertToDerivedType(p.Value)); } - public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer) + public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) { throw new NotImplementedException(); } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/Util.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/Util.cs index f86074efbe..e67d47d375 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/Util.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Converters/Util.cs @@ -21,9 +21,9 @@ internal static Spec.Type ConvertToDerivedType(JToken token) return kind switch { - TypeKind.Enum => (Spec.Type) token.ToObject(), - TypeKind.Class => token.ToObject(), - TypeKind.Interface => token.ToObject(), + TypeKind.Enum => (Spec.Type) token.ToObject()!, + TypeKind.Class => token.ToObject()!, + TypeKind.Interface => token.ToObject()!, _ => throw new ArgumentException($"Unknown kind {kind} on type {token.ToString(Formatting.Indented)}", nameof(token)) }; } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/JsonDictionaryBase.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/JsonDictionaryBase.cs index 9cf7e0ccf4..9a1a7c2d40 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/JsonDictionaryBase.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/JsonDictionaryBase.cs @@ -4,6 +4,7 @@ namespace Amazon.JSII.JsonModel { public abstract class JsonDictionaryBase : IDictionary + where TKey : notnull { private readonly IDictionary _members = new Dictionary(); diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Assembly.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Assembly.cs index bcb6bc7fa8..04651edfb9 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Assembly.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Assembly.cs @@ -34,13 +34,13 @@ public Assembly string fingerprint, string version, string license, - AssemblyTargets targets = null, - IDictionary dependencies = null, - Person[] contributors = null, - IDictionary bundled = null, - IDictionary types = null, - Docs docs = null, - Readme readme = null + AssemblyTargets? targets = null, + IDictionary? dependencies = null, + Person[]? contributors = null, + IDictionary? bundled = null, + IDictionary? types = null, + Docs? docs = null, + Readme? readme = null ): base(targets, dependencies) { Name = name ?? throw new ArgumentNullException(nameof(name)); @@ -86,19 +86,19 @@ public Assembly public string License { get; } [JsonProperty("contributors", NullValueHandling = NullValueHandling.Ignore)] - public Person[] Contributors { get; } + public Person[]? Contributors { get; } [JsonProperty("bundled", NullValueHandling = NullValueHandling.Ignore)] - public IDictionary Bundled { get; } + public IDictionary? Bundled { get; } [JsonProperty("types", ItemConverterType = typeof(TypeConverter))] [JsonConverter(typeof(TypeDictionaryConverter))] - public IDictionary Types { get; } + public IDictionary? Types { get; } [JsonProperty("docs", NullValueHandling = NullValueHandling.Ignore)] - public Docs Docs { get; } + public Docs? Docs { get; } [JsonProperty("readme", NullValueHandling = NullValueHandling.Ignore)] - public Readme Readme { get; } + public Readme? Readme { get; } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/AssemblyTargets.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/AssemblyTargets.cs index 9e9ad114f0..6d35fcf1d2 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/AssemblyTargets.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/AssemblyTargets.cs @@ -7,7 +7,7 @@ namespace Amazon.JSII.JsonModel.Spec [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class AssemblyTargets { - public AssemblyTargets(DotNetTarget dotnet, IDictionary others = null) + public AssemblyTargets(DotNetTarget dotnet, IDictionary? others = null) { DotNet = dotnet ?? throw new ArgumentNullException(nameof(dotnet)); } @@ -22,11 +22,11 @@ public DotNetTarget ( string @namespace, string packageId, - string title = null, + string? title = null, bool signAssembly = false, - string assemblyOriginatorKeyFile = null, - string iconUrl = null, - string versionSuffix = null + string? assemblyOriginatorKeyFile = null, + string? iconUrl = null, + string? versionSuffix = null ) { Namespace = @namespace ?? throw new ArgumentNullException(nameof(@namespace)); @@ -51,19 +51,19 @@ public DotNetTarget public string PackageId { get; } [JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)] - public string Title { get; } + public string? Title { get; } [JsonProperty("signAssembly", NullValueHandling = NullValueHandling.Ignore)] public bool SignAssembly { get; } [JsonProperty("assemblyOriginatorKeyFile", NullValueHandling = NullValueHandling.Ignore)] - public string AssemblyOriginatorKeyFile { get; } + public string? AssemblyOriginatorKeyFile { get; } [JsonProperty("iconUrl", NullValueHandling = NullValueHandling.Ignore)] - public string IconUrl { get; } + public string? IconUrl { get; } [JsonProperty("versionSuffix", NullValueHandling = NullValueHandling.Ignore)] - public string VersionSuffix { get; } + public string? VersionSuffix { get; } } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Callable.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Callable.cs index be517a161c..1a0b66a8db 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Callable.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Callable.cs @@ -7,11 +7,11 @@ public abstract class Callable : IDocumentable, IOverridable { protected Callable ( - Parameter[] parameters = null, + Parameter[]? parameters = null, bool isProtected = false, bool isVariadic = false, - string overrides = null, - Docs docs = null + string? overrides = null, + Docs? docs = null ) { Parameters = parameters; @@ -22,7 +22,7 @@ protected Callable } [JsonProperty("parameters", NullValueHandling = NullValueHandling.Ignore)] - public Parameter[] Parameters { get; } + public Parameter[]? Parameters { get; } [JsonProperty("protected", NullValueHandling = NullValueHandling.Ignore)] public bool IsProtected { get; } @@ -31,9 +31,9 @@ protected Callable public bool IsVariadic { get; } [JsonProperty("docs", NullValueHandling = NullValueHandling.Ignore)] - public Docs Docs { get; } + public Docs? Docs { get; } [JsonProperty("overrides", NullValueHandling = NullValueHandling.Ignore)] - public string Overrides { get; } + public string? Overrides { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/ClassType.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/ClassType.cs index 3c9cd6a717..83e0679ad4 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/ClassType.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/ClassType.cs @@ -15,16 +15,16 @@ public ClassType // ClassType properties bool isAbstract = false, - string @namespace = null, + string? @namespace = null, // Type properties - Docs docs = null, + Docs? docs = null, // ClassType properties - string @base = null, - Initializer initializer = null, - Property[] properties = null, - Method[] methods = null, - string[] interfaces = null + string? @base = null, + Initializer? initializer = null, + Property[]? properties = null, + Method[]? methods = null, + string[]? interfaces = null ) : base ( @@ -49,18 +49,18 @@ public ClassType public bool IsAbstract { get; } [JsonProperty("base", NullValueHandling = NullValueHandling.Ignore)] - public string Base { get; } + public string? Base { get; } [JsonProperty("initializer", NullValueHandling = NullValueHandling.Ignore)] - public Initializer Initializer { get; } + public Initializer? Initializer { get; } [JsonProperty("properties", NullValueHandling = NullValueHandling.Ignore)] - public Property[] Properties { get; } + public Property[]? Properties { get; } [JsonProperty("methods", NullValueHandling = NullValueHandling.Ignore)] - public Method[] Methods { get; } + public Method[]? Methods { get; } [JsonProperty("interfaces", NullValueHandling = NullValueHandling.Ignore)] - public string[] Interfaces { get; } + public string[]? Interfaces { get; } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/DependencyRoot.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/DependencyRoot.cs index db5e4927c7..27d0ffc313 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/DependencyRoot.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/DependencyRoot.cs @@ -7,8 +7,8 @@ public abstract class DependencyRoot { public DependencyRoot ( - AssemblyTargets targets = null, - IDictionary dependencies = null + AssemblyTargets? targets = null, + IDictionary? dependencies = null ) { Targets = targets; @@ -16,9 +16,9 @@ public DependencyRoot } [JsonProperty("dependencies", NullValueHandling = NullValueHandling.Ignore)] - public IDictionary Dependencies { get; } + public IDictionary? Dependencies { get; } [JsonProperty("targets")] - public AssemblyTargets Targets { get; } + public AssemblyTargets? Targets { get; } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Docs.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Docs.cs index 1d020f8bdd..60a71aeaa5 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Docs.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Docs.cs @@ -8,16 +8,16 @@ public class Docs { public Docs ( - string summary = null, - string remarks = null, - string deprecated = null, - string returns = null, + string? summary = null, + string? remarks = null, + string? deprecated = null, + string? returns = null, Stability? stability = null, - string example = null, - string see = null, + string? example = null, + string? see = null, bool? subclassable = null, - string @default = null, - IDictionary custom = null + string? @default = null, + IDictionary? custom = null ) { Summary = summary; @@ -33,31 +33,31 @@ public Docs } [JsonProperty("summary", NullValueHandling = NullValueHandling.Ignore)] - public string Summary { get; } + public string? Summary { get; } [JsonProperty("remarks", NullValueHandling = NullValueHandling.Ignore)] - public string Remarks { get; } + public string? Remarks { get; } [JsonProperty("deprecated", NullValueHandling = NullValueHandling.Ignore)] - public string Deprecated { get; } + public string? Deprecated { get; } [JsonProperty("returns", NullValueHandling = NullValueHandling.Ignore)] - public string Returns { get; } + public string? Returns { get; } [JsonProperty("stability", NullValueHandling = NullValueHandling.Ignore)] public Stability? Stability { get; } [JsonProperty("example", NullValueHandling = NullValueHandling.Ignore)] - public string Example { get; } + public string? Example { get; } [JsonProperty("see", NullValueHandling = NullValueHandling.Ignore)] - public string See { get; } + public string? See { get; } [JsonProperty("subclassable", NullValueHandling = NullValueHandling.Ignore)] public bool? Subclassable { get; } [JsonProperty("default", NullValueHandling = NullValueHandling.Ignore)] - public string Default { get; } + public string? Default { get; } [JsonProperty("custom", NullValueHandling = NullValueHandling.Ignore)] public IDictionary Custom; diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/EnumMember.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/EnumMember.cs index b134d90483..aa446af3c2 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/EnumMember.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/EnumMember.cs @@ -6,7 +6,7 @@ namespace Amazon.JSII.JsonModel.Spec [JsonObject(MemberSerialization = MemberSerialization.OptIn)] public class EnumMember : IDocumentable { - public EnumMember(string name, Docs docs = null) + public EnumMember(string name, Docs? docs = null) { Name = name ?? throw new ArgumentNullException(nameof(name)); Docs = docs; @@ -16,6 +16,6 @@ public EnumMember(string name, Docs docs = null) public string Name { get; } [JsonProperty("docs", NullValueHandling = NullValueHandling.Ignore)] - public Docs Docs { get; } + public Docs? Docs { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/EnumType.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/EnumType.cs index 43798245bd..5bfa924c1e 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/EnumType.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/EnumType.cs @@ -16,9 +16,9 @@ public EnumType // EnumType properties EnumMember[] members, - string @namespace = null, + string? @namespace = null, // Type properties - Docs docs = null + Docs? docs = null ) : base ( diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/IDocumentable.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/IDocumentable.cs index 81099ab756..bf1e39e22f 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/IDocumentable.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/IDocumentable.cs @@ -2,6 +2,6 @@ { public interface IDocumentable { - Docs Docs { get; } + Docs? Docs { get; } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/IOverridable.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/IOverridable.cs index 448104d875..aedf6eee1a 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/IOverridable.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/IOverridable.cs @@ -2,6 +2,6 @@ { public interface IOverridable { - string Overrides { get; } + string? Overrides { get; } } } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Initializer.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Initializer.cs index f537f631de..ffd001f4b6 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Initializer.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Initializer.cs @@ -7,11 +7,11 @@ public class Initializer : Callable { public Initializer ( - Parameter[] parameters = null, + Parameter[]? parameters = null, bool isProtected = false, bool isVariadic = false, - string overrides = null, - Docs docs = null + string? overrides = null, + Docs? docs = null ): base( parameters: parameters, isProtected: isProtected, diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/InterfaceType.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/InterfaceType.cs index 41e10338a9..05a6467316 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/InterfaceType.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/InterfaceType.cs @@ -11,15 +11,15 @@ public InterfaceType string fullyQualifiedName, string assembly, string name, - string @namespace = null, + string? @namespace = null, // Type properties - Docs docs = null, + Docs? docs = null, // InterfaceType properties - string[] interfaces = null, - Method[] methods = null, - Property[] properties = null, + string[]? interfaces = null, + Method[]? methods = null, + Property[]? properties = null, bool isDataType = false ) : base ( @@ -38,13 +38,13 @@ public InterfaceType } [JsonProperty("interfaces", NullValueHandling = NullValueHandling.Ignore)] - public string[] Interfaces { get; } + public string[]? Interfaces { get; } [JsonProperty("methods", NullValueHandling = NullValueHandling.Ignore)] - public Method[] Methods { get; } + public Method[]? Methods { get; } [JsonProperty("properties", NullValueHandling = NullValueHandling.Ignore)] - public Property[] Properties { get; } + public Property[]? Properties { get; } [JsonProperty("datatype", NullValueHandling = NullValueHandling.Ignore)] public bool IsDataType { get; } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Method.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Method.cs index b2f5f039c9..e83f0638ae 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Method.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Method.cs @@ -8,15 +8,15 @@ public class Method : Callable public Method ( string name, - OptionalValue returns = null, - Parameter[] parameters = null, + OptionalValue? returns = null, + Parameter[]? parameters = null, bool isAbstract = false, bool isAsync = false, bool isProtected = false, bool isVariadic = false, bool isStatic = false, - string overrides = null, - Docs docs = null + string? overrides = null, + Docs? docs = null ): base ( parameters: parameters, @@ -37,7 +37,7 @@ public Method public string Name { get; } [JsonProperty("returns", NullValueHandling = NullValueHandling.Ignore)] - public OptionalValue Returns { get; } + public OptionalValue? Returns { get; } [JsonProperty("abstract", NullValueHandling = NullValueHandling.Ignore)] public bool IsAbstract { get; } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/PackageVersion.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/PackageVersion.cs index 7ffec179ef..1754907357 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/PackageVersion.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/PackageVersion.cs @@ -10,8 +10,8 @@ public class PackageVersion: DependencyRoot public PackageVersion ( string version, - AssemblyTargets targets = null, - IDictionary dependencies = null + AssemblyTargets? targets = null, + IDictionary? dependencies = null ): base(targets, dependencies) { Version = version ?? throw new ArgumentNullException(nameof(version)); diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Parameter.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Parameter.cs index 132dd5e925..d05c81280f 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Parameter.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Parameter.cs @@ -12,7 +12,7 @@ public Parameter TypeReference type, bool isOptional = false, bool isVariadic = false, - Docs docs = null + Docs? docs = null ): base(type: type, isOptional: isOptional) { Name = name ?? throw new ArgumentNullException(nameof(name)); @@ -27,6 +27,6 @@ public Parameter public bool IsVariadic { get; } [JsonProperty("docs", NullValueHandling = NullValueHandling.Ignore)] - public Docs Docs { get; } + public Docs? Docs { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Person.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Person.cs index d4dbaea00e..a710f4c677 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Person.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Person.cs @@ -10,8 +10,8 @@ public Person ( string name, string[] roles, - string email = null, - string url = null, + string? email = null, + string? url = null, bool isOrganization = false ) { @@ -29,10 +29,10 @@ public Person public string[] Roles { get; } [JsonProperty("email", NullValueHandling = NullValueHandling.Ignore)] - public string Email { get; } + public string? Email { get; } [JsonProperty("url", NullValueHandling = NullValueHandling.Ignore)] - public string Url { get; } + public string? Url { get; } [JsonProperty("organization", NullValueHandling = NullValueHandling.Ignore)] public bool IsOrganization { get; } diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Property.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Property.cs index 0bd08fc087..73df010e2c 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Property.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Property.cs @@ -16,8 +16,8 @@ public Property bool isAbstract = false, bool isStatic = false, bool isConstant = false, - string overrides = null, - Docs docs = null + string? overrides = null, + Docs? docs = null ): base(type: type, isOptional: isOptional) { Name = name ?? throw new ArgumentNullException(nameof(name)); @@ -49,9 +49,9 @@ public Property public bool IsStatic { get; } [JsonProperty("overrides", NullValueHandling = NullValueHandling.Ignore)] - public string Overrides { get; } + public string? Overrides { get; } [JsonProperty("docs", NullValueHandling = NullValueHandling.Ignore)] - public Docs Docs { get; } + public Docs? Docs { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Type.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Type.cs index e4fcd2797f..3e5b1a1d86 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Type.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/Type.cs @@ -11,9 +11,9 @@ protected Type string fullyQualifiedName, string assembly, string name, - string @namespace, + string? @namespace, TypeKind kind, - Docs docs = null + Docs? docs = null ) { FullyQualifiedName = fullyQualifiedName ?? throw new ArgumentNullException(nameof(fullyQualifiedName)); @@ -34,13 +34,13 @@ protected Type public string Name { get; } [JsonProperty("namespace", NullValueHandling = NullValueHandling.Ignore)] - public string Namespace { get; } + public string? Namespace { get; } [JsonProperty("kind", DefaultValueHandling = DefaultValueHandling.Include)] public TypeKind Kind { get; } [JsonProperty("docs", NullValueHandling = NullValueHandling.Ignore)] - public Docs Docs { get; } + public Docs? Docs { get; } [JsonIgnore] public string QualifiedNamespace => this.Assembly + (this.Namespace != null ? $".{this.Namespace}" : ""); diff --git a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/TypeReference.cs b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/TypeReference.cs index 1e27ec877c..04da801a14 100644 --- a/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/TypeReference.cs +++ b/packages/@jsii/dotnet-jsonmodel/src/Amazon.JSII.JsonModel/Spec/TypeReference.cs @@ -7,10 +7,10 @@ public class TypeReference { public TypeReference ( - string fullyQualifiedName = null, + string? fullyQualifiedName = null, PrimitiveType? primitive = null, - CollectionTypeReference collection = null, - UnionTypeReference union = null + CollectionTypeReference? collection = null, + UnionTypeReference? union = null ) { FullyQualifiedName = fullyQualifiedName; @@ -20,15 +20,15 @@ public TypeReference } [JsonProperty("fqn", NullValueHandling = NullValueHandling.Ignore)] - public string FullyQualifiedName { get; } + public string? FullyQualifiedName { get; } [JsonProperty("primitive", NullValueHandling = NullValueHandling.Ignore)] public PrimitiveType? Primitive { get; } [JsonProperty("collection", NullValueHandling = NullValueHandling.Ignore)] - public CollectionTypeReference Collection { get; } + public CollectionTypeReference? Collection { get; } [JsonProperty("union", NullValueHandling = NullValueHandling.Ignore)] - public UnionTypeReference Union { get; } + public UnionTypeReference? Union { get; } } } \ No newline at end of file diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj index 294666587f..3bfefa0e37 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/Amazon.JSII.Runtime.IntegrationTests.csproj @@ -4,6 +4,9 @@ netcoreapp3.1 false + + enable + true diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs index 1109d2f3b5..49d8f1fbc2 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs @@ -61,7 +61,7 @@ public void PrimitiveTypes() // json types.JsonProperty = JObject.Parse(@"{ ""Foo"": { ""Bar"": 123 } }"); - Assert.Equal(123d, types.JsonProperty["Foo"]["Bar"].Value()); + Assert.Equal(123d, types.JsonProperty["Foo"]?["Bar"]?.Value()); } [Fact(DisplayName = Prefix + nameof(Dates))] @@ -508,7 +508,7 @@ public override string TheProperty class InterfaceWithProperties : DeputyBase, IInterfaceWithProperties { - string _x; + string? _x; public string ReadOnlyString => "READ_ONLY_STRING"; @@ -863,7 +863,9 @@ public void NullShouldBeTreatedAsUndefined() obj.GiveMeUndefinedInsideAnObject(new NullShouldBeTreatedAsUndefinedData { ThisShouldBeUndefined = null, +#pragma warning disable CS8625 ArrayWithThreeElementsAndUndefinedAsSecondArgument = new object[] {"hello", null, "world"} +#pragma warning restore CS8625 }); // property @@ -888,7 +890,9 @@ public void OptionalAndVariadicArgumentsTest() var variadicClassNoParams = new VariadicMethod(); // Array with null value in constructor params +#pragma warning disable CS8625 new VariadicMethod(null); +#pragma warning restore CS8625 // Array with one value in constructor params new VariadicMethod(1); @@ -897,7 +901,9 @@ public void OptionalAndVariadicArgumentsTest() new VariadicMethod(1, 2, 3, 4); // Variadic parameter with null passed +#pragma warning disable CS8625 variadicClassNoParams.AsArray(double.MinValue, null); +#pragma warning restore CS8625 // Variadic parameter with default value used variadicClassNoParams.AsArray(double.MinValue); @@ -1044,7 +1050,9 @@ private sealed class OverrideVariadicMethod : VariadicMethod { public override double[] AsArray(double first, params double[] others) { +#pragma warning disable CS8604 return base.AsArray(first + 1, others?.Select(n => n + 1).ToArray()); +#pragma warning restore CS8604 } } @@ -1216,7 +1224,7 @@ public override string TheProperty set => AnotherTheProperty = value; } - public string AnotherTheProperty { get; set; } + public string? AnotherTheProperty { get; set; } } class PureNativeFriendlyRandom : DeputyBase, IFriendlyRandomGenerator @@ -1289,7 +1297,7 @@ public void CanUseInterfaceSetters() [Fact(DisplayName = Prefix + nameof(StructsAreUndecoratedOntheWayToKernel))] public void StructsAreUndecoratedOntheWayToKernel() { - var json = JsonFormatter.Stringify(new StructB {RequiredString = "Bazinga!", OptionalBoolean = false}); + var json = JsonFormatter.Stringify(new StructB {RequiredString = "Bazinga!", OptionalBoolean = false})!; var actual = JObject.Parse(json); var expected = new JObject(); @@ -1408,7 +1416,7 @@ public void AbstractMembersAreCorrectlyHandled() private sealed class AbstractSuiteImpl : AbstractSuite { - private string _property; + private string _property = ""; public AbstractSuiteImpl() {} diff --git a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/XUnitLogger.cs b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/XUnitLogger.cs index 2bd4f58b17..dcaf12b831 100644 --- a/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/XUnitLogger.cs +++ b/packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/XUnitLogger.cs @@ -40,7 +40,7 @@ public XUnitLogger(ITestOutputHelper output, string categoryName) public void Log(LogLevel logLevel, EventId eventId, TState state, Exception exception, Func formatter) { - _output.WriteLine($"[{_categoryName}] {state.ToString()}"); + _output.WriteLine($"[{_categoryName}] {state?.ToString()}"); } public IDisposable BeginScope(TState state) diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj index 2763dc88b9..288902e78b 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Amazon.JSII.Runtime.UnitTests.csproj @@ -6,6 +6,9 @@ false Amazon.JSII.Runtime.UnitTests + + enable + true diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/FrameworkToJsiiConverterTests.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/FrameworkToJsiiConverterTests.cs index 10848683df..7301164fe5 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/FrameworkToJsiiConverterTests.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/FrameworkToJsiiConverterTests.cs @@ -39,8 +39,8 @@ protected TestBase() IServiceProvider serviceProvider = serviceCollection.BuildServiceProvider(); ServiceContainer.ServiceProviderOverride = serviceProvider; - _typeCache.GetClassType("myClassFqn").Returns(typeof(TestClass)); - _typeCache.GetEnumType("myEnumFqn").Returns(typeof(TestEnum)); + _typeCache.TryGetClassType("myClassFqn").Returns(typeof(TestClass)); + _typeCache.TryGetEnumType("myEnumFqn").Returns(typeof(TestEnum)); } } @@ -51,7 +51,7 @@ public sealed class Void : TestBase [Fact(DisplayName = _Prefix + nameof(DoesNotConvert))] public void DoesNotConvert() { - bool success = _converter.TryConvert(null, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(null, _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -60,7 +60,7 @@ public void DoesNotConvert() [Fact(DisplayName = _Prefix + nameof(ThrowsIfValueIsNotNull))] public void ThrowsIfValueIsNotNull() { - Assert.Throws("value", () => _converter.TryConvert(null, _referenceMap, "", out object actual)); + Assert.Throws("value", () => _converter.TryConvert(null, _referenceMap, "", out object? actual)); } } @@ -103,7 +103,7 @@ public void ConvertsPrimitiveValues(PrimitiveType primitive, object value, objec { var instance = new OptionalValue(new TypeReference(primitive: primitive), isOptional: isOptional); - bool success = _converter.TryConvert(instance, _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, value, out object? actual); Assert.True(success); Assert.Equal(expected, actual); @@ -115,7 +115,7 @@ public void ConvertsDateValues() var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Date)); DateTime now = DateTime.Now; - bool success = _converter.TryConvert(instance, _referenceMap, now, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, now, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -139,7 +139,7 @@ public void ConvertsOptionalDateValues() var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Date), isOptional: true); DateTime now = DateTime.Now; - bool success = _converter.TryConvert(instance, _referenceMap, now, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, now, out object? actual); Assert.True(success); Assert.IsType(actual); var expected = new JObject @@ -172,7 +172,7 @@ public void ConvertsJsonValues() )) ); - bool success = _converter.TryConvert(instance, _referenceMap, jObject, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, jObject, out object? actual); Assert.True(success); Assert.Same(jObject, actual); @@ -183,7 +183,7 @@ public void FailsOnNullBoolean() { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Boolean)); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.False(success); } @@ -193,7 +193,7 @@ public void FailsOnNullNumber() { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Number)); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.False(success); } @@ -203,7 +203,7 @@ public void ConvertsNullJson() { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Json)); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -222,7 +222,7 @@ public void ConvertsClassReference() ByRefValue byRef = new ByRefValue("myClassFqn", "0001"); TestClass myClass = new TestClass(byRef); - bool success = _converter.TryConvert(instance, _referenceMap, myClass, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, myClass, out object? actual); Assert.True(success); Assert.Equal(JObject.FromObject(byRef), actual); @@ -236,7 +236,7 @@ public void ConvertsEnumValue() TestEnum myEnum = TestEnum.MyMember2; - bool success = _converter.TryConvert(instance, _referenceMap, myEnum, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, myEnum, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -252,7 +252,7 @@ public void ConvertsNullClassReference() { var instance = new OptionalValue(new TypeReference("myClassFqn")); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -263,7 +263,7 @@ public void DoesNotConvertNullNonOptionalEnumValue() { var instance = new OptionalValue(new TypeReference("myEnumFqn")); - bool success =_converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success =_converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.False(success); Assert.Null(actual); @@ -274,7 +274,7 @@ public void ConvertsNullOptionalEnumValue() { var instance = new OptionalValue(new TypeReference("myEnumFqn"), isOptional: true); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -300,7 +300,7 @@ public void ConvertsMap() { "myKey2", "myValue2" } }; - bool success = _converter.TryConvert(instance, _referenceMap, frameworkMap, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, frameworkMap, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -335,7 +335,7 @@ public void RecursivelyConvertsMapElements() { "myKey2", new Dictionary { { "mySubKey2", "myValue2" } } }, }; - bool success = _converter.TryConvert(instance, _referenceMap, frameworkMap, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, frameworkMap, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -365,13 +365,13 @@ public void ConvertsArray() "myValue2", }; - bool success = _converter.TryConvert(instance, _referenceMap, frameworkArray, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, frameworkArray, out object? actual); Assert.True(success); Assert.IsType(actual); Assert.Collection ( - (JArray)actual, + (JArray)actual!, value => Assert.Equal("myValue1", value), value => Assert.Equal("myValue2", value) ); @@ -398,12 +398,12 @@ public void RecursivelyConvertsArrayElements() new [] { "myValue2" }, }; - bool success = _converter.TryConvert(instance, _referenceMap, frameworkArray, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, frameworkArray, out object? actual); Assert.True(success); Assert.IsType(actual); Assert.Collection( - (JArray)actual, + (JArray)actual!, value => { Assert.IsType(value); @@ -445,7 +445,7 @@ public void RecursivelyConvertsMapElementsWithMapOfAny() // This will test the call to FrameworkToJsiiConverter.TryConvertCollectionElement() // In the case of a of a Map of Map of Any - bool success = _converter.TryConvert(instance, _referenceMap, frameworkMap, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, frameworkMap, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -492,7 +492,7 @@ public void RecursivelyConvertsMapElementsWithArrayOfAny() // This will test the call to FrameworkToJsiiConverter.TryConvertCollectionElement() // In the case of a of a Map of Array of Any - bool success = _converter.TryConvert(instance, _referenceMap, frameworkArray, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, frameworkArray, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -518,7 +518,7 @@ public void ConvertsNullMap() ) )); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -534,7 +534,7 @@ public void ConvertsNullArray() ) )); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -555,7 +555,7 @@ public void FailsIfNoTypeMatches() }) )); - bool success = _converter.TryConvert(instance, _referenceMap, true, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, true, out object? actual); Assert.False(success); Assert.Null(actual); @@ -570,7 +570,7 @@ public void ConvertsSimpleUnion() }) )); - bool success = _converter.TryConvert(instance, _referenceMap, "abc", out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, "abc", out object? actual); Assert.True(success); Assert.IsType(actual); @@ -587,7 +587,7 @@ public void ConvertsAsFirstMatchingType() }) )); - bool success = _converter.TryConvert(instance, _referenceMap, (ushort)7, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, (ushort)7, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -603,7 +603,7 @@ public void ConvertsNull() }) )); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -619,7 +619,7 @@ public void ConvertsNull() { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); - bool success = _converter.TryConvert(instance, _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -633,7 +633,7 @@ public void ConvertsPrimitive(object value, object expected) { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); - bool success = _converter.TryConvert(instance, _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, value, out object? actual); Assert.True(success); Assert.Equal(expected, actual); @@ -645,7 +645,7 @@ public void ConvertsDate() var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); DateTime now = DateTime.Now; - bool success = _converter.TryConvert(instance, _referenceMap, now, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, now, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -663,7 +663,7 @@ public void ConvertsJson() var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); JObject value = new JObject(new JProperty("myKey", "myValue")); - bool success = _converter.TryConvert(instance, _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, value, out object? actual); Assert.True(success); Assert.Same(value, actual); @@ -678,11 +678,11 @@ public void ConvertsMap() { { "myKey", "myValue" } }; - bool success = _converter.TryConvert(instance, _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, value, out object? actual); Assert.True(success); Assert.IsType(actual); - Assert.Collection((IEnumerable>)actual, + Assert.Collection((IEnumerable>)actual!, kvp => { Assert.IsType(kvp.Value); @@ -704,11 +704,11 @@ public void ConvertsArray() var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); string[] value = new[] { "myValue" }; - bool success = _converter.TryConvert(instance, _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, _referenceMap, value, out object? actual); Assert.True(success); Assert.IsType(actual); - Assert.Collection((IEnumerable)actual, + Assert.Collection((IEnumerable)actual!, element => Assert.Equal("myValue", element.Value(), ignoreLineEndingDifferences: true) ); } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/JsiiToFrameworkConverterTests.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/JsiiToFrameworkConverterTests.cs index b12ce2b979..01447eae8d 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/JsiiToFrameworkConverterTests.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.UnitTests/Deputy/Converters/JsiiToFrameworkConverterTests.cs @@ -49,7 +49,7 @@ public sealed class Void : TestBase [Fact(DisplayName = _Prefix + nameof(DoesNotConvert))] public void DoesNotConvert() { - bool success = _converter.TryConvert(null, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(null, typeof(object), _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -58,7 +58,7 @@ public void DoesNotConvert() [Fact(DisplayName = _Prefix + nameof(ThrowsIfValueIsNotNull))] public void ThrowsIfValueIsNotNull() { - Assert.Throws("value", () => _converter.TryConvert(null, typeof(object), _referenceMap, "", out object actual)); + Assert.Throws("value", () => _converter.TryConvert(null, typeof(object), _referenceMap, "", out object? actual)); } } @@ -101,7 +101,7 @@ public void ConvertsPrimitiveValues(PrimitiveType primitive, object value, objec { var instance = new OptionalValue(new TypeReference(primitive: primitive), isOptional: isOptional); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.Equal(expected, actual); @@ -120,7 +120,7 @@ public void ConvertsDateValues() DateTime now = DateTime.Now; JObject value = new JObject(new JProperty("$jsii.date", now)); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.Equal(now, actual); @@ -137,7 +137,7 @@ public void ConvertsOptionalDateValues() DateTime now = DateTime.Now; JObject value = new JObject(new JProperty("$jsii.date", now)); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.Equal(now, actual); @@ -165,7 +165,7 @@ public void ConvertsJsonValues() )) ); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, jObject, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, jObject, out object? actual); Assert.True(success); Assert.Same(jObject, actual); @@ -176,7 +176,7 @@ public void FailsOnNullBoolean() { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Boolean)); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.False(success); } @@ -186,7 +186,7 @@ public void FailsOnNullNumber() { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Number)); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.False(success); } @@ -196,7 +196,7 @@ public void ConvertsNullJson() { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Json)); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -209,7 +209,10 @@ public sealed class FullyQualifiedName : TestBase public FullyQualifiedName() { + _typeCache.TryGetClassType("myClassFqn").Returns(typeof(TestClass)); _typeCache.GetClassType("myClassFqn").Returns(typeof(TestClass)); + + _typeCache.TryGetEnumType("myEnumFqn").Returns(typeof(TestEnum)); _typeCache.GetEnumType("myEnumFqn").Returns(typeof(TestEnum)); } @@ -224,7 +227,7 @@ public void ConvertsClassReference() .GetOrCreateNativeReference(Arg.Is(v => v.Value == "myClassFqn@0001")) .Returns(testClass); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, byRef, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, byRef, out object? actual); Assert.True(success); Assert.Same(actual, testClass); @@ -238,7 +241,7 @@ public void ConvertsEnumValue() var instance = new OptionalValue(new TypeReference("myEnumFqn")); JObject enumValue = new JObject(new JProperty("$jsii.enum", "myEnumFqn/MyMember1")); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, enumValue, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, enumValue, out object? actual); Assert.True(success); Assert.Equal(TestEnum.MyMember1, actual); @@ -249,7 +252,7 @@ public void ConvertsNullClassReference() { var instance = new OptionalValue(new TypeReference("myClassFqn")); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -260,7 +263,7 @@ public void DoesNotConvertNullNonOptionalEnumValue() { var instance = new OptionalValue(new TypeReference("myEnumFqn")); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.False(success); Assert.Null(actual); @@ -271,7 +274,7 @@ public void ConvertsNullOptionalEnumValue() { var instance = new OptionalValue(new TypeReference("myEnumFqn"), isOptional: true); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -313,11 +316,11 @@ public void ConvertsMap() new JProperty("myKey2", "myValue2") ); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.IsAssignableFrom>(actual); - Assert.Collection((IDictionary)actual, + Assert.Collection((IDictionary)actual!, kvp => { Assert.Equal("myKey1", kvp.Key, ignoreLineEndingDifferences: true); @@ -353,11 +356,11 @@ public void RecursivelyConvertsMapElements() )) ); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.IsAssignableFrom>>(actual); - Assert.Collection((IDictionary>)actual, + Assert.Collection((IDictionary>)actual!, kvp => { Assert.Equal("myKey1", kvp.Key, ignoreLineEndingDifferences: true); @@ -397,11 +400,11 @@ public void ConvertsArray() new JValue("myValue2") ); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.IsType(actual); - Assert.Collection((string[])actual, + Assert.Collection((string[])actual!, element => Assert.Equal("myValue1", element, ignoreLineEndingDifferences: true), element => Assert.Equal("myValue2", element, ignoreLineEndingDifferences: true) ); @@ -425,11 +428,11 @@ public void RecursivelyConvertsArrayElements() new JArray(new JValue("myValue2")) ); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.IsType(actual); - Assert.Collection((string[][])actual, + Assert.Collection((string[][])actual!, element => Assert.Collection(element, subElement => Assert.Equal("myValue1", subElement, ignoreLineEndingDifferences: true) ), @@ -448,7 +451,7 @@ public void ConvertsNullMap() ) )); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -463,7 +466,7 @@ public void ConvertsNullArray() ) )); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -485,7 +488,7 @@ public void FailsIfNoTypeMatches() )); JValue value = new JValue(true); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.False(success); Assert.Null(actual); @@ -501,7 +504,7 @@ public void ConvertsSimpleUnion() )); JValue value = new JValue("abc"); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.Equal("abc", actual); @@ -518,7 +521,7 @@ public void ConvertsAsFirstMatchingType() )); JValue value = new JValue((ushort)7); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.IsType(actual); @@ -534,7 +537,7 @@ public void ConvertsNull() }) )); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -550,7 +553,7 @@ public void ConvertsNull() { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, null, out object? actual); Assert.True(success); Assert.Null(actual); @@ -564,7 +567,7 @@ public void ConvertsPrimitive(object value, object expected) { var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, new JValue(value), out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, new JValue(value), out object? actual); Assert.True(success); Assert.Equal(expected, actual); @@ -580,7 +583,7 @@ public void ConvertsDate() new JProperty("$jsii.date", now) ); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.Equal(now, actual); @@ -594,11 +597,11 @@ public void ConvertsJson() var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); JObject value = new JObject(new JProperty("myKey", "myValue")); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); - Assert.IsAssignableFrom>(actual); - Assert.Collection((IDictionary)actual, + Assert.IsAssignableFrom>(actual); + Assert.Collection((IDictionary)actual!, kvp => { Assert.Equal("myKey", kvp.Key, ignoreLineEndingDifferences: true); @@ -615,11 +618,11 @@ public void ConvertsMap() var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); JObject value = new JObject(new JProperty("myKey", "myValue")); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.IsAssignableFrom>(actual); - Assert.Collection((IDictionary)actual, + Assert.Collection((IDictionary)actual!, kvp => { Assert.Equal("myKey", kvp.Key, ignoreLineEndingDifferences: true); @@ -634,11 +637,11 @@ public void ConvertsArray() var instance = new OptionalValue(new TypeReference(primitive: PrimitiveType.Any)); JArray value = new JArray(new JValue("myValue")); - bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object actual); + bool success = _converter.TryConvert(instance, typeof(object), _referenceMap, value, out object? actual); Assert.True(success); Assert.IsAssignableFrom(actual); - Assert.Collection((object[])actual, + Assert.Collection((object[])actual!, element => Assert.Equal("myValue", element) ); } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.sln b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.sln index 4b5ac42437..72e69b8540 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.sln +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime.sln @@ -14,8 +14,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UnitTests", "UnitTests", "{ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Amazon.JSII.Runtime.UnitTests", "Amazon.JSII.Runtime.UnitTests\Amazon.JSII.Runtime.UnitTests.csproj", "{96CC0C0B-1D90-448F-9BFC-07CE93D2CE29}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Runtime.IntegrationTests", "..\..\@jsii/dotnet-runtime-test\test\Amazon.JSII.Runtime.IntegrationTests\Amazon.JSII.Runtime.IntegrationTests.csproj", "{7BD15A18-BE3A-4729-9B8C-570BF214C4CE}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -30,10 +28,6 @@ Global {96CC0C0B-1D90-448F-9BFC-07CE93D2CE29}.Debug|Any CPU.Build.0 = Debug|Any CPU {96CC0C0B-1D90-448F-9BFC-07CE93D2CE29}.Release|Any CPU.ActiveCfg = Release|Any CPU {96CC0C0B-1D90-448F-9BFC-07CE93D2CE29}.Release|Any CPU.Build.0 = Release|Any CPU - {7BD15A18-BE3A-4729-9B8C-570BF214C4CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7BD15A18-BE3A-4729-9B8C-570BF214C4CE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7BD15A18-BE3A-4729-9B8C-570BF214C4CE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7BD15A18-BE3A-4729-9B8C-570BF214C4CE}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj index 32dff55d07..597621b5a2 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj @@ -6,6 +6,9 @@ Amazon.JSII.Runtime .NET Runtime for JSII icon.png + + enable + true diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/AssemblyInfo.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/AssemblyInfo.cs index 5275ee0d67..66eb8f6e0d 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/AssemblyInfo.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/AssemblyInfo.cs @@ -2,4 +2,4 @@ [assembly:InternalsVisibleTo("Amazon.JSII.Runtime.IntegrationTests")] [assembly:InternalsVisibleTo("Amazon.JSII.Runtime.UnitTests")] -[assembly:InternalsVisibleTo("DynamicProxyGenAssembly2")] \ No newline at end of file +[assembly:InternalsVisibleTo("DynamicProxyGenAssembly2")] diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/CallbackExtensions.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/CallbackExtensions.cs index c2414ec131..eb0b2d4af2 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/CallbackExtensions.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/CallbackExtensions.cs @@ -16,17 +16,17 @@ namespace Amazon.JSII.Runtime { internal static class CallbackExtensions { - public static object InvokeCallback(this Callback callback, IReferenceMap referenceMap, IFrameworkToJsiiConverter converter, out string error) + public static object? InvokeCallback(this Callback callback, IReferenceMap referenceMap, IFrameworkToJsiiConverter converter, out string? error) { try { - CallbackResult frameworkResult = callback.InvokeCallbackCore(referenceMap); + CallbackResult? frameworkResult = callback.InvokeCallbackCore(referenceMap); converter.TryConvert( frameworkResult, referenceMap, frameworkResult?.Value, - out object result + out object? result ); error = null; @@ -46,7 +46,7 @@ out object result } } - static CallbackResult InvokeCallbackCore(this Callback callback, IReferenceMap referenceMap) + static CallbackResult? InvokeCallbackCore(this Callback callback, IReferenceMap referenceMap) { if (callback.Invoke != null) { @@ -67,7 +67,7 @@ static CallbackResult InvokeCallbackCore(this Callback callback, IReferenceMap r throw new ArgumentException("Callback does not specificy a method, getter, or setter to invoke"); } - private static CallbackResult InvokeMethod(InvokeRequest request, IReferenceMap referenceMap) + private static CallbackResult? InvokeMethod(InvokeRequest request, IReferenceMap referenceMap) { request = request ?? throw new ArgumentNullException(nameof(request)); var deputy = referenceMap.GetOrCreateNativeReference(request.ObjectReference); @@ -79,24 +79,24 @@ private static CallbackResult InvokeMethod(InvokeRequest request, IReferenceMap throw new InvalidOperationException($"Received callback for {deputy.GetType().Name}.{request.Method} method, but this method does not exist"); } - var attribute = methodInfo.GetAttribute(); + var attribute = methodInfo.GetAttribute()!; var parameters = methodInfo.GetParameters(); var converter = ServiceContainer.ServiceProvider.GetRequiredService(); - var rehydratedArgs = Enumerable.Range(0, request.Arguments.Length) + var rehydratedArgs = Enumerable.Range(0, request.Arguments?.Length ?? 0) .Select(n => { var paramIndex = n >= parameters.Length ? parameters.Length - 1 : n; var requiredType = parameters[paramIndex].ParameterType; - if (!converter.TryConvert(attribute.Parameters[paramIndex], requiredType, referenceMap, request.Arguments[n], out var value)) + if (!converter.TryConvert(attribute.Parameters[paramIndex], requiredType, referenceMap, request.Arguments![n], out var value)) { - throw new JsiiException($"Unable to convert {request.Arguments[n]} to {requiredType.Name}"); + throw new JsiiException($"Unable to convert {request.Arguments![n]} to {requiredType.Name}"); } if (attribute.Parameters[paramIndex].IsVariadic) { - var array = Array.CreateInstance(value.GetType(), 1); + var array = Array.CreateInstance(value?.GetType() ?? requiredType, 1); array.SetValue(value, 0); value = array; } @@ -120,12 +120,12 @@ private static CallbackResult InvokeMethod(InvokeRequest request, IReferenceMap if (n == parameters.Length - 1 && rehydratedArgs.Length > parameters.Length) { var allArgs = rehydratedArgs.TakeLast(rehydratedArgs.Length - parameters.Length + 1); - var array = Array.CreateInstance(parameters[parameters.Length - 1].ParameterType.GetElementType(), - allArgs.Select(list => (list as Array).Length).Sum()); + var array = Array.CreateInstance(parameters[parameters.Length - 1].ParameterType.GetElementType()!, + allArgs.Select(list => (list as Array)!.Length).Sum()); var idx = 0; foreach (var list in allArgs) { - foreach (var item in list as Array) + foreach (var item in (list as Array)!) { array.SetValue(item, idx); idx += 1; @@ -153,7 +153,7 @@ private static CallbackResult InvokeGetter(GetRequest request, IReferenceMap ref throw new InvalidOperationException($"Received callback for {deputy.GetType().Name}.{request.Property} getter, but this property does not exist"); } - var attribute = propertyInfo.GetAttribute(); + var attribute = propertyInfo.GetAttribute()!; var methodInfo = propertyInfo.GetMethod; if (methodInfo == null) @@ -188,7 +188,7 @@ private static void InvokeSetter(SetRequest request, IReferenceMap referenceMap) * This is a temporary workaround / hack to solve an immediate problem, but does not completely solve the * problem to it's full extent. See https://github.com/aws/jsii/issues/404 for more information. */ - private static object FromKernel(object obj, IReferenceMap referenceMap) + private static object? FromKernel(object? obj, IReferenceMap referenceMap) { if (!(obj is JObject jObject)) return obj; var prop = jObject.Property("$jsii.byref"); @@ -201,16 +201,16 @@ private static object FromKernel(object obj, IReferenceMap referenceMap) if (jObject.ContainsKey("$jsii.map")) { - jObject = (JObject)jObject.Property("$jsii.map").Value; + jObject = (JObject)jObject.Property("$jsii.map")!.Value; } /* - * Turning all outstanding JObjects to IDictionary (recursively), as the code generator - * will have emitted IDictionary for maps of string to . Not doing so would - * result in an ArgumentError for not being able to convert JObject to IDictionary. - */ - var dict = jObject.ToObject>(); - var mapped = new Dictionary(dict.Count); + * Turning all outstanding JObjects to IDictionary (recursively), as the code generator + * will have emitted IDictionary for maps of string to . Not doing so would + * result in an ArgumentError for not being able to convert JObject to IDictionary. + */ + var dict = jObject.ToObject>()!; + var mapped = new Dictionary(dict.Count); foreach (var key in dict.Keys) { var value = dict[key]; @@ -229,14 +229,14 @@ private static object FromKernel(object obj, IReferenceMap referenceMap) internal sealed class CallbackResult : OptionalValue { - public CallbackResult(IOptionalValue optionalValue, object value) - : this(optionalValue?.Type, optionalValue?.IsOptional ?? false, value) {} + public CallbackResult(IOptionalValue optionalValue, object? value) + : this(optionalValue.Type, optionalValue.IsOptional, value) {} - private CallbackResult(TypeReference type, bool isOptional, object value): base(type, isOptional) + private CallbackResult(TypeReference type, bool isOptional, object? value): base(type, isOptional) { Value = value; } - public object Value { get; } + public object? Value { get; } } } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/ByRefValue.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/ByRefValue.cs index 18598fc1a2..6db67aea5f 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/ByRefValue.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/ByRefValue.cs @@ -10,7 +10,7 @@ namespace Amazon.JSII.Runtime.Deputy public sealed class ByRefValue { [JsonConstructor] - internal ByRefValue(string value, string[] interfaces = null, bool isProxy = false) + internal ByRefValue(string value, string[]? interfaces = null, bool isProxy = false) { Value = value ?? throw new ArgumentNullException(nameof(value)); Interfaces = interfaces ?? new string[]{}; @@ -27,12 +27,12 @@ internal ByRefValue(string value, string[] interfaces = null, bool isProxy = fal IsProxy = isProxy; } - internal ByRefValue(string fullyQualifiedName, string id, string[] interfaces = null) + internal ByRefValue(string fullyQualifiedName, string id, string[]? interfaces = null) : this($"{fullyQualifiedName}@{id}", fullyQualifiedName, id, interfaces, false) { } - internal ByRefValue(string value, string fullyQualifiedName, string id, string[] interfaces, bool isProxy) + internal ByRefValue(string value, string fullyQualifiedName, string id, string[]? interfaces, bool isProxy) { Value = value ?? throw new ArgumentNullException(nameof(value)); FullyQualifiedName = fullyQualifiedName ?? throw new ArgumentNullException(nameof(value)); diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/DeputyBase.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/DeputyBase.cs index 30013ddaae..c1996bb996 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/DeputyBase.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/DeputyBase.cs @@ -6,6 +6,7 @@ using Microsoft.Extensions.DependencyInjection; using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using System.Reflection; using System.Runtime.CompilerServices; @@ -22,7 +23,7 @@ public abstract class DeputyBase : IConvertible /// protected sealed class DeputyProps { - public DeputyProps(object[] arguments = null) + public DeputyProps(object[]? arguments = null) { Arguments = arguments ?? new object[] { }; } @@ -33,7 +34,7 @@ public DeputyProps(object[] arguments = null) private const BindingFlags StaticMemberFlags = BindingFlags.Static | BindingFlags.Public | BindingFlags.NonPublic; private const BindingFlags InstanceMemberFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic; - protected DeputyBase(DeputyProps props = null) + protected DeputyBase(DeputyProps? props = null) { var type = GetType(); @@ -51,7 +52,7 @@ protected DeputyBase(DeputyProps props = null) GetInterfaces() ); - Reference = new ByRefValue(response["$jsii.byref"] as string); + Reference = new ByRefValue((response["$jsii.byref"] as string)!); var referenceMap = serviceProvider.GetRequiredService(); referenceMap.AddNativeReference(Reference, this, true); @@ -72,7 +73,7 @@ IEnumerable GetMethodOverrides() if ((inheritedAttribute != null && uninheritedAttribute == null) || uninheritedAttribute?.IsOverride == true) { - yield return new Override(method: (inheritedAttribute ?? uninheritedAttribute).Name); + yield return new Override(method: (inheritedAttribute ?? uninheritedAttribute)!.Name); } } } @@ -89,7 +90,7 @@ IEnumerable GetPropertyOverrides() if ((inheritedAttribute != null && uninheritedAttribute == null) || uninheritedAttribute?.IsOverride == true) { - yield return new Override(property: (inheritedAttribute ?? uninheritedAttribute).Name); + yield return new Override(property: (inheritedAttribute ?? uninheritedAttribute)!.Name); } } } @@ -99,7 +100,7 @@ string[] GetInterfaces() return type.GetInterfaces() .Select(iface => iface.GetCustomAttribute()) .Where(jsiiIface => jsiiIface != null) - .Select(jsiiIface => jsiiIface.FullyQualifiedName) + .Select(jsiiIface => jsiiIface!.FullyQualifiedName) .ToArray(); } } @@ -118,12 +119,13 @@ protected DeputyBase(ByRefValue reference) #region GetProperty - protected static T GetStaticProperty(System.Type type, [CallerMemberName] string propertyName = null) + [return: MaybeNull] + protected static T GetStaticProperty(System.Type type, [CallerMemberName] string? propertyName = null) { type = type ?? throw new ArgumentNullException(nameof(type)); propertyName = propertyName ?? throw new ArgumentNullException(nameof(propertyName)); - var classAttribute = ReflectionUtils.GetClassAttribute(type); + var classAttribute = ReflectionUtils.GetClassAttribute(type)!; var propertyAttribute = GetStaticPropertyAttribute(type, propertyName); return GetPropertyCore( @@ -132,7 +134,8 @@ protected static T GetStaticProperty(System.Type type, [CallerMemberName] str ); } - protected T GetInstanceProperty([CallerMemberName] string propertyName = null) + [return: MaybeNull] + protected T GetInstanceProperty([CallerMemberName] string? propertyName = null) { propertyName = propertyName ?? throw new ArgumentNullException(nameof(propertyName)); @@ -144,6 +147,7 @@ protected T GetInstanceProperty([CallerMemberName] string propertyName = null ); } + [return: MaybeNull] private static T GetPropertyCore(JsiiPropertyAttribute propertyAttribute, Func getFunc) { var serviceProvider = ServiceContainer.ServiceProvider; @@ -153,24 +157,24 @@ private static T GetPropertyCore(JsiiPropertyAttribute propertyAttribute, Fun var converter = serviceProvider.GetRequiredService(); var referenceMap = serviceProvider.GetRequiredService(); - if (!converter.TryConvert(propertyAttribute, typeof(T), referenceMap, response.Value, out object frameworkValue)) + if (!converter.TryConvert(propertyAttribute, typeof(T), referenceMap, response.Value, out object? frameworkValue)) { throw new ArgumentException($"Could not convert value '{response.Value}' for property '{propertyAttribute.Name}'", nameof(getFunc)); } - return (T)frameworkValue; + return (T)frameworkValue!; } #endregion #region SetProperty - protected static void SetStaticProperty(System.Type type, T value, [CallerMemberName] string propertyName = null) + protected static void SetStaticProperty(System.Type type, T value, [CallerMemberName] string? propertyName = null) { type = type ?? throw new ArgumentNullException(nameof(type)); propertyName = propertyName ?? throw new ArgumentNullException(nameof(propertyName)); - var classAttribute = ReflectionUtils.GetClassAttribute(type); + var classAttribute = ReflectionUtils.GetClassAttribute(type)!; var propertyAttribute = GetStaticPropertyAttribute(type, propertyName); SetPropertyCore( @@ -180,7 +184,7 @@ protected static void SetStaticProperty(System.Type type, T value, [CallerMem ); } - protected void SetInstanceProperty(T value, [CallerMemberName] string propertyName = null) + protected void SetInstanceProperty(T value, [CallerMemberName] string? propertyName = null) { propertyName = propertyName ?? throw new ArgumentNullException(nameof(propertyName)); @@ -193,12 +197,12 @@ protected void SetInstanceProperty(T value, [CallerMemberName] string propert ); } - private static void SetPropertyCore(T value, JsiiPropertyAttribute propertyAttribute, Action setAction) + private static void SetPropertyCore(T value, JsiiPropertyAttribute propertyAttribute, Action setAction) { var serviceProvider = ServiceContainer.ServiceProvider; var converter = serviceProvider.GetRequiredService(); var referenceMap = serviceProvider.GetRequiredService(); - if (!converter.TryConvert(propertyAttribute, referenceMap, value, out object jsiiValue)) + if (!converter.TryConvert(propertyAttribute, referenceMap, value, out object? jsiiValue)) { throw new ArgumentException($"Could not set property '{propertyAttribute.Name}' to '{value}'", nameof(value)); } @@ -211,20 +215,21 @@ private static void SetPropertyCore(T value, JsiiPropertyAttribute propertyAt #region InvokeMethod - protected static void InvokeStaticVoidMethod(System.Type type, System.Type[] parameterTypes, object[] arguments, [CallerMemberName] string methodName = null) + protected static void InvokeStaticVoidMethod(System.Type type, System.Type[] parameterTypes, object[] arguments, [CallerMemberName] string methodName = "") { InvokeStaticMethod(type, parameterTypes, arguments, methodName); } - protected void InvokeInstanceVoidMethod(System.Type[] parameterTypes, object[] arguments, [CallerMemberName] string methodName = null) + protected void InvokeInstanceVoidMethod(System.Type[] parameterTypes, object[] arguments, [CallerMemberName] string methodName = "") { InvokeInstanceMethod(parameterTypes, arguments, methodName); } - - protected static T InvokeStaticMethod(System.Type type, System.Type[] parameterTypes, object[] arguments, [CallerMemberName] string methodName = null) + + [return: MaybeNull] + protected static T InvokeStaticMethod(System.Type type, System.Type[] parameterTypes, object[] arguments, [CallerMemberName] string methodName = "") { var methodAttribute = GetStaticMethodAttribute(type, methodName, parameterTypes); - var classAttribute = ReflectionUtils.GetClassAttribute(type); + var classAttribute = ReflectionUtils.GetClassAttribute(type)!; return InvokeMethodCore( methodAttribute, @@ -238,7 +243,8 @@ protected static T InvokeStaticMethod(System.Type type, System.Type[] paramet ); } - protected T InvokeInstanceMethod(System.Type[] parameterTypes, object[] arguments, [CallerMemberName] string methodName = null) + [return: MaybeNull] + protected T InvokeInstanceMethod(System.Type[] parameterTypes, object[] arguments, [CallerMemberName] string methodName = "") { var methodAttribute = GetInstanceMethodAttribute(methodName, parameterTypes); @@ -258,11 +264,12 @@ protected T InvokeInstanceMethod(System.Type[] parameterTypes, object[] argum ); } + [return: MaybeNull] private static T InvokeMethodCore( JsiiMethodAttribute methodAttribute, - object[] arguments, - Func beginFunc, - Func invokeFunc + object?[] arguments, + Func beginFunc, + Func invokeFunc ) { var serviceProvider = ServiceContainer.ServiceProvider; @@ -271,14 +278,14 @@ Func invokeFunc var referenceMap = serviceProvider.GetRequiredService(); var result = GetResult(); - if (!converter.TryConvert(methodAttribute.Returns, typeof(T), referenceMap, result, out object frameworkValue)) + if (!converter.TryConvert(methodAttribute.Returns, typeof(T), referenceMap, result, out object? frameworkValue)) { throw new ArgumentException($"Could not convert result '{result}' for method '{methodAttribute.Name}'", nameof(result)); } - return (T)frameworkValue; + return (T)frameworkValue!; - object GetResult() + object? GetResult() { var args = ConvertArguments(methodAttribute.Parameters, arguments); @@ -322,13 +329,13 @@ private static void InvokeCallbacks() #region ConvertArguments - private static object[] ConvertArguments(Parameter[] parameters, params object[] arguments) + private static object?[] ConvertArguments(Parameter[] parameters, params object?[] arguments) { var serviceProvider = ServiceContainer.ServiceProvider; if ((parameters == null || parameters.Length == 0) && (arguments == null || arguments.Length == 0)) { - return new object[] { }; + return new object?[] { }; } if (parameters == null || arguments == null || parameters.Length != arguments.Length) @@ -336,7 +343,7 @@ private static object[] ConvertArguments(Parameter[] parameters, params object[] throw new ArgumentException("Arguments do not match method parameters", nameof(arguments)); } - var cleanedArgs = new List(arguments); + var cleanedArgs = new List(arguments); var cleanedParams = new List(parameters); // Handling variadic parameters (null array, empty array, one value array, n values array..) @@ -371,7 +378,7 @@ private static object[] ConvertArguments(Parameter[] parameters, params object[] return cleanedParams.Zip(cleanedArgs, (parameter, frameworkArgument) => { - if (!converter.TryConvert(parameter, referenceMap, frameworkArgument, out object jsiiArgument)) + if (!converter.TryConvert(parameter, referenceMap, frameworkArgument, out object? jsiiArgument)) { throw new ArgumentException($"Could not convert argument '{frameworkArgument}' to Jsii", nameof(arguments)); } @@ -460,7 +467,7 @@ TypeCode IConvertible.GetTypeCode() return TypeCode.Object; } - object IConvertible.ToType(System.Type conversionType, IFormatProvider provider) + object IConvertible.ToType(System.Type conversionType, IFormatProvider? provider) { if (Proxies.ContainsKey(conversionType)) { @@ -469,13 +476,12 @@ object IConvertible.ToType(System.Type conversionType, IFormatProvider provider) if (ToTypeCore(out var converted)) { - Proxies[conversionType] = converted; - return converted; + return Proxies[conversionType] = converted!; } throw new InvalidCastException($"Unable to cast {this.GetType().FullName} into {conversionType.FullName}"); - bool ToTypeCore(out object result) + bool ToTypeCore(out object? result) { if (conversionType.IsInstanceOfType(this)) { @@ -522,7 +528,7 @@ bool ToTypeCore(out object result) result = constructorInfo.Invoke(new object[]{ Reference.ForProxy() }); return true; - bool TryFindSupportedInterface(string declaredFqn, string[] availableFqns, ITypeCache types, out string foundFqn) + bool TryFindSupportedInterface(string declaredFqn, string[] availableFqns, ITypeCache types, out string? foundFqn) { var declaredType = types.GetInterfaceType(declaredFqn); @@ -544,77 +550,77 @@ bool TryFindSupportedInterface(string declaredFqn, string[] availableFqns, IType #region Impossible Conversions - bool IConvertible.ToBoolean(IFormatProvider provider) + bool IConvertible.ToBoolean(IFormatProvider? provider) { throw new InvalidCastException(); } - byte IConvertible.ToByte(IFormatProvider provider) + byte IConvertible.ToByte(IFormatProvider? provider) { throw new InvalidCastException(); } - char IConvertible.ToChar(IFormatProvider provider) + char IConvertible.ToChar(IFormatProvider? provider) { throw new InvalidCastException(); } - DateTime IConvertible.ToDateTime(IFormatProvider provider) + DateTime IConvertible.ToDateTime(IFormatProvider? provider) { throw new InvalidCastException(); } - decimal IConvertible.ToDecimal(IFormatProvider provider) + decimal IConvertible.ToDecimal(IFormatProvider? provider) { throw new InvalidCastException(); } - double IConvertible.ToDouble(IFormatProvider provider) + double IConvertible.ToDouble(IFormatProvider? provider) { throw new InvalidCastException(); } - short IConvertible.ToInt16(IFormatProvider provider) + short IConvertible.ToInt16(IFormatProvider? provider) { throw new InvalidCastException(); } - int IConvertible.ToInt32(IFormatProvider provider) + int IConvertible.ToInt32(IFormatProvider? provider) { throw new InvalidCastException(); } - long IConvertible.ToInt64(IFormatProvider provider) + long IConvertible.ToInt64(IFormatProvider? provider) { throw new InvalidCastException(); } - sbyte IConvertible.ToSByte(IFormatProvider provider) + sbyte IConvertible.ToSByte(IFormatProvider? provider) { throw new InvalidCastException(); } - float IConvertible.ToSingle(IFormatProvider provider) + float IConvertible.ToSingle(IFormatProvider? provider) { throw new InvalidCastException(); } - string IConvertible.ToString(IFormatProvider provider) + string IConvertible.ToString(IFormatProvider? provider) { throw new InvalidCastException(); } - ushort IConvertible.ToUInt16(IFormatProvider provider) + ushort IConvertible.ToUInt16(IFormatProvider? provider) { throw new InvalidCastException(); } - uint IConvertible.ToUInt32(IFormatProvider provider) + uint IConvertible.ToUInt32(IFormatProvider? provider) { throw new InvalidCastException(); } - ulong IConvertible.ToUInt64(IFormatProvider provider) + ulong IConvertible.ToUInt64(IFormatProvider? provider) { throw new InvalidCastException(); } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiClassAttribute.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiClassAttribute.cs index 16e4ced60d..1777a95588 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiClassAttribute.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiClassAttribute.cs @@ -7,7 +7,7 @@ namespace Amazon.JSII.Runtime.Deputy [AttributeUsage(AttributeTargets.Class, Inherited = false)] public sealed class JsiiClassAttribute : JsiiTypeAttributeBase { - public JsiiClassAttribute(System.Type nativeType, string fullyQualifiedName, string parametersJson = null) + public JsiiClassAttribute(System.Type nativeType, string fullyQualifiedName, string? parametersJson = null) : base(nativeType, fullyQualifiedName) { Parameters = parametersJson == null diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiMethodAttribute.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiMethodAttribute.cs index 98babd6d04..57556ad9f0 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiMethodAttribute.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiMethodAttribute.cs @@ -9,8 +9,8 @@ public sealed class JsiiMethodAttribute : Attribute { public JsiiMethodAttribute( string name, - string returnsJson = null, - string parametersJson = null, + string? returnsJson = null, + string? parametersJson = null, bool isAsync = false, bool isOverride = false) { @@ -27,7 +27,7 @@ public JsiiMethodAttribute( public string Name { get; } - public OptionalValue Returns { get; } + public OptionalValue? Returns { get; } public Parameter[] Parameters { get; } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiTypeAttributeBase.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiTypeAttributeBase.cs index e744630149..867760e569 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiTypeAttributeBase.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Deputy/JsiiTypeAttributeBase.cs @@ -47,8 +47,7 @@ private static void Load(Assembly assembly) var tarballResourceName = assembly.GetManifestResourceNames().FirstOrDefault(name => name.EndsWith(".tgz")); if (tarballResourceName == null) { - throw new JsiiException("Cannot find embedded tarball resource in assembly " + assembly.GetName(), - null); + throw new JsiiException("Cannot find embedded tarball resource in assembly " + assembly.GetName(), null); } IServiceProvider serviceProvider = ServiceContainer.ServiceProvider; diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/JsiiException.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/JsiiException.cs index ea0428b59a..12726d501e 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/JsiiException.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/JsiiException.cs @@ -5,18 +5,18 @@ namespace Amazon.JSII.Runtime { public sealed class JsiiException : Exception { - public ErrorResponse ErrorResponse { get; } + public ErrorResponse? ErrorResponse { get; } internal JsiiException(string message) : base(message) { } - internal JsiiException(string message, Exception innerException) + internal JsiiException(string message, Exception? innerException) : base(message, innerException) { } - internal JsiiException(ErrorResponse response, Exception innerException) + internal JsiiException(ErrorResponse response, Exception? innerException) : base(response.Error, innerException) { ErrorResponse = response; diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/ReflectionUtils.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/ReflectionUtils.cs index eb66671553..1755e72baa 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/ReflectionUtils.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/ReflectionUtils.cs @@ -66,7 +66,7 @@ public static PropertyInfo GetIndexer(Type type) return type.GetProperties().FirstOrDefault(p => p.GetIndexParameters().Any()); } - public static JsiiClassAttribute GetClassAttribute(Type type) + public static JsiiClassAttribute? GetClassAttribute(Type? type) { if (type == null) { @@ -86,7 +86,7 @@ public static JsiiClassAttribute GetClassAttribute(Type type) /// The attribute type that is desired /// The attribute if one was found, or null [return: MaybeNull] - internal static T GetAttribute(this MethodInfo method, bool inherit = true) where T : Attribute + internal static T? GetAttribute(this MethodInfo method, bool inherit = true) where T : notnull, Attribute { var directAttribute = method.GetCustomAttribute(inherit); if (directAttribute != null || !inherit) return directAttribute; @@ -118,7 +118,7 @@ internal static T GetAttribute(this MethodInfo method, bool inherit = true) w /// The attribute type that is desired /// The attribute if one was found, or null [return: MaybeNull] - internal static T GetAttribute(this PropertyInfo property, bool inherit = true) where T : Attribute + internal static T? GetAttribute(this PropertyInfo property, bool inherit = true) where T : notnull, Attribute { var directAttribute = property.GetCustomAttribute(inherit); if (directAttribute != null || !inherit) return directAttribute; diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Client.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Client.cs index 29da65b3d2..972965dc10 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Client.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Client.cs @@ -100,26 +100,26 @@ TResponse ReceiveResponse() TResponse TryDeserialize(string responseJson) where TResponse : class, IKernelResponse { - JObject responseObject = (JObject)JsonConvert.DeserializeObject(responseJson); + JObject responseObject = (JObject)JsonConvert.DeserializeObject(responseJson)!; if (responseObject.ContainsKey("error")) { - ErrorResponse errorResponse = responseObject.ToObject(); + ErrorResponse errorResponse = responseObject.ToObject()!; throw new JsiiException(errorResponse, null); } if (typeof(TResponse).IsAssignableFrom(typeof(HelloResponse))) { - return responseObject.ToObject(); + return responseObject.ToObject()!; } if (responseObject.ContainsKey("callback")) { - CallbackResponse callbackResponse = responseObject.ToObject(); + CallbackResponse callbackResponse = responseObject.ToObject()!; Callback callback = callbackResponse.Callback; - object result = callback.InvokeCallback(_referenceMap, _frameworkToJsiiConverter, out string error); + object? result = callback.InvokeCallback(_referenceMap, _frameworkToJsiiConverter, out string? error); return Send(new SynchronousCompleteRequest ( @@ -135,7 +135,7 @@ TResponse TryDeserialize(string responseJson) where TResponse : class if (responseObject.ContainsKey("ok")) { - OkResponse okResponse = responseObject.ToObject>(); + OkResponse okResponse = responseObject.ToObject>()!; return okResponse.Ok; } @@ -175,7 +175,7 @@ public LoadResponse Load(LoadRequest request) return Send(request); } - public CreateResponse Create(string fullyQualifiedName, object[] arguments = null, Override[] overrides = null, string[] interfaces = null) + public CreateResponse Create(string fullyQualifiedName, object?[]? arguments = null, Override[]? overrides = null, string[]? interfaces = null) { return Create(new CreateRequest(fullyQualifiedName, arguments, overrides, interfaces)); } @@ -215,7 +215,7 @@ public GetResponse StaticGet(StaticGetRequest request) return Send(request); } - public SetResponse Set(ObjectReference objectReference, string property, object value) + public SetResponse Set(ObjectReference objectReference, string property, object? value) { return Set(new SetRequest(objectReference, property, value)); } @@ -225,7 +225,7 @@ public SetResponse Set(SetRequest request) return Send(request); } - public SetResponse StaticSet(string fullyQualifiedName, string property, object value) + public SetResponse StaticSet(string fullyQualifiedName, string property, object? value) { return StaticSet(new StaticSetRequest(fullyQualifiedName, property, value)); } @@ -235,7 +235,7 @@ public SetResponse StaticSet(StaticSetRequest request) return Send(request); } - public InvokeResponse Invoke(ObjectReference objectReference, string method, object[] arguments = null) + public InvokeResponse Invoke(ObjectReference objectReference, string method, object?[]? arguments = null) { return Invoke(new InvokeRequest(objectReference, method, arguments)); } @@ -245,7 +245,7 @@ public InvokeResponse Invoke(InvokeRequest request) return Send(request); } - public InvokeResponse StaticInvoke(string fullyQualifiedName, string method, object[] arguments = null) + public InvokeResponse StaticInvoke(string fullyQualifiedName, string method, object?[]? arguments = null) { return StaticInvoke(new StaticInvokeRequest(fullyQualifiedName, method, arguments)); } @@ -255,7 +255,7 @@ public InvokeResponse StaticInvoke(StaticInvokeRequest request) return Send(request); } - public BeginResponse Begin(ObjectReference objectReference, string method, object[] arguments = null) + public BeginResponse Begin(ObjectReference objectReference, string method, object?[]? arguments = null) { return Begin(new BeginRequest(objectReference, method, arguments)); } @@ -285,7 +285,7 @@ public CallbacksResponse Callbacks(CallbacksRequest request) return Send(request); } - public CompleteResponse Complete(string callbackId, string error = null, object result = null) + public CompleteResponse Complete(string callbackId, string? error = null, object? result = null) { return Complete(new CompleteRequest(callbackId, error, result)); } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/FrameworkToJsiiConverter.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/FrameworkToJsiiConverter.cs index e0a53e60f6..77ae1d3d40 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/FrameworkToJsiiConverter.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/FrameworkToJsiiConverter.cs @@ -15,12 +15,12 @@ public FrameworkToJsiiConverter(ITypeCache types) : base(types) { } - public bool TryConvert(IOptionalValue optionalValue, IReferenceMap referenceMap, object value, out object result) + public bool TryConvert(IOptionalValue? optionalValue, IReferenceMap referenceMap, object? value, out object? result) { return TryConvert(optionalValue, typeof(object), referenceMap, value, out result); } - protected override bool TryConvertVoid(object value, out object result) + protected override bool TryConvertVoid(object? value, out object? result) { if (value != null) { @@ -31,7 +31,7 @@ protected override bool TryConvertVoid(object value, out object result) return true; } - protected override bool TryConvertClass(Type type, IReferenceMap referenceMap, object value, out object result) + protected override bool TryConvertClass(Type type, IReferenceMap referenceMap, object? value, out object? result) { if (value == null) { @@ -51,7 +51,7 @@ protected override bool TryConvertClass(Type type, IReferenceMap referenceMap, o var data = new JObject(); foreach (var prop in value.GetType().GetProperties()) { - var jsiiProperty = (JsiiPropertyAttribute) prop.GetCustomAttribute(typeof(JsiiPropertyAttribute), true); + var jsiiProperty = (JsiiPropertyAttribute?) prop.GetCustomAttribute(typeof(JsiiPropertyAttribute), true); if (jsiiProperty == null) { continue; @@ -86,8 +86,7 @@ protected override bool TryConvertClass(Type type, IReferenceMap referenceMap, o return false; } - protected override bool TryConvertEnum(object value, bool isOptional, string fullyQualifiedName, - out object result) + protected override bool TryConvertEnum(object? value, bool isOptional, string fullyQualifiedName, out object? result) { if (value == null) { @@ -96,7 +95,7 @@ protected override bool TryConvertEnum(object value, bool isOptional, string ful } Type valueType = value.GetType(); - JsiiEnumAttribute attribute = value.GetType().GetCustomAttribute(); + JsiiEnumAttribute? attribute = value.GetType().GetCustomAttribute(); if (attribute == null || attribute.FullyQualifiedName != fullyQualifiedName) { @@ -104,7 +103,7 @@ protected override bool TryConvertEnum(object value, bool isOptional, string ful return false; } - string valueName = Enum.GetName(valueType, value); + string? valueName = Enum.GetName(valueType, value); FieldInfo fieldInfo = valueType.GetFields().FirstOrDefault(field => field.Name == valueName); if (fieldInfo == null) @@ -113,7 +112,7 @@ protected override bool TryConvertEnum(object value, bool isOptional, string ful return false; } - JsiiEnumMemberAttribute memberAttribute = fieldInfo.GetCustomAttribute(); + JsiiEnumMemberAttribute? memberAttribute = fieldInfo.GetCustomAttribute(); if (memberAttribute == null) { result = null; @@ -124,7 +123,7 @@ protected override bool TryConvertEnum(object value, bool isOptional, string ful return true; } - protected override bool TryConvertBoolean(object value, bool isOptional, out object result) + protected override bool TryConvertBoolean(object? value, bool isOptional, out object? result) { if (value == null) { @@ -134,7 +133,7 @@ protected override bool TryConvertBoolean(object value, bool isOptional, out obj if (value.GetType().IsAssignableFrom(typeof(bool))) { - result = value; + result = (bool)value; return true; } @@ -142,7 +141,7 @@ protected override bool TryConvertBoolean(object value, bool isOptional, out obj return false; } - protected override bool TryConvertDate(object value, bool isOptional, out object result) + protected override bool TryConvertDate(object? value, bool isOptional, out object? result) { if (value == null) { @@ -160,7 +159,7 @@ protected override bool TryConvertDate(object value, bool isOptional, out object return false; } - protected override bool TryConvertJson(object value, out object result) + protected override bool TryConvertJson(object? value, out object? result) { if (value == null) { @@ -178,7 +177,7 @@ protected override bool TryConvertJson(object value, out object result) return false; } - protected override bool TryConvertNumber(object value, bool isOptional, out object result) + protected override bool TryConvertNumber(object? value, bool isOptional, out object? result) { if (value == null) { @@ -196,7 +195,7 @@ protected override bool TryConvertNumber(object value, bool isOptional, out obje return false; } - protected override bool TryConvertString(object value, out object result) + protected override bool TryConvertString(object? value, out object? result) { if (value == null) { @@ -214,8 +213,7 @@ protected override bool TryConvertString(object value, out object result) return false; } - protected override bool TryConvertArray(IReferenceMap referenceMap, TypeReference elementType, object value, - out object result) + protected override bool TryConvertArray(IReferenceMap referenceMap, TypeReference elementType, object? value, out object? result) { if (value == null) { @@ -232,9 +230,9 @@ protected override bool TryConvertArray(IReferenceMap referenceMap, TypeReferenc Array array = (Array) value; JArray resultArray = new JArray(); - foreach (object element in array) + foreach (object? element in array) { - if (!TryConvertCollectionElement(element, referenceMap, elementType, out object convertedElement)) + if (!TryConvertCollectionElement(element, referenceMap, elementType, out object? convertedElement)) { result = null; return false; @@ -247,8 +245,7 @@ protected override bool TryConvertArray(IReferenceMap referenceMap, TypeReferenc return true; } - protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference elementType, object value, - out object result) + protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference elementType, object? value, out object? result) { if (value == null) { @@ -256,7 +253,7 @@ protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference return true; } - Type valueType = value.GetType(); + Type valueType = value.GetType()!; Type dictionaryInterface = valueType.GetInterfaces() .FirstOrDefault(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IDictionary<,>)); @@ -267,15 +264,15 @@ protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference return false; } - IEnumerable keys = (IEnumerable) valueType.GetProperty("Keys").GetValue(value); + IEnumerable keys = (IEnumerable) valueType.GetProperty("Keys")!.GetValue(value)!; PropertyInfo indexer = ReflectionUtils.GetIndexer(valueType); JObject resultObject = new JObject(); foreach (string key in keys) { - object element = indexer.GetValue(value, new object[] {key}); + object? element = indexer.GetValue(value, new object[] {key}); - if (!TryConvertCollectionElement(element, referenceMap, elementType, out object convertedElement)) + if (!TryConvertCollectionElement(element, referenceMap, elementType, out object? convertedElement)) { result = null; return false; @@ -297,13 +294,12 @@ protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference /// The TypeReference of the element, as seen by Jsii /// out: the converted element /// True if the conversion was successful, false otherwise - private bool TryConvertCollectionElement(object element, IReferenceMap referenceMap, TypeReference elementType, - out object convertedElement) + private bool TryConvertCollectionElement(object? element, IReferenceMap referenceMap, TypeReference elementType, out object? convertedElement) { if (element is IDictionary || element is object[]) { var objectType = InferType(referenceMap, element); - var nestedType = elementType.Primitive == PrimitiveType.Any ? elementType : objectType.Collection.ElementType; + var nestedType = elementType.Primitive == PrimitiveType.Any ? elementType : objectType.Collection?.ElementType; switch (objectType.Collection?.Kind) { case CollectionKind.Map: @@ -313,15 +309,13 @@ private bool TryConvertCollectionElement(object element, IReferenceMap reference // So we can directly convert to another map here, and forgo the type hierarchy // induced by elementType // See https://github.com/aws/aws-cdk/issues/2496 - return TryConvertMap(referenceMap, nestedType, element, - out convertedElement); + return TryConvertMap(referenceMap, nestedType!, element, out convertedElement); case CollectionKind.Array: // The [object] could be another array. (ie Tags) // https://github.com/aws/aws-cdk/issues/3244 - return TryConvertArray(referenceMap, nestedType, element, - out convertedElement); + return TryConvertArray(referenceMap, nestedType!, element, out convertedElement); default: - return TryConvert(elementType, typeof(object), referenceMap, element, out convertedElement); + return TryConvert(elementType!, typeof(object), referenceMap, element, out convertedElement); } } else @@ -341,19 +335,19 @@ TypeReference InferType(IReferenceMap referenceMap, Type type) { type = type ?? throw new ArgumentNullException(nameof(type)); - JsiiClassAttribute classAttribute = ReflectionUtils.GetClassAttribute(type); + var classAttribute = ReflectionUtils.GetClassAttribute(type); if (classAttribute != null) { return new TypeReference(classAttribute.FullyQualifiedName); } - JsiiEnumAttribute enumAttribute = type.GetCustomAttribute(); + var enumAttribute = type.GetCustomAttribute(); if (enumAttribute != null) { return new TypeReference(enumAttribute.FullyQualifiedName); } - JsiiByValueAttribute structAttribute = type.GetCustomAttribute(); + var structAttribute = type.GetCustomAttribute(); if (structAttribute != null) { return new TypeReference(structAttribute.FullyQualifiedName); @@ -393,7 +387,7 @@ TypeReference InferType(IReferenceMap referenceMap, Type type) kind: CollectionKind.Array, elementType: typeof(Object) == type.GetElementType() ? new TypeReference(primitive: PrimitiveType.Any) - : InferType(referenceMap, type.GetElementType()) + : InferType(referenceMap, type.GetElementType()!) ) ); } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/IFrameworkToJsiiConverter.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/IFrameworkToJsiiConverter.cs index 948fd7185c..94a0b6e62d 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/IFrameworkToJsiiConverter.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/IFrameworkToJsiiConverter.cs @@ -4,6 +4,6 @@ namespace Amazon.JSII.Runtime.Services.Converters { internal interface IFrameworkToJsiiConverter { - bool TryConvert(IOptionalValue optionalValue, IReferenceMap referenceMap, object value, out object result); + bool TryConvert(IOptionalValue? optionalValue, IReferenceMap referenceMap, object? value, out object? result); } } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/IJsiiToFrameworkConverter.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/IJsiiToFrameworkConverter.cs index 9955f35897..445198c48e 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/IJsiiToFrameworkConverter.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/IJsiiToFrameworkConverter.cs @@ -4,6 +4,6 @@ namespace Amazon.JSII.Runtime.Services.Converters { internal interface IJsiiToFrameworkConverter { - bool TryConvert(IOptionalValue optionalValue, System.Type type, IReferenceMap referenceMap, object value, out object result); + bool TryConvert(IOptionalValue? optionalValue, System.Type type, IReferenceMap referenceMap, object? value, out object? result); } } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/JsiiToFrameworkConverter.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/JsiiToFrameworkConverter.cs index 797f07ef1f..d2ab57cc47 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/JsiiToFrameworkConverter.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/JsiiToFrameworkConverter.cs @@ -13,7 +13,7 @@ public JsiiToFrameworkConverter(ITypeCache types) : base(types) { } - protected override bool TryConvertVoid(object value, out object result) + protected override bool TryConvertVoid(object? value, out object? result) { if (value != null && (value as JToken)?.Type != JTokenType.Null) { @@ -25,7 +25,7 @@ protected override bool TryConvertVoid(object value, out object result) } - protected override bool TryConvertClass(System.Type type, IReferenceMap referenceMap, object value, out object result) + protected override bool TryConvertClass(System.Type type, IReferenceMap referenceMap, object? value, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -35,7 +35,7 @@ protected override bool TryConvertClass(System.Type type, IReferenceMap referenc if (value is JObject jsonValue && jsonValue.ContainsKey("$jsii.byref")) { - ByRefValue byRefValue = jsonValue.ToObject(); + ByRefValue byRefValue = jsonValue.ToObject()!; result = referenceMap.GetOrCreateNativeReference(byRefValue); @@ -51,7 +51,7 @@ protected override bool TryConvertClass(System.Type type, IReferenceMap referenc return false; } - protected override bool TryConvertEnum(object value, bool isOptional, string fullyQualifiedName, out object result) + protected override bool TryConvertEnum(object? value, bool isOptional, string fullyQualifiedName, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -61,7 +61,7 @@ protected override bool TryConvertEnum(object value, bool isOptional, string ful if (value is JObject jsonValue && jsonValue.ContainsKey("$jsii.enum")) { - EnumValue enumValue = jsonValue.ToObject(); + EnumValue enumValue = jsonValue.ToObject()!; if (enumValue.FullyQualifiedName == fullyQualifiedName) { System.Type enumType = _types.GetEnumType(fullyQualifiedName); @@ -76,7 +76,7 @@ protected override bool TryConvertEnum(object value, bool isOptional, string ful return false; } - protected override bool TryConvertBoolean(object value, bool isOptional, out object result) + protected override bool TryConvertBoolean(object? value, bool isOptional, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -86,7 +86,7 @@ protected override bool TryConvertBoolean(object value, bool isOptional, out obj if (value.GetType().IsAssignableFrom(typeof(bool))) { - result = value; + result = (bool)value; return true; } @@ -100,7 +100,7 @@ protected override bool TryConvertBoolean(object value, bool isOptional, out obj return false; } - protected override bool TryConvertDate(object value, bool isOptional, out object result) + protected override bool TryConvertDate(object? value, bool isOptional, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -110,7 +110,7 @@ protected override bool TryConvertDate(object value, bool isOptional, out object if (value is JObject jsonValue && jsonValue.ContainsKey("$jsii.date")) { - result = jsonValue.ToObject().DateTime; + result = jsonValue.ToObject()!.DateTime; return true; } @@ -118,7 +118,7 @@ protected override bool TryConvertDate(object value, bool isOptional, out object return false; } - protected override bool TryConvertJson(object value, out object result) + protected override bool TryConvertJson(object? value, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -136,7 +136,7 @@ protected override bool TryConvertJson(object value, out object result) return false; } - protected override bool TryConvertNumber(object value, bool isOptional, out object result) + protected override bool TryConvertNumber(object? value, bool isOptional, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -165,7 +165,7 @@ protected override bool TryConvertNumber(object value, bool isOptional, out obje return false; } - protected override bool TryConvertString(object value, out object result) + protected override bool TryConvertString(object? value, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -189,7 +189,7 @@ protected override bool TryConvertString(object value, out object result) return false; } - protected override bool TryConvertArray(IReferenceMap referenceMap, TypeReference elementTypeInstance, object value, out object result) + protected override bool TryConvertArray(IReferenceMap referenceMap, TypeReference elementTypeInstance, object? value, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -204,7 +204,7 @@ protected override bool TryConvertArray(IReferenceMap referenceMap, TypeReferenc for (int i = 0; i < array.Count; i++) { - if (!TryConvert(elementTypeInstance, elementType, referenceMap, array[i], out object convertedElement)) + if (!TryConvert(elementTypeInstance, elementType, referenceMap, array[i], out object? convertedElement)) { throw new ArgumentException("Could not convert all elements of array", nameof(value)); } @@ -220,7 +220,7 @@ protected override bool TryConvertArray(IReferenceMap referenceMap, TypeReferenc return false; } - protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference elementTypeInstance, object value, out object result) + protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference elementTypeInstance, object? value, out object? result) { if (value == null || (value as JToken)?.Type == JTokenType.Null) { @@ -233,18 +233,18 @@ protected override bool TryConvertMap(IReferenceMap referenceMap, TypeReference var elementType = _types.GetFrameworkType(elementTypeInstance, false); var dictionaryType = typeof(Dictionary<,>).MakeGenericType(typeof(string), elementType); - var dictionaryConstructor = dictionaryType.GetConstructor(new System.Type[] { }); - var dictionaryAddMethod = dictionaryType.GetMethod("Add", new [] { typeof(string), elementType }); + var dictionaryConstructor = dictionaryType.GetConstructor(new System.Type[] { })!; + var dictionaryAddMethod = dictionaryType.GetMethod("Add", new [] { typeof(string), elementType })!; var dictionary = dictionaryConstructor.Invoke(new object[] { }); if (jsonObject.ContainsKey("$jsii.map")) { - jsonObject = (JObject)jsonObject["$jsii.map"]; + jsonObject = (JObject)jsonObject["$jsii.map"]!; } foreach (JProperty property in jsonObject.Properties()) { - if (!TryConvert(elementTypeInstance, elementType, referenceMap, property.Value, out object convertedElement)) + if (!TryConvert(elementTypeInstance, elementType, referenceMap, property.Value, out object? convertedElement)) { throw new ArgumentException("Could not convert all elements of map", nameof(value)); } @@ -276,11 +276,11 @@ protected override TypeReference InferType(IReferenceMap referenceMap, object va } if (jObject.ContainsKey("$jsii.enum")) { - return new TypeReference(jObject.ToObject().FullyQualifiedName); + return new TypeReference(jObject.ToObject()!.FullyQualifiedName); } if (jObject.ContainsKey("$jsii.byref")) { - return new TypeReference(jObject.ToObject().FullyQualifiedName); + return new TypeReference(jObject.ToObject()!.FullyQualifiedName); } // At this point, we can't distinguish between a PrimitiveType.Json and a CollectionKind.Map, diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/ValueConverter.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/ValueConverter.cs index 57efca75a1..a53406a755 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/ValueConverter.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/Converters/ValueConverter.cs @@ -13,12 +13,12 @@ protected ValueConverter(ITypeCache types) _types = types ?? throw new ArgumentNullException(nameof(types)); } - protected bool TryConvert(TypeReference typeReference, System.Type type, IReferenceMap referenceMap, object value, out object result) + protected bool TryConvert(TypeReference typeReference, System.Type type, IReferenceMap referenceMap, object? value, out object? result) { return TryConvert(new OptionalValue(typeReference), type, referenceMap, value, out result); } - public bool TryConvert(IOptionalValue optionalValue, System.Type type, IReferenceMap referenceMap, object value, out object result) + public bool TryConvert(IOptionalValue? optionalValue, System.Type type, IReferenceMap referenceMap, object? value, out object? result) { if (optionalValue == null) { @@ -61,29 +61,29 @@ protected bool IsNumeric(System.Type type) typeof(double).IsAssignableFrom(type); } - protected abstract bool TryConvertVoid(object value, out object result); + protected abstract bool TryConvertVoid(object? value, out object? result); - protected abstract bool TryConvertClass(System.Type type, IReferenceMap referenceMap, object value, out object result); + protected abstract bool TryConvertClass(System.Type type, IReferenceMap referenceMap, object? value, out object? result); - protected abstract bool TryConvertEnum(object value, bool isOptional, string fullyQualifiedName, out object result); + protected abstract bool TryConvertEnum(object? value, bool isOptional, string fullyQualifiedName, out object? result); - protected abstract bool TryConvertBoolean(object value, bool isOptional, out object result); + protected abstract bool TryConvertBoolean(object? value, bool isOptional, out object? result); - protected abstract bool TryConvertDate(object value, bool isOptional, out object result); + protected abstract bool TryConvertDate(object? value, bool isOptional, out object? result); - protected abstract bool TryConvertJson(object value, out object result); + protected abstract bool TryConvertJson(object? value, out object? result); - protected abstract bool TryConvertNumber(object value, bool isOptional, out object result); + protected abstract bool TryConvertNumber(object? value, bool isOptional, out object? result); - protected abstract bool TryConvertString(object value, out object result); + protected abstract bool TryConvertString(object? value, out object? result); - protected abstract bool TryConvertArray(IReferenceMap referenceMap, TypeReference elementType, object value, out object result); + protected abstract bool TryConvertArray(IReferenceMap referenceMap, TypeReference elementType, object? value, out object? result); - protected abstract bool TryConvertMap(IReferenceMap referenceMap, TypeReference elementType, object value, out object result); + protected abstract bool TryConvertMap(IReferenceMap referenceMap, TypeReference elementType, object? value, out object? result); protected abstract TypeReference InferType(IReferenceMap referenceMap, object value); - object ConvertAny(System.Type type, IReferenceMap referenceMap, object value) + object? ConvertAny(System.Type type, IReferenceMap referenceMap, object? value) { if (value == null) { @@ -91,7 +91,7 @@ object ConvertAny(System.Type type, IReferenceMap referenceMap, object value) } TypeReference reference = InferType(referenceMap, value); - if (TryConvert(reference, type, referenceMap, value, out object result)) + if (TryConvert(reference, type, referenceMap, value, out object? result)) { return result; } @@ -99,14 +99,14 @@ object ConvertAny(System.Type type, IReferenceMap referenceMap, object value) throw new ArgumentException($"Could not convert value '{value}' with unrecognized type", nameof(value)); } - bool TryConvertCustomType(System.Type type, IReferenceMap referenceMap, object value, bool isOptional, string fullyQualifiedName, out object result) + bool TryConvertCustomType(System.Type type, IReferenceMap referenceMap, object? value, bool isOptional, string fullyQualifiedName, out object? result) { if (IsReferenceType()) { return TryConvertClass(type, referenceMap, value, out result); } - if (_types.GetEnumType(fullyQualifiedName) != null) + if (_types.TryGetEnumType(fullyQualifiedName) != null) { return TryConvertEnum(value, isOptional, fullyQualifiedName, out result); } @@ -117,13 +117,13 @@ bool TryConvertCustomType(System.Type type, IReferenceMap referenceMap, object v bool IsReferenceType() { return - _types.GetClassType(fullyQualifiedName) != null || - _types.GetInterfaceType(fullyQualifiedName) != null || - _types.GetProxyType(fullyQualifiedName) != null; + _types.TryGetClassType(fullyQualifiedName) != null || + _types.TryGetInterfaceType(fullyQualifiedName) != null || + _types.TryGetProxyType(fullyQualifiedName) != null; } } - bool TryConvertPrimitive(System.Type type, IReferenceMap referenceMap, object value, bool isOptional, PrimitiveType primitiveType, out object result) + bool TryConvertPrimitive(System.Type type, IReferenceMap referenceMap, object? value, bool isOptional, PrimitiveType primitiveType, out object? result) { switch (primitiveType) { @@ -151,7 +151,7 @@ bool TryConvertPrimitive(System.Type type, IReferenceMap referenceMap, object va } } - bool TryConvertCollection(IReferenceMap referenceMap, object value, bool isOptional, CollectionTypeReference collectionType, out object result) + bool TryConvertCollection(IReferenceMap referenceMap, object? value, bool isOptional, CollectionTypeReference collectionType, out object? result) { switch (collectionType.Kind) { @@ -164,7 +164,7 @@ bool TryConvertCollection(IReferenceMap referenceMap, object value, bool isOptio } } - bool TryConvertUnion(System.Type type, IReferenceMap referenceMap, object value, bool isOptional, UnionTypeReference unionType, out object result) + bool TryConvertUnion(System.Type type, IReferenceMap referenceMap, object? value, bool isOptional, UnionTypeReference unionType, out object? result) { foreach (var candidateType in unionType.Types) { diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IClient.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IClient.cs index 1ba3cbe055..c596e778b5 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IClient.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IClient.cs @@ -14,7 +14,7 @@ internal interface IClient LoadResponse Load(LoadRequest request); - CreateResponse Create(string fullyQualifiedName, object[] arguments = null, Override[] overrides = null, string[] interfaces = null); + CreateResponse Create(string fullyQualifiedName, object?[]? arguments = null, Override[]? overrides = null, string[]? interfaces = null); CreateResponse Create(CreateRequest request); @@ -30,23 +30,23 @@ internal interface IClient GetResponse StaticGet(StaticGetRequest request); - SetResponse Set(ObjectReference objectReference, string property, object value); + SetResponse Set(ObjectReference objectReference, string property, object? value); SetResponse Set(SetRequest request); - SetResponse StaticSet(string fullyQualifiedName, string property, object value); + SetResponse StaticSet(string fullyQualifiedName, string property, object? value); SetResponse StaticSet(StaticSetRequest request); - InvokeResponse Invoke(ObjectReference objectReference, string method, object[] arguments = null); + InvokeResponse Invoke(ObjectReference objectReference, string method, object?[]? arguments = null); InvokeResponse Invoke(InvokeRequest request); - InvokeResponse StaticInvoke(string fullyQualifiedName, string method, object[] arguments = null); + InvokeResponse StaticInvoke(string fullyQualifiedName, string method, object?[]? arguments = null); InvokeResponse StaticInvoke(StaticInvokeRequest request); - BeginResponse Begin(ObjectReference objectReference, string method, object[] arguments = null); + BeginResponse Begin(ObjectReference objectReference, string method, object?[]? arguments = null); BeginResponse Begin(BeginRequest request); @@ -58,7 +58,7 @@ internal interface IClient CallbacksResponse Callbacks(CallbacksRequest request); - CompleteResponse Complete(string callbackId, string error = null, object result = null); + CompleteResponse Complete(string callbackId, string? error = null, object? result = null); CompleteResponse Complete(CompleteRequest request); diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IJsiiRuntimeProvider.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IJsiiRuntimeProvider.cs index 42cdd4104a..3181900d38 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IJsiiRuntimeProvider.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IJsiiRuntimeProvider.cs @@ -2,6 +2,6 @@ { internal interface IJsiiRuntimeProvider { - string JsiiRuntimePath { get; } + string? JsiiRuntimePath { get; } } } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IResourceExtractor.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IResourceExtractor.cs index 5db416dcc8..ec06b385d3 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IResourceExtractor.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/IResourceExtractor.cs @@ -5,6 +5,6 @@ namespace Amazon.JSII.Runtime.Services { internal interface IResourceExtractor : IDisposable { - string ExtractResource(Assembly assembly, string resourceName, string bag = "default", string fileName = null); + string ExtractResource(Assembly assembly, string resourceName, string bag = "default", string? fileName = null); } } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ITypeCache.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ITypeCache.cs index 551bd56870..53c2dcf8a9 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ITypeCache.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ITypeCache.cs @@ -1,18 +1,41 @@ using Amazon.JSII.JsonModel.Spec; -using Type = System.Type; namespace Amazon.JSII.Runtime.Services { internal interface ITypeCache { - Type GetClassType(string fullyQualifiedName); + System.Type? TryGetClassType(string fullyQualifiedName); - Type GetEnumType(string fullyQualifiedName); + System.Type? TryGetEnumType(string fullyQualifiedName); - Type GetInterfaceType(string fullyQualifiedName); + System.Type? TryGetInterfaceType(string fullyQualifiedName); - Type GetProxyType(string fullyQualifiedName); + System.Type? TryGetProxyType(string fullyQualifiedName); + + System.Type GetClassType(string fullyQualifiedName) + { + return TryGetClassType(fullyQualifiedName) + ?? throw new JsiiException($"Unable to find class for jsii FQN \"{fullyQualifiedName}\""); + } - Type GetFrameworkType(TypeReference reference, bool isOptional); + System.Type GetEnumType(string fullyQualifiedName) + { + return TryGetEnumType(fullyQualifiedName) + ?? throw new JsiiException($"Unable to find enum for jsii FQN \"{fullyQualifiedName}\""); + } + + System.Type GetInterfaceType(string fullyQualifiedName) + { + return TryGetInterfaceType(fullyQualifiedName) + ?? throw new JsiiException($"Unable to find interface for jsii FQN \"{fullyQualifiedName}\""); + } + + System.Type GetProxyType(string fullyQualifiedName) + { + return TryGetProxyType(fullyQualifiedName) + ?? throw new JsiiException($"Unable to find proxy type for jsii FQN \"{fullyQualifiedName}\""); + } + + System.Type GetFrameworkType(TypeReference reference, bool isOptional); } } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/JsiiRuntimeProvider.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/JsiiRuntimeProvider.cs index 853379c0ca..49338810d8 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/JsiiRuntimeProvider.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/JsiiRuntimeProvider.cs @@ -24,6 +24,6 @@ public JsiiRuntimeProvider(IResourceExtractor resourceExtractor) } } - public string JsiiRuntimePath { get; } + public string? JsiiRuntimePath { get; } } } diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ReferenceMap.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ReferenceMap.cs index 90ffc33be7..120d7c7200 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ReferenceMap.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ReferenceMap.cs @@ -30,7 +30,7 @@ public void AddNativeReference(ByRefValue reference, DeputyBase nativeReference, public DeputyBase GetOrCreateNativeReference(ObjectReference reference) { - return GetOrCreateNativeReference(new ByRefValue(reference["$jsii.byref"] as string)); + return GetOrCreateNativeReference(new ByRefValue((reference["$jsii.byref"] as string)!)); } public DeputyBase GetOrCreateNativeReference(ByRefValue byRefValue) @@ -64,7 +64,7 @@ ConstructorInfo GetByRefConstructor() } BindingFlags constructorFlags = BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic; - ConstructorInfo constructorInfo = type.GetConstructor(constructorFlags, null, new[] {typeof(ByRefValue)}, null); + ConstructorInfo? constructorInfo = type.GetConstructor(constructorFlags, null, new[] {typeof(ByRefValue)}, null); if (constructorInfo == null) { throw new JsiiException($"Could not find constructor to initialize {type.FullName} with a {typeof(ByRefValue).FullName}"); diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ResourceExtractor.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ResourceExtractor.cs index 060b0d5e7c..2263f914aa 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ResourceExtractor.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ResourceExtractor.cs @@ -16,10 +16,9 @@ public ResourceExtractor(IFileSystem fileSystem) _fileSystem = fileSystem; } - public string ExtractResource(Assembly assembly, string resourceName, string bag, string fileName) + public string ExtractResource(Assembly assembly, string resourceName, string bag, string? fileName) { - string workingDirectory = null; - if (!_bags.TryGetValue(bag, out workingDirectory)) + if (!_bags.TryGetValue(bag, out var workingDirectory)) { workingDirectory = Path.Combine(Path.GetTempPath(), Path.GetRandomFileName()); _fileSystem.Directory.CreateDirectory(workingDirectory); @@ -28,8 +27,8 @@ public string ExtractResource(Assembly assembly, string resourceName, string bag var outputPath = Path.Combine(workingDirectory, fileName ?? resourceName); using (var output = _fileSystem.File.Create(outputPath)) - using (var stream = assembly.GetManifestResourceStream(resourceName)) { + using var stream = assembly.GetManifestResourceStream(resourceName); if (stream == null) { throw new JsiiException("Cannot find embedded resource: " + resourceName + " in assembly " + assembly.GetName(), null); diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ServiceContainer.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ServiceContainer.cs index e934d5f330..42e74f7bee 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ServiceContainer.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/ServiceContainer.cs @@ -7,18 +7,18 @@ namespace Amazon.JSII.Runtime.Services { - internal static class ServiceContainer + public static class ServiceContainer { private static readonly Lazy _serviceProvider = new Lazy( () => BuildServiceProvider(), LazyThreadSafetyMode.ExecutionAndPublication ); - public static IServiceProvider ServiceProviderOverride { get; set; } + public static IServiceProvider? ServiceProviderOverride { get; set; } - public static IServiceProvider ServiceProvider => ServiceProviderOverride ?? _serviceProvider.Value; + internal static IServiceProvider ServiceProvider => ServiceProviderOverride ?? _serviceProvider.Value; - public static IServiceProvider BuildServiceProvider(ILoggerFactory loggerFactoryOverride = null) + public static IServiceProvider BuildServiceProvider(ILoggerFactory? loggerFactoryOverride = null) { IServiceCollection serviceCollection = new ServiceCollection(); diff --git a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/TypeCache.cs b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/TypeCache.cs index d495d65145..e7f6e2c168 100644 --- a/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/TypeCache.cs +++ b/packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/TypeCache.cs @@ -29,48 +29,43 @@ public TypeCache(ILoggerFactory loggerFactory) _types = new Dictionary(); } - public Type GetClassType(string fullyQualifiedName) + public Type? TryGetClassType(string fullyQualifiedName) { - return GetType(fullyQualifiedName); + return TryGetType(fullyQualifiedName); } - public Type GetEnumType(string fullyQualifiedName) + public Type? TryGetEnumType(string fullyQualifiedName) { - return GetType(fullyQualifiedName); + return TryGetType(fullyQualifiedName); } - public Type GetInterfaceType(string fullyQualifiedName) + public Type? TryGetInterfaceType(string fullyQualifiedName) { - return GetType(fullyQualifiedName); + return TryGetType(fullyQualifiedName); } - public Type GetProxyType(string fullyQualifiedName) + public Type? TryGetProxyType(string fullyQualifiedName) { - return GetType(fullyQualifiedName + ProxySuffix); + return TryGetType(fullyQualifiedName + ProxySuffix); } - public Type GetFrameworkType(IOptionalValue instance) - { - return GetFrameworkType(instance?.Type, instance?.IsOptional ?? false); - } - public Type GetFrameworkType(TypeReference typeReference, bool isOptional) { if (typeReference.FullyQualifiedName != null) { - Type classType = GetClassType(typeReference.FullyQualifiedName); + var classType = TryGetClassType(typeReference.FullyQualifiedName); if (classType != null) { return classType; } - Type enumType = GetEnumType(typeReference.FullyQualifiedName); + var enumType = TryGetEnumType(typeReference.FullyQualifiedName); if (enumType != null) { return MakeNullableIfOptional(enumType); } - Type interfaceType = GetInterfaceType(typeReference.FullyQualifiedName); + var interfaceType = TryGetInterfaceType(typeReference.FullyQualifiedName); if (interfaceType != null) { return interfaceType; @@ -128,14 +123,14 @@ Type MakeNullableIfOptional(Type type) } } - Type GetType(string fullyQualifiedName) where T : JsiiTypeAttributeBase + private Type? TryGetType(string fullyQualifiedName) where T : JsiiTypeAttributeBase { if (fullyQualifiedName == "Object") { return typeof(AnonymousObject); } - Type type = null; + Type? type = null; lock (_lock) { @@ -147,9 +142,7 @@ Type GetType(string fullyQualifiedName) where T : JsiiTypeAttributeBase } } - return type?.GetCustomAttribute() == null ? - null : - type; + return type?.GetCustomAttribute() == null ? null : type; } void Refresh() @@ -158,9 +151,9 @@ void Refresh() Assembly[] assemblies = AppDomain.CurrentDomain.GetAssemblies(); foreach (Assembly assembly in assemblies) { - if (!_assemblies.Contains(assembly.FullName)) + if (!_assemblies.Contains(assembly.FullName!)) { - _assemblies.Add(assembly.FullName); + _assemblies.Add(assembly.FullName!); CacheTypes(assembly); } } @@ -192,7 +185,7 @@ void CacheTypes(Assembly assembly) } } - IEnumerable GetTypes(Assembly assembly) + IEnumerable? GetTypes(Assembly assembly) { try { @@ -201,9 +194,12 @@ IEnumerable GetTypes(Assembly assembly) catch (ReflectionTypeLoadException e) { _logger.LogWarning("ReflectionTypeLoadException while searching for JSII types. Loader exceptions:"); - foreach (Exception loaderException in e.LoaderExceptions) + foreach (Exception? loaderException in e.LoaderExceptions ?? new Exception?[] {}) { - _logger.LogWarning(loaderException.ToString()); + if (loaderException != null) + { + _logger.LogWarning(loaderException.ToString()); + } } return e.Types; diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts index 346e1157bc..5fc04d583e 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnetgenerator.ts @@ -186,8 +186,8 @@ export class DotNetGenerator extends Generator { } // Specifying that a type is nullable is only required for primitive value types - const isOptionalPrimitive = this.isOptionalPrimitive(prop) ? '?' : ''; - this.code.openBlock(`${propType}${isOptionalPrimitive} ${propName}`); + const isOptional = prop.optional ? '?' : ''; + this.code.openBlock(`${propType}${isOptional} ${propName}`); if (prop.optional) { this.code.openBlock('get'); @@ -265,7 +265,8 @@ export class DotNetGenerator extends Generator { // Abstract classes have protected constructors. const visibility = cls.abstract ? 'protected' : 'public'; - this.code.openBlock(`${visibility} ${className}(${parametersDefinition}): base(new DeputyProps(new object[]{${parametersBase}}))`); + const hasOptional = initializer.parameters?.find(param => param.optional) != null ? '?' : ''; + this.code.openBlock(`${visibility} ${className}(${parametersDefinition}): base(new DeputyProps(new object${hasOptional}[]{${parametersBase}}))`); this.code.closeBlock(); this.code.line(); } @@ -397,7 +398,8 @@ export class DotNetGenerator extends Generator { } const access = this.renderAccessLevel(method); const methodName = this.nameutils.convertMethodName(method.name); - const signature = `${returnType} ${methodName}(${this.renderMethodParameters(method)})`; + const isOptional = method.returns && method.returns.optional ? '?' : ''; + const signature = `${returnType}${isOptional} ${methodName}(${this.renderMethodParameters(method)})`; this.dotnetDocGenerator.emitDocs(method); this.dotnetRuntimeGenerator.emitAttributesForMethod(cls, method/*, emitForProxyOrDatatype*/); @@ -478,7 +480,7 @@ export class DotNetGenerator extends Generator { let type = this.typeresolver.toDotNetType(p.type); if (p.optional) { optionalKeyword = ' = null'; - if (this.isOptionalPrimitive(p)) { + if (p.optional) { optionalPrimitive = '?'; } @@ -493,27 +495,6 @@ export class DotNetGenerator extends Generator { return params.join(', '); } - private isOptionalPrimitive(optionalValue: spec.OptionalValue | undefined): boolean { - if (!optionalValue || !optionalValue.optional) { - return false; - } - - // If the optional type is an enum then we need to flag it as ? - const typeref = optionalValue.type as spec.NamedTypeReference; - let isOptionalEnum = false; - if (typeref && typeref.fqn) { - const type = this.findType(typeref.fqn); - isOptionalEnum = type.kind === spec.TypeKind.Enum; - } - - return (spec.isPrimitiveTypeReference(optionalValue.type) - // In .NET, string or object is a reference type, and can be nullable - && optionalValue.type.primitive !== spec.PrimitiveType.String - && optionalValue.type.primitive !== spec.PrimitiveType.Any - && optionalValue.type.primitive !== spec.PrimitiveType.Json) // Json is not a primitive in .NET - || isOptionalEnum; - } - /** * Emits an interface proxy for an interface or an abstract class. */ @@ -558,6 +539,13 @@ export class DotNetGenerator extends Generator { const namespace = ifc.namespace ? `${this.assembly.targets!.dotnet!.namespace}.${ifc.namespace}` : this.assembly.targets!.dotnet!.namespace; const isNested = this.isNested(ifc); this.openFileIfNeeded(name, namespace, isNested); + + if (ifc.properties?.find(prop => !prop.optional) != null) { + // We don't want to be annoyed by the lack of initialization of non-nullable fields in this case. + this.code.line('#pragma warning disable CS8618'); + this.code.line(); + } + this.dotnetDocGenerator.emitDocs(ifc); const suffix = `: ${this.typeresolver.toNativeFqn(ifc.fqn)}`; this.dotnetRuntimeGenerator.emitAttributesForInterfaceDatatype(ifc); @@ -687,8 +675,8 @@ export class DotNetGenerator extends Generator { } const propTypeFQN = this.typeresolver.toDotNetType(prop.type); - const isOptionalPrimitive = this.isOptionalPrimitive(prop) ? '?' : ''; - const statement = `${access} ${isAbstractKeyword}${isVirtualKeyWord}${isOverrideKeyWord}${staticKeyWord}${propTypeFQN}${isOptionalPrimitive} ${propName}`; + const isOptional = prop.optional ? '?' : ''; + const statement = `${access} ${isAbstractKeyword}${isVirtualKeyWord}${isOverrideKeyWord}${staticKeyWord}${propTypeFQN}${isOptional} ${propName}`; this.code.openBlock(statement); // Emit getters @@ -696,9 +684,9 @@ export class DotNetGenerator extends Generator { this.code.line('get;'); } else { if (prop.static) { - this.code.line(`get => GetStaticProperty<${propTypeFQN}>(typeof(${className}));`); + this.code.line(`get => GetStaticProperty<${propTypeFQN}${isOptional}>(typeof(${className}));`); } else { - this.code.line(`get => GetInstanceProperty<${propTypeFQN}${isOptionalPrimitive}>();`); + this.code.line(`get => GetInstanceProperty<${propTypeFQN}${isOptional}>();`); } } @@ -770,6 +758,11 @@ export class DotNetGenerator extends Generator { this.code.line('using Amazon.JSII.Runtime.Deputy;'); this.code.line(); } + + // Suppress warnings about missing XMLDoc, Obsolete inconsistencies + this.code.line('#pragma warning disable CS0672,CS0809,CS1591'); + this.code.line(); + this.code.openBlock(`namespace ${namespace}`); } diff --git a/packages/jsii-pacmak/lib/targets/dotnet/dotnetruntimegenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/dotnetruntimegenerator.ts index cd5274edc7..9602875394 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet/dotnetruntimegenerator.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet/dotnetruntimegenerator.ts @@ -142,7 +142,7 @@ export class DotNetRuntimeGenerator { const isStatic = method.static ? 'Static' : 'Instance'; const returns = method.returns ? '' : 'Void'; const invokeMethodName = method.returns ? `return Invoke${isStatic}${returns}Method` : `Invoke${isStatic}${returns}Method`; - const returnType = method.returns ? `<${this.typeresolver.toDotNetType(method.returns.type)}>` : ''; + const returnType = method.returns ? `<${this.typeresolver.toDotNetType(method.returns.type)}${method.returns.optional ? '?' : ''}>` : ''; const typeofStatement = method.static ? `typeof(${className}), ` : ''; const paramTypes = new Array(); const params = new Array(); @@ -152,7 +152,8 @@ export class DotNetRuntimeGenerator { params.push(this.nameutils.convertParameterName(param.name)); } } - return `${invokeMethodName}${returnType}(${typeofStatement}new System.Type[]{${paramTypes.join(', ')}}, new object[]{${params.join(', ')}});`; + const hasOptional = method.parameters?.find(param => param.optional) != null ? '?' : ''; + return `${invokeMethodName}${returnType}(${typeofStatement}new System.Type[]{${paramTypes.join(', ')}}, new object${hasOptional}[]{${params.join(', ')}});`; } /** diff --git a/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts index e372267753..c4897971df 100644 --- a/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts +++ b/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts @@ -85,6 +85,7 @@ export class FileGenerator { propertyGroup.ele('GeneratePackageOnBuild', 'true'); propertyGroup.ele('IncludeSymbols', 'true'); propertyGroup.ele('IncludeSource', 'true'); + propertyGroup.ele('Nullable', 'enable'); propertyGroup.ele('SymbolPackageFormat', 'snupkg'); propertyGroup.ele('TargetFramework', TARGET_FRAMEWORK); diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj index 6f9c453990..0943deac72 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj @@ -17,6 +17,7 @@ true true true + enable snupkg netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterface.cs index 3a4b4dace1..8b04d8e412 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace { [JsiiInterface(nativeType: typeof(IVeryBaseInterface), fullyQualifiedName: "@scope/jsii-calc-base-of-base.IVeryBaseInterface")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterfaceProxy.cs index af20ecc140..b184490c98 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace { [JsiiTypeProxy(nativeType: typeof(IVeryBaseInterface), fullyQualifiedName: "@scope/jsii-calc-base-of-base.IVeryBaseInterface")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseProps.cs index d0af7ce17b..6d05b140ea 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseProps.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace { [JsiiInterface(nativeType: typeof(IVeryBaseProps), fullyQualifiedName: "@scope/jsii-calc-base-of-base.VeryBaseProps")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Internal/DependencyResolution/Anchor.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Internal/DependencyResolution/Anchor.cs index 5cd3ec3cb0..b9f95337e7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Internal/DependencyResolution/Anchor.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Internal/DependencyResolution/Anchor.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Internal.DependencyResolution { public sealed class Anchor diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Very.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Very.cs index ad53ae43e2..5581095168 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Very.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Very.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace { [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very), fullyQualifiedName: "@scope/jsii-calc-base-of-base.Very")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBaseProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBaseProps.cs index e3129f5e31..156e210c43 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBaseProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBaseProps.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace { + #pragma warning disable CS8618 + [JsiiByValue(fqn: "@scope/jsii-calc-base-of-base.VeryBaseProps")] public class VeryBaseProps : Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.IVeryBaseProps { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBasePropsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBasePropsProxy.cs index cf0420f2c6..96efe8a55e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBasePropsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBasePropsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace { [JsiiTypeProxy(nativeType: typeof(IVeryBaseProps), fullyQualifiedName: "@scope/jsii-calc-base-of-base.VeryBaseProps")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj index eb1589d629..b7c9c7416b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj @@ -17,6 +17,7 @@ true true true + enable snupkg netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/Base.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/Base.cs index 637c1b11fb..7c246b6788 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/Base.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/Base.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace { /// A base class. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BaseProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BaseProps.cs index d8b531c3a6..2e16c03730 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BaseProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BaseProps.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace { + #pragma warning disable CS8618 + [JsiiByValue(fqn: "@scope/jsii-calc-base.BaseProps")] public class BaseProps : Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.IBaseProps { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BasePropsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BasePropsProxy.cs index 72db0f04ec..87883eb6b8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BasePropsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BasePropsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace { [JsiiTypeProxy(nativeType: typeof(IBaseProps), fullyQualifiedName: "@scope/jsii-calc-base.BaseProps")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BaseProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BaseProxy.cs index 31c2ab627b..d55a255ce7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BaseProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/BaseProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace { /// A base class. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseInterface.cs index b54ad05208..133a9026ca 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace { [JsiiInterface(nativeType: typeof(IBaseInterface), fullyQualifiedName: "@scope/jsii-calc-base.IBaseInterface")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseInterfaceProxy.cs index 150cd77906..34023d96d3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace { [JsiiTypeProxy(nativeType: typeof(IBaseInterface), fullyQualifiedName: "@scope/jsii-calc-base.IBaseInterface")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseProps.cs index 802b27ca7b..7bfd86579c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/IBaseProps.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace { [JsiiInterface(nativeType: typeof(IBaseProps), fullyQualifiedName: "@scope/jsii-calc-base.BaseProps")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/Internal/DependencyResolution/Anchor.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/Internal/DependencyResolution/Anchor.cs index 4a5728b15d..c15eade3ea 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/Internal/DependencyResolution/Anchor.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseNamespace/Internal/DependencyResolution/Anchor.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.BaseNamespace.Internal.DependencyResolution { public sealed class Anchor diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj index dd99e4f551..b5ad472bbd 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj @@ -17,6 +17,7 @@ true true true + enable snupkg netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/EnumFromScopedModule.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/EnumFromScopedModule.cs index 276c164875..d8fe0d6101 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/EnumFromScopedModule.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/EnumFromScopedModule.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Check that enums from \@scoped packages can be references. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDoublable.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDoublable.cs index 5b8b253052..0b72de37a3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDoublable.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDoublable.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// The general contract for a concrete number. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDoublableProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDoublableProxy.cs index df1834c494..0397f3d6a6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDoublableProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IDoublableProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// The general contract for a concrete number. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IFriendly.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IFriendly.cs index 7b848e564b..3d6a4a1dc2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IFriendly.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IFriendly.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Applies to classes that are considered friendly. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IFriendlyProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IFriendlyProxy.cs index a0f0eb8aa7..f326f6bec1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IFriendlyProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IFriendlyProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Applies to classes that are considered friendly. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IMyFirstStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IMyFirstStruct.cs index 51a80a1ce2..bbcfb4b507 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IMyFirstStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IMyFirstStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// This is the first struct we have created in jsii. @@ -38,7 +40,7 @@ string Astring [JsiiProperty(name: "firstOptional", typeJson: "{\"collection\":{\"elementtype\":{\"primitive\":\"string\"},\"kind\":\"array\"}}", isOptional: true)] [System.Obsolete()] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string[] FirstOptional + string[]? FirstOptional { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IStructWithOnlyOptionals.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IStructWithOnlyOptionals.cs index e241e750da..e34ad6d126 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IStructWithOnlyOptionals.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IStructWithOnlyOptionals.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// This is a struct with only optional properties. @@ -17,7 +19,7 @@ public interface IStructWithOnlyOptionals [JsiiProperty(name: "optional1", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [System.Obsolete()] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Optional1 + string? Optional1 { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IThreeLevelsInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IThreeLevelsInterface.cs index fc1984444f..f7f1d12c86 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IThreeLevelsInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IThreeLevelsInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Interface that inherits from packages 2 levels up the tree. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IThreeLevelsInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IThreeLevelsInterfaceProxy.cs index b765e76646..1387748f36 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IThreeLevelsInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/IThreeLevelsInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Interface that inherits from packages 2 levels up the tree. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Internal/DependencyResolution/Anchor.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Internal/DependencyResolution/Anchor.cs index 19be6786f5..a69be45550 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Internal/DependencyResolution/Anchor.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Internal/DependencyResolution/Anchor.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.Internal.DependencyResolution { public sealed class Anchor diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/MyFirstStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/MyFirstStruct.cs index 013e29ff19..5e32c5bd76 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/MyFirstStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/MyFirstStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { + #pragma warning disable CS8618 + /// This is the first struct we have created in jsii. /// /// Stability: Deprecated @@ -39,7 +43,7 @@ public string Astring [JsiiOptional] [JsiiProperty(name: "firstOptional", typeJson: "{\"collection\":{\"elementtype\":{\"primitive\":\"string\"},\"kind\":\"array\"}}", isOptional: true, isOverride: true)] [System.Obsolete()] - public string[] FirstOptional + public string[]? FirstOptional { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/MyFirstStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/MyFirstStructProxy.cs index bb39ad7c5d..4ce1eab9f0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/MyFirstStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/MyFirstStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// This is the first struct we have created in jsii. @@ -42,9 +44,9 @@ public string Astring [JsiiOptional] [JsiiProperty(name: "firstOptional", typeJson: "{\"collection\":{\"elementtype\":{\"primitive\":\"string\"},\"kind\":\"array\"}}", isOptional: true)] [System.Obsolete()] - public string[] FirstOptional + public string[]? FirstOptional { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Number.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Number.cs index 12955c638a..00456a3b2a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Number.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Number.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Represents a concrete number. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Operation.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Operation.cs index 3ba20f90ae..e8ec34fbab 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Operation.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Operation.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Represents an operation on values. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/OperationProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/OperationProxy.cs index 9714b432c8..961231dd4e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/OperationProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/OperationProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Represents an operation on values. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/StructWithOnlyOptionals.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/StructWithOnlyOptionals.cs index ab30935098..6c98d38d00 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/StructWithOnlyOptionals.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/StructWithOnlyOptionals.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// This is a struct with only optional properties. @@ -16,7 +18,7 @@ public class StructWithOnlyOptionals : Amazon.JSII.Tests.CalculatorNamespace.Lib [JsiiOptional] [JsiiProperty(name: "optional1", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] [System.Obsolete()] - public string Optional1 + public string? Optional1 { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/StructWithOnlyOptionalsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/StructWithOnlyOptionalsProxy.cs index 895adc0ca9..71da5a9773 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/StructWithOnlyOptionalsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/StructWithOnlyOptionalsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// This is a struct with only optional properties. @@ -21,9 +23,9 @@ private StructWithOnlyOptionalsProxy(ByRefValue reference): base(reference) [JsiiOptional] [JsiiProperty(name: "optional1", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [System.Obsolete()] - public string Optional1 + public string? Optional1 { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/ValueProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/ValueProxy.cs index e8a7fbd579..8f028413aa 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/ValueProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/ValueProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Abstract class which represents a numeric value. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Value_.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Value_.cs index f8660293b8..959732b439 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Value_.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon/JSII/Tests/CalculatorNamespace/LibNamespace/Value_.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.LibNamespace { /// Abstract class which represents a numeric value. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj index 59cc8277b1..db8a01df9f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj @@ -19,6 +19,7 @@ true true true + enable snupkg netcoreapp3.1 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClass.cs index 524e4f2289..674cac8f98 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassBase.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassBase.cs index 28560ad4be..04bb8920c1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassBase.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassBase.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassBaseProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassBaseProxy.cs index 68a14e9efc..12666dca56 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassBaseProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassBaseProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassProxy.cs index f14b13bcf6..16218d84ec 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassReturner.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassReturner.cs index 5c85d0210d..c6b090cfca 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassReturner.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractClassReturner.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractSuite.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractSuite.cs index 9ae43399f5..265cc49202 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractSuite.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractSuite.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Ensures abstract members implementations correctly register overrides in various languages. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractSuiteProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractSuiteProxy.cs index f934369f95..40d7a376e7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractSuiteProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AbstractSuiteProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Ensures abstract members implementations correctly register overrides in various languages. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Add.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Add.cs index 79c938160b..21afd52304 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Add.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Add.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// The "+" binary operation. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllTypes.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllTypes.cs index 86744ecdfa..2c19f2ae0f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllTypes.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllTypes.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This class includes property for all types supported by jsii. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllTypesEnum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllTypesEnum.cs index c3b8cb2167..f02269efed 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllTypesEnum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllTypesEnum.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllowedMethodNames.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllowedMethodNames.cs index 305f206242..bc997d179b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllowedMethodNames.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AllowedMethodNames.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AmbiguousParameters.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AmbiguousParameters.cs index 06841034f5..7d8a8b3dee 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AmbiguousParameters.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AmbiguousParameters.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AnonymousImplementationProvider.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AnonymousImplementationProvider.cs index 149f838e6c..30b741eff4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AnonymousImplementationProvider.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AnonymousImplementationProvider.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AsyncVirtualMethods.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AsyncVirtualMethods.cs index 1c7db20090..111842b88f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AsyncVirtualMethods.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AsyncVirtualMethods.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AugmentableClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AugmentableClass.cs index 1fa12a6269..8014391671 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AugmentableClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/AugmentableClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseJsii976.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseJsii976.cs index f70be89ab5..ddab3c0b59 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseJsii976.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseJsii976.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Bell.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Bell.cs index 760329b9f8..1422b6b179 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Bell.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Bell.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BinaryOperation.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BinaryOperation.cs index e41074fa5f..628e779eb5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BinaryOperation.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BinaryOperation.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Represents an operation with two operands. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BinaryOperationProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BinaryOperationProxy.cs index 666dba4f56..7873bec4fd 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BinaryOperationProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/BinaryOperationProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Represents an operation with two operands. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Calculator.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Calculator.cs index 3389d4448d..448c28e32f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Calculator.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Calculator.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// A calculator which maintains a current value and allows adding operations. @@ -33,7 +35,7 @@ public class Calculator : Amazon.JSII.Tests.CalculatorNamespace.composition.Comp /// /// Stability: Experimental /// - public Calculator(Amazon.JSII.Tests.CalculatorNamespace.ICalculatorProps props = null): base(new DeputyProps(new object[]{props})) + public Calculator(Amazon.JSII.Tests.CalculatorNamespace.ICalculatorProps? props = null): base(new DeputyProps(new object?[]{props})) { } @@ -160,9 +162,9 @@ public virtual double? MaxValue /// [JsiiOptional] [JsiiProperty(name: "unionProperty", typeJson: "{\"union\":{\"types\":[{\"fqn\":\"jsii-calc.Add\"},{\"fqn\":\"jsii-calc.Multiply\"},{\"fqn\":\"jsii-calc.Power\"}]}}", isOptional: true)] - public virtual object UnionProperty + public virtual object? UnionProperty { - get => GetInstanceProperty(); + get => GetInstanceProperty(); set => SetInstanceProperty(value); } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/CalculatorProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/CalculatorProps.cs index 4f18fcb317..d1c874f084 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/CalculatorProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/CalculatorProps.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Properties for Calculator. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/CalculatorPropsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/CalculatorPropsProxy.cs index 611dc8d779..f4add959f6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/CalculatorPropsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/CalculatorPropsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Properties for Calculator. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ChildStruct982.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ChildStruct982.cs index 77875ccd54..1c27bda562 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ChildStruct982.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ChildStruct982.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ChildStruct982Proxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ChildStruct982Proxy.cs index 6e7062a181..e54993d05a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ChildStruct982Proxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ChildStruct982Proxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassThatImplementsTheInternalInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassThatImplementsTheInternalInterface.cs index adcfc33e88..1e95857ca2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassThatImplementsTheInternalInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassThatImplementsTheInternalInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassThatImplementsThePrivateInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassThatImplementsThePrivateInterface.cs index 84631cb92f..d96eeb2564 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassThatImplementsThePrivateInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassThatImplementsThePrivateInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithCollections.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithCollections.cs index 85f341ef12..1253a83880 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithCollections.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithCollections.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithDocs.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithDocs.cs index c8b31cf664..04b2fc29e1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithDocs.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithDocs.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This class has docs. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithJavaReservedWords.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithJavaReservedWords.cs index 87c5ce0395..32d8bf514c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithJavaReservedWords.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithJavaReservedWords.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithMutableObjectLiteralProperty.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithMutableObjectLiteralProperty.cs index c9f1519d50..75655eff04 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithMutableObjectLiteralProperty.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithMutableObjectLiteralProperty.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithPrivateConstructorAndAutomaticProperties.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithPrivateConstructorAndAutomaticProperties.cs index 07b73e19f3..09263ba3f4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithPrivateConstructorAndAutomaticProperties.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ClassWithPrivateConstructorAndAutomaticProperties.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Class that implements interface properties automatically, but using a private constructor. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJackson.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJackson.cs index ec73b34ece..a74b653a5a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJackson.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJackson.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This tries to confuse Jackson by having overloaded property setters. @@ -48,9 +50,9 @@ public static Amazon.JSII.Tests.CalculatorNamespace.IConfusingToJacksonStruct Ma /// [JsiiOptional] [JsiiProperty(name: "unionProperty", typeJson: "{\"union\":{\"types\":[{\"fqn\":\"@scope/jsii-calc-lib.IFriendly\"},{\"collection\":{\"elementtype\":{\"union\":{\"types\":[{\"fqn\":\"@scope/jsii-calc-lib.IFriendly\"},{\"fqn\":\"jsii-calc.AbstractClass\"}]}},\"kind\":\"array\"}}]}}", isOptional: true)] - public virtual object UnionProperty + public virtual object? UnionProperty { - get => GetInstanceProperty(); + get => GetInstanceProperty(); set => SetInstanceProperty(value); } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJacksonStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJacksonStruct.cs index 10abe95267..931605685f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJacksonStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJacksonStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -13,7 +15,7 @@ public class ConfusingToJacksonStruct : Amazon.JSII.Tests.CalculatorNamespace.IC /// [JsiiOptional] [JsiiProperty(name: "unionProperty", typeJson: "{\"union\":{\"types\":[{\"fqn\":\"@scope/jsii-calc-lib.IFriendly\"},{\"collection\":{\"elementtype\":{\"union\":{\"types\":[{\"fqn\":\"@scope/jsii-calc-lib.IFriendly\"},{\"fqn\":\"jsii-calc.AbstractClass\"}]}},\"kind\":\"array\"}}]}}", isOptional: true, isOverride: true)] - public object UnionProperty + public object? UnionProperty { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJacksonStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJacksonStructProxy.cs index d1a6ac84bc..49c24131e4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJacksonStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConfusingToJacksonStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -17,9 +19,9 @@ private ConfusingToJacksonStructProxy(ByRefValue reference): base(reference) /// [JsiiOptional] [JsiiProperty(name: "unionProperty", typeJson: "{\"union\":{\"types\":[{\"fqn\":\"@scope/jsii-calc-lib.IFriendly\"},{\"collection\":{\"elementtype\":{\"union\":{\"types\":[{\"fqn\":\"@scope/jsii-calc-lib.IFriendly\"},{\"fqn\":\"jsii-calc.AbstractClass\"}]}},\"kind\":\"array\"}}]}}", isOptional: true)] - public object UnionProperty + public object? UnionProperty { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConstructorPassesThisOut.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConstructorPassesThisOut.cs index 1f0a8552af..33d0c74c81 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConstructorPassesThisOut.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConstructorPassesThisOut.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Constructors.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Constructors.cs index 4f35fb273d..55e7618385 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Constructors.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Constructors.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumePureInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumePureInterface.cs index 97bfd04e32..409d7b7445 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumePureInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumePureInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumerCanRingBell.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumerCanRingBell.cs index ad62072985..693e45d5e3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumerCanRingBell.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumerCanRingBell.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Test calling back to consumers that implement interfaces. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumersOfThisCrazyTypeSystem.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumersOfThisCrazyTypeSystem.cs index f7c36255a2..ce7c6630f5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumersOfThisCrazyTypeSystem.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ConsumersOfThisCrazyTypeSystem.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DataRenderer.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DataRenderer.cs index e3c19d311b..6710b1a168 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DataRenderer.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DataRenderer.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies proper type handling through dynamic overrides. @@ -34,9 +36,9 @@ protected DataRenderer(DeputyProps props): base(props) /// Stability: Experimental /// [JsiiMethod(name: "render", returnsJson: "{\"type\":{\"primitive\":\"string\"}}", parametersJson: "[{\"name\":\"data\",\"optional\":true,\"type\":{\"fqn\":\"@scope/jsii-calc-lib.MyFirstStruct\"}}]")] - public virtual string Render(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.IMyFirstStruct data = null) + public virtual string Render(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.IMyFirstStruct? data = null) { - return InvokeInstanceMethod(new System.Type[]{typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.IMyFirstStruct)}, new object[]{data}); + return InvokeInstanceMethod(new System.Type[]{typeof(Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.IMyFirstStruct)}, new object?[]{data}); } /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DefaultedConstructorArgument.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DefaultedConstructorArgument.cs index d4614255af..09c247d989 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DefaultedConstructorArgument.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DefaultedConstructorArgument.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -11,7 +13,7 @@ public class DefaultedConstructorArgument : DeputyBase /// /// Stability: Experimental /// - public DefaultedConstructorArgument(double? arg1 = null, string arg2 = null, System.DateTime? arg3 = null): base(new DeputyProps(new object[]{arg1, arg2, arg3})) + public DefaultedConstructorArgument(double? arg1 = null, string? arg2 = null, System.DateTime? arg3 = null): base(new DeputyProps(new object?[]{arg1, arg2, arg3})) { } @@ -52,9 +54,9 @@ public virtual System.DateTime Arg3 /// [JsiiOptional] [JsiiProperty(name: "arg2", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public virtual string Arg2 + public virtual string? Arg2 { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Demonstrate982.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Demonstrate982.cs index bf0a1bf80a..58462c9962 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Demonstrate982.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Demonstrate982.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// 1. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedClass.cs index e5770aeab5..755679743a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -13,7 +15,7 @@ public class DeprecatedClass : DeputyBase /// Stability: Deprecated /// [System.Obsolete("this constructor is \"just\" okay")] - public DeprecatedClass(string readonlyString, double? mutableNumber = null): base(new DeputyProps(new object[]{readonlyString, mutableNumber})) + public DeprecatedClass(string readonlyString, double? mutableNumber = null): base(new DeputyProps(new object?[]{readonlyString, mutableNumber})) { } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedEnum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedEnum.cs index 0d57ca7254..bac1794583 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedEnum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedEnum.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedStruct.cs index b590d6341c..41bdd5203a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Deprecated /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedStructProxy.cs index 3430a545df..e09c590c3d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DeprecatedStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedClassHasNoProperties/Base.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedClassHasNoProperties/Base.cs index 90c816bed5..a4bdb00ecd 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedClassHasNoProperties/Base.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedClassHasNoProperties/Base.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.DerivedClassHasNoProperties { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedClassHasNoProperties/Derived.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedClassHasNoProperties/Derived.cs index 6b87db82aa..a15eaf9776 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedClassHasNoProperties/Derived.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedClassHasNoProperties/Derived.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.DerivedClassHasNoProperties { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedStruct.cs index a6aa8476ed..3ebd040b64 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// A struct which derives from another struct. /// /// Stability: Experimental @@ -46,7 +50,7 @@ public Amazon.JSII.Tests.CalculatorNamespace.DoubleTrouble NonPrimitive /// [JsiiOptional] [JsiiProperty(name: "anotherOptional", typeJson: "{\"collection\":{\"elementtype\":{\"fqn\":\"@scope/jsii-calc-lib.Value\"},\"kind\":\"map\"}}", isOptional: true, isOverride: true)] - public System.Collections.Generic.IDictionary AnotherOptional + public System.Collections.Generic.IDictionary? AnotherOptional { get; set; @@ -57,7 +61,7 @@ public Amazon.JSII.Tests.CalculatorNamespace.DoubleTrouble NonPrimitive /// [JsiiOptional] [JsiiProperty(name: "optionalAny", typeJson: "{\"primitive\":\"any\"}", isOptional: true, isOverride: true)] - public object OptionalAny + public object? OptionalAny { get; set; @@ -68,7 +72,7 @@ public object OptionalAny /// [JsiiOptional] [JsiiProperty(name: "optionalArray", typeJson: "{\"collection\":{\"elementtype\":{\"primitive\":\"string\"},\"kind\":\"array\"}}", isOptional: true, isOverride: true)] - public string[] OptionalArray + public string[]? OptionalArray { get; set; @@ -104,7 +108,7 @@ public string Astring [JsiiOptional] [JsiiProperty(name: "firstOptional", typeJson: "{\"collection\":{\"elementtype\":{\"primitive\":\"string\"},\"kind\":\"array\"}}", isOptional: true, isOverride: true)] [System.Obsolete()] - public string[] FirstOptional + public string[]? FirstOptional { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedStructProxy.cs index 17c07fc5b2..d73f819aa6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DerivedStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// A struct which derives from another struct. @@ -47,9 +49,9 @@ public Amazon.JSII.Tests.CalculatorNamespace.DoubleTrouble NonPrimitive /// [JsiiOptional] [JsiiProperty(name: "anotherOptional", typeJson: "{\"collection\":{\"elementtype\":{\"fqn\":\"@scope/jsii-calc-lib.Value\"},\"kind\":\"map\"}}", isOptional: true)] - public System.Collections.Generic.IDictionary AnotherOptional + public System.Collections.Generic.IDictionary? AnotherOptional { - get => GetInstanceProperty>(); + get => GetInstanceProperty?>(); } /// @@ -57,9 +59,9 @@ public Amazon.JSII.Tests.CalculatorNamespace.DoubleTrouble NonPrimitive /// [JsiiOptional] [JsiiProperty(name: "optionalAny", typeJson: "{\"primitive\":\"any\"}", isOptional: true)] - public object OptionalAny + public object? OptionalAny { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } /// @@ -67,9 +69,9 @@ public object OptionalAny /// [JsiiOptional] [JsiiProperty(name: "optionalArray", typeJson: "{\"collection\":{\"elementtype\":{\"primitive\":\"string\"},\"kind\":\"array\"}}", isOptional: true)] - public string[] OptionalArray + public string[]? OptionalArray { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } /// An awesome number value. @@ -100,9 +102,9 @@ public string Astring [JsiiOptional] [JsiiProperty(name: "firstOptional", typeJson: "{\"collection\":{\"elementtype\":{\"primitive\":\"string\"},\"kind\":\"array\"}}", isOptional: true)] [System.Obsolete()] - public string[] FirstOptional + public string[]? FirstOptional { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceBaseLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceBaseLevelStruct.cs index f06d4a5dd9..18964efa05 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceBaseLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceBaseLevelStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceBaseLevelStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceBaseLevelStructProxy.cs index cb694c3901..2d3b621874 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceBaseLevelStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceBaseLevelStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceFirstMidLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceFirstMidLevelStruct.cs index a11d5300a4..e436e3e1e0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceFirstMidLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceFirstMidLevelStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceFirstMidLevelStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceFirstMidLevelStructProxy.cs index d5aec41da5..aa831688a5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceFirstMidLevelStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceFirstMidLevelStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceSecondMidLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceSecondMidLevelStruct.cs index 04469c4586..ef8d735f16 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceSecondMidLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceSecondMidLevelStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceSecondMidLevelStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceSecondMidLevelStructProxy.cs index d07476ac11..ff88d769b6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceSecondMidLevelStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceSecondMidLevelStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceTopLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceTopLevelStruct.cs index 96812b9dbe..16435c8c60 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceTopLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceTopLevelStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceTopLevelStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceTopLevelStructProxy.cs index 722c91515e..b4c89fc547 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceTopLevelStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DiamondInheritanceTopLevelStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DisappointingCollectionSource.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DisappointingCollectionSource.cs index 47c8dfae9b..bef36a3fc8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DisappointingCollectionSource.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DisappointingCollectionSource.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that null/undefined can be returned for optional collections. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoNotOverridePrivates.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoNotOverridePrivates.cs index 4a6b9a1619..84599175cf 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoNotOverridePrivates.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoNotOverridePrivates.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoNotRecognizeAnyAsOptional.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoNotRecognizeAnyAsOptional.cs index 94d20bdf93..bd4f50f852 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoNotRecognizeAnyAsOptional.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoNotRecognizeAnyAsOptional.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// jsii#284: do not recognize "any" as an optional argument. @@ -31,9 +33,9 @@ protected DoNotRecognizeAnyAsOptional(DeputyProps props): base(props) /// Stability: Experimental /// [JsiiMethod(name: "method", parametersJson: "[{\"name\":\"_requiredAny\",\"type\":{\"primitive\":\"any\"}},{\"name\":\"_optionalAny\",\"optional\":true,\"type\":{\"primitive\":\"any\"}},{\"name\":\"_optionalString\",\"optional\":true,\"type\":{\"primitive\":\"string\"}}]")] - public virtual void Method(object requiredAny, object optionalAny = null, string optionalString = null) + public virtual void Method(object requiredAny, object? optionalAny = null, string? optionalString = null) { - InvokeInstanceVoidMethod(new System.Type[]{typeof(object), typeof(object), typeof(string)}, new object[]{requiredAny, optionalAny, optionalString}); + InvokeInstanceVoidMethod(new System.Type[]{typeof(object), typeof(object), typeof(string)}, new object?[]{requiredAny, optionalAny, optionalString}); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DocumentedClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DocumentedClass.cs index 260a7e88c4..39b9d51f4d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DocumentedClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DocumentedClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Here's the first line of the TSDoc comment. @@ -42,9 +44,9 @@ protected DocumentedClass(DeputyProps props): base(props) /// Stability: Stable /// [JsiiMethod(name: "greet", returnsJson: "{\"type\":{\"primitive\":\"number\"}}", parametersJson: "[{\"docs\":{\"summary\":\"The person to be greeted.\"},\"name\":\"greetee\",\"optional\":true,\"type\":{\"fqn\":\"jsii-calc.Greetee\"}}]")] - public virtual double Greet(Amazon.JSII.Tests.CalculatorNamespace.IGreetee greetee = null) + public virtual double Greet(Amazon.JSII.Tests.CalculatorNamespace.IGreetee? greetee = null) { - return InvokeInstanceMethod(new System.Type[]{typeof(Amazon.JSII.Tests.CalculatorNamespace.IGreetee)}, new object[]{greetee}); + return InvokeInstanceMethod(new System.Type[]{typeof(Amazon.JSII.Tests.CalculatorNamespace.IGreetee)}, new object?[]{greetee}); } /// Say ¡Hola! diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DontComplainAboutVariadicAfterOptional.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DontComplainAboutVariadicAfterOptional.cs index be2ee3b1ef..5255be3e1a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DontComplainAboutVariadicAfterOptional.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DontComplainAboutVariadicAfterOptional.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -30,9 +32,9 @@ protected DontComplainAboutVariadicAfterOptional(DeputyProps props): base(props) /// Stability: Experimental /// [JsiiMethod(name: "optionalAndVariadic", returnsJson: "{\"type\":{\"primitive\":\"string\"}}", parametersJson: "[{\"name\":\"optional\",\"optional\":true,\"type\":{\"primitive\":\"string\"}},{\"name\":\"things\",\"type\":{\"primitive\":\"string\"},\"variadic\":true}]")] - public virtual string OptionalAndVariadic(string optional = null, params string[] things) + public virtual string OptionalAndVariadic(string? optional = null, params string[] things) { - return InvokeInstanceMethod(new System.Type[]{typeof(string), typeof(string[])}, new object[]{optional, things}); + return InvokeInstanceMethod(new System.Type[]{typeof(string), typeof(string[])}, new object?[]{optional, things}); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoubleTrouble.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoubleTrouble.cs index 82ae0afd51..1e53d66e69 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoubleTrouble.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/DoubleTrouble.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EnumDispenser.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EnumDispenser.cs index 9b21036954..11304b8937 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EnumDispenser.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EnumDispenser.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValues.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValues.cs index be83a8585e..247f3df086 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValues.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValues.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValuesOptions.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValuesOptions.cs index 80a30492b6..210da73b00 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValuesOptions.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValuesOptions.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -13,7 +15,7 @@ public class EraseUndefinedHashValuesOptions : Amazon.JSII.Tests.CalculatorNames /// [JsiiOptional] [JsiiProperty(name: "option1", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Option1 + public string? Option1 { get; set; @@ -24,7 +26,7 @@ public string Option1 /// [JsiiOptional] [JsiiProperty(name: "option2", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Option2 + public string? Option2 { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValuesOptionsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValuesOptionsProxy.cs index 45e68deb50..b052171dcb 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValuesOptionsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/EraseUndefinedHashValuesOptionsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -17,9 +19,9 @@ private EraseUndefinedHashValuesOptionsProxy(ByRefValue reference): base(referen /// [JsiiOptional] [JsiiProperty(name: "option1", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Option1 + public string? Option1 { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } /// @@ -27,9 +29,9 @@ public string Option1 /// [JsiiOptional] [JsiiProperty(name: "option2", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Option2 + public string? Option2 { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalClass.cs index 20e5f1b6b7..c3637f9d89 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -11,7 +13,7 @@ public class ExperimentalClass : DeputyBase /// /// Stability: Experimental /// - public ExperimentalClass(string readonlyString, double? mutableNumber = null): base(new DeputyProps(new object[]{readonlyString, mutableNumber})) + public ExperimentalClass(string readonlyString, double? mutableNumber = null): base(new DeputyProps(new object?[]{readonlyString, mutableNumber})) { } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalEnum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalEnum.cs index ac50f78650..044ca3163c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalEnum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalEnum.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalStruct.cs index 5ea5555fcf..ce67d8764d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalStructProxy.cs index 2508916528..d0d4e8c78e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExperimentalStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExportedBaseClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExportedBaseClass.cs index 312ae16ae5..12ba96ce45 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExportedBaseClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExportedBaseClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExtendsInternalInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExtendsInternalInterface.cs index 8a81dff018..e421064e24 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExtendsInternalInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExtendsInternalInterface.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExtendsInternalInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExtendsInternalInterfaceProxy.cs index f83ab48e6f..b59b2a688d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExtendsInternalInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ExtendsInternalInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GiveMeStructs.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GiveMeStructs.cs index a45828c341..9eac9f7240 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GiveMeStructs.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GiveMeStructs.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Greetee.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Greetee.cs index 3c63f7927e..48d1f46546 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Greetee.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Greetee.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// These are some arguments you can pass to a method. @@ -17,7 +19,7 @@ public class Greetee : Amazon.JSII.Tests.CalculatorNamespace.IGreetee /// [JsiiOptional] [JsiiProperty(name: "name", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Name + public string? Name { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GreeteeProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GreeteeProxy.cs index 3c1711cde4..063f33cc48 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GreeteeProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GreeteeProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// These are some arguments you can pass to a method. @@ -21,9 +23,9 @@ private GreeteeProxy(ByRefValue reference): base(reference) /// [JsiiOptional] [JsiiProperty(name: "name", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Name + public string? Name { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GreetingAugmenter.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GreetingAugmenter.cs index 28962a90c4..27f15e61fc 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GreetingAugmenter.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/GreetingAugmenter.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymousImplementationProvider.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymousImplementationProvider.cs index be845d617a..b05ab50ed2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymousImplementationProvider.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymousImplementationProvider.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// We can return an anonymous interface implementation from an override without losing the interface declarations. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymousImplementationProviderProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymousImplementationProviderProxy.cs index 29164a05cd..024b37f5d4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymousImplementationProviderProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymousImplementationProviderProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// We can return an anonymous interface implementation from an override without losing the interface declarations. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymouslyImplementMe.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymouslyImplementMe.cs index bb57693202..e597158e5b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymouslyImplementMe.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymouslyImplementMe.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymouslyImplementMeProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymouslyImplementMeProxy.cs index 8201d7918d..8332a597ee 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymouslyImplementMeProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnonymouslyImplementMeProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnotherPublicInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnotherPublicInterface.cs index 294583f6de..a9e6e70208 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnotherPublicInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnotherPublicInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnotherPublicInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnotherPublicInterfaceProxy.cs index 37b3b5935b..c8cc9365ae 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnotherPublicInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IAnotherPublicInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBell.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBell.cs index c6eabd434b..8d9660f909 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBell.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBell.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellProxy.cs index 697ee5da37..c97675e990 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellRinger.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellRinger.cs index 3d89d0f50f..c3ce3e7eee 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellRinger.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellRinger.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Takes the object parameter as an interface. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellRingerProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellRingerProxy.cs index a7eba696ac..58c94edc91 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellRingerProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IBellRingerProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Takes the object parameter as an interface. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ICalculatorProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ICalculatorProps.cs index 6812f712ff..7b6036eadd 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ICalculatorProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ICalculatorProps.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Properties for Calculator. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IChildStruct982.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IChildStruct982.cs index e71ee3c61e..547a089a6d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IChildStruct982.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IChildStruct982.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConcreteBellRinger.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConcreteBellRinger.cs index e7cbb48a40..30046d2fe7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConcreteBellRinger.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConcreteBellRinger.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Takes the object parameter as a calss. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConcreteBellRingerProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConcreteBellRingerProxy.cs index 8f707f2ab2..2070d3934b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConcreteBellRingerProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConcreteBellRingerProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Takes the object parameter as a calss. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConfusingToJacksonStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConfusingToJacksonStruct.cs index 0ddf8b7f99..6f977dec15 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConfusingToJacksonStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IConfusingToJacksonStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -13,7 +15,7 @@ public interface IConfusingToJacksonStruct /// [JsiiProperty(name: "unionProperty", typeJson: "{\"union\":{\"types\":[{\"fqn\":\"@scope/jsii-calc-lib.IFriendly\"},{\"collection\":{\"elementtype\":{\"union\":{\"types\":[{\"fqn\":\"@scope/jsii-calc-lib.IFriendly\"},{\"fqn\":\"jsii-calc.AbstractClass\"}]}},\"kind\":\"array\"}}]}}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - object UnionProperty + object? UnionProperty { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedInterface.cs index 66e888e626..cf3eec3a0b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedInterfaceProxy.cs index 030ce0ba41..3088276b2b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedStruct.cs index 4842431de9..9ac07e113a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDeprecatedStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDerivedStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDerivedStruct.cs index fe004db909..d13374e934 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDerivedStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDerivedStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// A struct which derives from another struct. @@ -43,7 +45,7 @@ Amazon.JSII.Tests.CalculatorNamespace.DoubleTrouble NonPrimitive /// [JsiiProperty(name: "anotherOptional", typeJson: "{\"collection\":{\"elementtype\":{\"fqn\":\"@scope/jsii-calc-lib.Value\"},\"kind\":\"map\"}}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - System.Collections.Generic.IDictionary AnotherOptional + System.Collections.Generic.IDictionary? AnotherOptional { get { @@ -56,7 +58,7 @@ Amazon.JSII.Tests.CalculatorNamespace.DoubleTrouble NonPrimitive /// [JsiiProperty(name: "optionalAny", typeJson: "{\"primitive\":\"any\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - object OptionalAny + object? OptionalAny { get { @@ -69,7 +71,7 @@ object OptionalAny /// [JsiiProperty(name: "optionalArray", typeJson: "{\"collection\":{\"elementtype\":{\"primitive\":\"string\"},\"kind\":\"array\"}}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string[] OptionalArray + string[]? OptionalArray { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceBaseLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceBaseLevelStruct.cs index 43c47c13ea..593ddc3b2f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceBaseLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceBaseLevelStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceFirstMidLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceFirstMidLevelStruct.cs index 13b7120e17..122e1e2e8c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceFirstMidLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceFirstMidLevelStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceSecondMidLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceSecondMidLevelStruct.cs index 91ed352429..b7d5765c88 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceSecondMidLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceSecondMidLevelStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceTopLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceTopLevelStruct.cs index e909fd3baf..4db183c2f0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceTopLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IDiamondInheritanceTopLevelStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IEraseUndefinedHashValuesOptions.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IEraseUndefinedHashValuesOptions.cs index 266ece09d4..9e531f3fc3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IEraseUndefinedHashValuesOptions.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IEraseUndefinedHashValuesOptions.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -13,7 +15,7 @@ public interface IEraseUndefinedHashValuesOptions /// [JsiiProperty(name: "option1", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Option1 + string? Option1 { get { @@ -26,7 +28,7 @@ string Option1 /// [JsiiProperty(name: "option2", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Option2 + string? Option2 { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalInterface.cs index 5f48059b90..6490862fd1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalInterfaceProxy.cs index 2df86afcb8..0116a80ac4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalStruct.cs index 04d12d6a2f..b7e3ead730 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExperimentalStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsInternalInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsInternalInterface.cs index 62e4d75e41..4d4acef34c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsInternalInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsInternalInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsPrivateInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsPrivateInterface.cs index 0f177ba108..bfa38ca241 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsPrivateInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsPrivateInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsPrivateInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsPrivateInterfaceProxy.cs index e4ceba57a3..1487123ed0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsPrivateInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IExtendsPrivateInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlier.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlier.cs index 50183c849f..044cfa5b85 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlier.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlier.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Even friendlier classes can implement this interface. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlierProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlierProxy.cs index 7330db6082..f72d7a18f8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlierProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlierProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Even friendlier classes can implement this interface. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlyRandomGenerator.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlyRandomGenerator.cs index a5f1e23c3c..46688ac5cf 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlyRandomGenerator.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlyRandomGenerator.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlyRandomGeneratorProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlyRandomGeneratorProxy.cs index 2352898c01..d3fec56a59 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlyRandomGeneratorProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IFriendlyRandomGeneratorProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IGreetee.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IGreetee.cs index 25f78abe78..dd4e12710b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IGreetee.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IGreetee.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// These are some arguments you can pass to a method. @@ -17,7 +19,7 @@ public interface IGreetee /// [JsiiProperty(name: "name", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Name + string? Name { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IImplictBaseOfBase.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IImplictBaseOfBase.cs index ab7ddc0a7c..20d87af703 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IImplictBaseOfBase.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IImplictBaseOfBase.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceImplementedByAbstractClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceImplementedByAbstractClass.cs index b0e9d38d75..31fb8626cd 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceImplementedByAbstractClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceImplementedByAbstractClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// awslabs/jsii#220 Abstract return type. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceImplementedByAbstractClassProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceImplementedByAbstractClassProxy.cs index 355a47b46c..a0a1c599dc 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceImplementedByAbstractClassProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceImplementedByAbstractClassProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// awslabs/jsii#220 Abstract return type. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceThatShouldNotBeADataType.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceThatShouldNotBeADataType.cs index 301bc39b75..2ed4afd7aa 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceThatShouldNotBeADataType.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceThatShouldNotBeADataType.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Even though this interface has only properties, it is disqualified from being a datatype because it inherits from an interface that is not a datatype. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceThatShouldNotBeADataTypeProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceThatShouldNotBeADataTypeProxy.cs index 7a4a152e78..8d94bf4959 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceThatShouldNotBeADataTypeProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceThatShouldNotBeADataTypeProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Even though this interface has only properties, it is disqualified from being a datatype because it inherits from an interface that is not a datatype. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithInternal.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithInternal.cs index f74c787c3e..53ffdd4132 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithInternal.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithInternal.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithInternalProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithInternalProxy.cs index 9b51cfb548..7fd3e24542 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithInternalProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithInternalProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithMethods.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithMethods.cs index 608074f43b..e3f276336c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithMethods.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithMethods.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithMethodsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithMethodsProxy.cs index a57c69cf25..e995d959d3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithMethodsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithMethodsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithOptionalMethodArguments.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithOptionalMethodArguments.cs index ac65db0a89..b5dffd51a6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithOptionalMethodArguments.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithOptionalMethodArguments.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// awslabs/jsii#175 Interface proxies (and builders) do not respect optional arguments in methods. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithOptionalMethodArgumentsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithOptionalMethodArgumentsProxy.cs index 6b326d5b8b..6646913a80 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithOptionalMethodArgumentsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithOptionalMethodArgumentsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// awslabs/jsii#175 Interface proxies (and builders) do not respect optional arguments in methods. @@ -19,7 +21,7 @@ private IInterfaceWithOptionalMethodArgumentsProxy(ByRefValue reference): base(r [JsiiMethod(name: "hello", parametersJson: "[{\"name\":\"arg1\",\"type\":{\"primitive\":\"string\"}},{\"name\":\"arg2\",\"optional\":true,\"type\":{\"primitive\":\"number\"}}]")] public void Hello(string arg1, double? arg2 = null) { - InvokeInstanceVoidMethod(new System.Type[]{typeof(string), typeof(double)}, new object[]{arg1, arg2}); + InvokeInstanceVoidMethod(new System.Type[]{typeof(string), typeof(double)}, new object?[]{arg1, arg2}); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithProperties.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithProperties.cs index 30520db25e..294f1202d9 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithProperties.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithProperties.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesExtension.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesExtension.cs index 7629bc5d4a..bc3a8dd689 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesExtension.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesExtension.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesExtensionProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesExtensionProxy.cs index 1d4626880f..7925b7b394 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesExtensionProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesExtensionProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesProxy.cs index 32a95d0970..4e38afd9d6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IInterfaceWithPropertiesProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417Derived.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417Derived.cs index 91d165e84c..7e0e6c7eca 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417Derived.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417Derived.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417DerivedProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417DerivedProxy.cs index 32e2592ad1..7802c21a47 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417DerivedProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417DerivedProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417PublicBaseOfBase.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417PublicBaseOfBase.cs index 9e3d733e8e..c5681e0a2b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417PublicBaseOfBase.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417PublicBaseOfBase.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417PublicBaseOfBaseProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417PublicBaseOfBaseProxy.cs index 509e58d593..01a7b4700f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417PublicBaseOfBaseProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJSII417PublicBaseOfBaseProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External.cs index 1d7a27a165..de1260883b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External2.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External2.cs index d23533f34c..2eaeb8cba4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External2.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External2.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External2Proxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External2Proxy.cs index 78fa370692..a1c3449a59 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External2Proxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487External2Proxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487ExternalProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487ExternalProxy.cs index 547ac20d1e..6d6488ae8f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487ExternalProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii487ExternalProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii496.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii496.cs index e07b82801a..06d683366f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii496.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii496.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii496Proxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii496Proxy.cs index 49ac3c012d..bc1adf5c06 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii496Proxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IJsii496Proxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ILoadBalancedFargateServiceProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ILoadBalancedFargateServiceProps.cs index 9728767975..13e935d855 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ILoadBalancedFargateServiceProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ILoadBalancedFargateServiceProps.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// jsii#298: show default values in sphinx documentation, and respect newlines. @@ -44,7 +46,7 @@ public interface ILoadBalancedFargateServiceProps /// [JsiiProperty(name: "cpu", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Cpu + string? Cpu { get { @@ -75,7 +77,7 @@ string Cpu /// [JsiiProperty(name: "memoryMiB", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string MemoryMiB + string? MemoryMiB { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IMutableObjectLiteral.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IMutableObjectLiteral.cs index 2a8301554c..4a4a0ef2ec 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IMutableObjectLiteral.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IMutableObjectLiteral.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IMutableObjectLiteralProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IMutableObjectLiteralProxy.cs index 0ef26aa743..d40ea185a4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IMutableObjectLiteralProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IMutableObjectLiteralProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INestedStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INestedStruct.cs index 1b9868ea66..0a9b2170b4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INestedStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INestedStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INonInternalInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INonInternalInterface.cs index 4a452f6cb4..74382048e8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INonInternalInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INonInternalInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INonInternalInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INonInternalInterfaceProxy.cs index 6c350e2559..9aef3b93df 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INonInternalInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INonInternalInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INullShouldBeTreatedAsUndefinedData.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INullShouldBeTreatedAsUndefinedData.cs index eef3c86446..e2961d22da 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INullShouldBeTreatedAsUndefinedData.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/INullShouldBeTreatedAsUndefinedData.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -22,7 +24,7 @@ object[] ArrayWithThreeElementsAndUndefinedAsSecondArgument /// [JsiiProperty(name: "thisShouldBeUndefined", typeJson: "{\"primitive\":\"any\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - object ThisShouldBeUndefined + object? ThisShouldBeUndefined { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IObjectWithProperty.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IObjectWithProperty.cs index b105d6364f..2851ffe3cf 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IObjectWithProperty.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IObjectWithProperty.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Make sure that setters are properly called on objects with interfaces. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IObjectWithPropertyProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IObjectWithPropertyProxy.cs index e683500855..f56faa6f35 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IObjectWithPropertyProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IObjectWithPropertyProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Make sure that setters are properly called on objects with interfaces. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IOptionalStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IOptionalStruct.cs index 82e57f5170..f843be2012 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IOptionalStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IOptionalStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -13,7 +15,7 @@ public interface IOptionalStruct /// [JsiiProperty(name: "field", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Field + string? Field { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IParentStruct982.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IParentStruct982.cs index 80b64f215e..6cb0e65e6d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IParentStruct982.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IParentStruct982.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// https://github.com/aws/jsii/issues/982. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPrivatelyImplemented.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPrivatelyImplemented.cs index be57ceea23..e90b1a7344 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPrivatelyImplemented.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPrivatelyImplemented.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPrivatelyImplementedProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPrivatelyImplementedProxy.cs index 6a130fdc21..5b545a9197 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPrivatelyImplementedProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPrivatelyImplementedProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface.cs index 9e650726c9..a90f2de934 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface2.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface2.cs index 5eeb08951c..42fb8a9d20 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface2.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface2.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface2Proxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface2Proxy.cs index 3a4667d226..ca9ec52744 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface2Proxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterface2Proxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterfaceProxy.cs index 6f4d13f7d8..b0a9c3a4d8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IPublicInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRandomNumberGenerator.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRandomNumberGenerator.cs index a26cb0b71a..da60f4ccc3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRandomNumberGenerator.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRandomNumberGenerator.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Generates random numbers. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRandomNumberGeneratorProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRandomNumberGeneratorProxy.cs index 6f168e15ae..3a9106cfc6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRandomNumberGeneratorProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRandomNumberGeneratorProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Generates random numbers. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnJsii976.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnJsii976.cs index 0562d9cf38..451472dc8f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnJsii976.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnJsii976.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Returns a subclass of a known class which implements an interface. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnJsii976Proxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnJsii976Proxy.cs index c10d2a69b6..e0e1417885 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnJsii976Proxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnJsii976Proxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Returns a subclass of a known class which implements an interface. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnsNumber.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnsNumber.cs index 22324f1056..58caa1a521 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnsNumber.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnsNumber.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnsNumberProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnsNumberProxy.cs index 08fa1da2c8..d5d7968841 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnsNumberProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IReturnsNumberProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRootStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRootStruct.cs index ca4e293dc1..ab6087c2a4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRootStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IRootStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This is here to check that we can pass a nested struct into a kwargs by specifying it as an in-line dictionary. @@ -27,7 +29,7 @@ string StringProp /// [JsiiProperty(name: "nestedStruct", typeJson: "{\"fqn\":\"jsii-calc.NestedStruct\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - Amazon.JSII.Tests.CalculatorNamespace.INestedStruct NestedStruct + Amazon.JSII.Tests.CalculatorNamespace.INestedStruct? NestedStruct { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISecondLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISecondLevelStruct.cs index def51f289f..9a04203a0a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISecondLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISecondLevelStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -24,7 +26,7 @@ string DeeperRequiredProp /// [JsiiProperty(name: "deeperOptionalProp", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string DeeperOptionalProp + string? DeeperOptionalProp { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISmellyStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISmellyStruct.cs index c35449f7b8..6098aa4d6d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISmellyStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISmellyStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableInterface.cs index daab41125c..1cf2da11af 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableInterfaceProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableInterfaceProxy.cs index f58b05c5ab..74f9263890 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableInterfaceProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableInterfaceProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableStruct.cs index 7ba0a5679e..9ffedb742b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStableStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructA.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructA.cs index e4a2c129c0..82fc21e9dc 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructA.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructA.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// We can serialize and deserialize structs without silently ignoring optional fields. @@ -36,7 +38,7 @@ string RequiredString /// [JsiiProperty(name: "optionalString", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string OptionalString + string? OptionalString { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructB.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructB.cs index e933532715..0f8b980847 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructB.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructB.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This intentionally overlaps with StructA (where only requiredString is provided) to test htat the kernel properly disambiguates those. @@ -36,7 +38,7 @@ string RequiredString /// [JsiiProperty(name: "optionalStructA", typeJson: "{\"fqn\":\"jsii-calc.StructA\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - Amazon.JSII.Tests.CalculatorNamespace.IStructA OptionalStructA + Amazon.JSII.Tests.CalculatorNamespace.IStructA? OptionalStructA { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructParameterType.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructParameterType.cs index fc2852ed55..0add06f85c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructParameterType.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructParameterType.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that, in languages that do keyword lifting (e.g: Python), having a struct member with the same name as a positional parameter results in the correct code being emitted. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructReturningDelegate.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructReturningDelegate.cs index b9eca34d6c..33fc919397 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructReturningDelegate.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructReturningDelegate.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that a "pure" implementation of an interface works correctly. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructReturningDelegateProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructReturningDelegateProxy.cs index dcd63d18b2..60a2535e65 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructReturningDelegateProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructReturningDelegateProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that a "pure" implementation of an interface works correctly. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructWithJavaReservedWords.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructWithJavaReservedWords.cs index dfdb646b55..626cc39b76 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructWithJavaReservedWords.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IStructWithJavaReservedWords.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -22,7 +24,7 @@ string Default /// [JsiiProperty(name: "assert", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Assert + string? Assert { get { @@ -35,7 +37,7 @@ string Assert /// [JsiiProperty(name: "result", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Result + string? Result { get { @@ -48,7 +50,7 @@ string Result /// [JsiiProperty(name: "that", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string That + string? That { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISupportsNiceJavaBuilderProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISupportsNiceJavaBuilderProps.cs index c129f21d10..7ab379d0ed 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISupportsNiceJavaBuilderProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ISupportsNiceJavaBuilderProps.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -26,7 +28,7 @@ double Bar /// [JsiiProperty(name: "id", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Id + string? Id { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ITopLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ITopLevelStruct.cs index ae2469c116..de85a44c62 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ITopLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ITopLevelStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -34,7 +36,7 @@ object SecondLevel /// [JsiiProperty(name: "optional", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - string Optional + string? Optional { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IUnionProperties.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IUnionProperties.cs index 6012f871ff..1dfd5102f4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IUnionProperties.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/IUnionProperties.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -22,7 +24,7 @@ object Bar /// [JsiiProperty(name: "foo", typeJson: "{\"union\":{\"types\":[{\"primitive\":\"string\"},{\"primitive\":\"number\"}]}}", isOptional: true)] [Amazon.JSII.Runtime.Deputy.JsiiOptional] - object Foo + object? Foo { get { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementInternalInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementInternalInterface.cs index 35462620ae..6598fd1979 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementInternalInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementInternalInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Implementation.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Implementation.cs index c7d37ddf0c..2af0448b4f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Implementation.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Implementation.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsInterfaceWithInternal.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsInterfaceWithInternal.cs index 4b768ae536..e0c9d93e4d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsInterfaceWithInternal.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsInterfaceWithInternal.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsInterfaceWithInternalSubclass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsInterfaceWithInternalSubclass.cs index 70e93887c8..530305ecb8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsInterfaceWithInternalSubclass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsInterfaceWithInternalSubclass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsPrivateInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsPrivateInterface.cs index f17b266678..c8363c6b4d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsPrivateInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplementsPrivateInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplictBaseOfBase.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplictBaseOfBase.cs index 3cb8f5cd87..c71598f91b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplictBaseOfBase.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplictBaseOfBase.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplictBaseOfBaseProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplictBaseOfBaseProxy.cs index e17bd21850..9fbd7b9fd1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplictBaseOfBaseProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ImplictBaseOfBaseProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InbetweenClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InbetweenClass.cs index 66c1cd5a84..754b6b065b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InbetweenClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InbetweenClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceCollections.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceCollections.cs index 6879b570b2..c913a9de18 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceCollections.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceCollections.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that collections of interfaces or structs are correctly handled. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/Foo.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/Foo.cs index 542cd5dd7e..3e34aa2f00 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/Foo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/Foo.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceIncludesClasses { /// @@ -31,9 +33,9 @@ protected Foo(DeputyProps props): base(props) /// [JsiiOptional] [JsiiProperty(name: "bar", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public virtual string Bar + public virtual string? Bar { - get => GetInstanceProperty(); + get => GetInstanceProperty(); set => SetInstanceProperty(value); } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/Hello.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/Hello.cs index 8737866d07..01f793a673 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/Hello.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/Hello.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceIncludesClasses { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/HelloProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/HelloProxy.cs index adce003037..99836531c8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/HelloProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/HelloProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceIncludesClasses { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/IHello.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/IHello.cs index 98668e5f95..ea8cc39ce2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/IHello.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceIncludesClasses/IHello.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceIncludesClasses { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/Hello.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/Hello.cs index f43d7a8381..d0f4347ac5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/Hello.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/Hello.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceOnlyInterface { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/HelloProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/HelloProxy.cs index d770fb3346..ff0c6f5ade 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/HelloProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/HelloProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceOnlyInterface { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/IHello.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/IHello.cs index 45ee331892..b467b87743 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/IHello.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfaceInNamespaceOnlyInterface/IHello.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.InterfaceInNamespaceOnlyInterface { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfacesMaker.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfacesMaker.cs index 0fa2f1f6c0..95a4a6315f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfacesMaker.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/InterfacesMaker.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// We can return arrays of interfaces See aws/aws-cdk#2362. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Internal/DependencyResolution/Anchor.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Internal/DependencyResolution/Anchor.cs index b446d0e4ed..ca88d3bfab 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Internal/DependencyResolution/Anchor.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Internal/DependencyResolution/Anchor.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.Internal.DependencyResolution { public sealed class Anchor diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSII417Derived.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSII417Derived.cs index 6f5374d788..e70c3cd65d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSII417Derived.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSII417Derived.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSII417PublicBaseOfBase.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSII417PublicBaseOfBase.cs index 3de8813060..bb7a64cdb0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSII417PublicBaseOfBase.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSII417PublicBaseOfBase.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralForInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralForInterface.cs index 3e7a4b7f08..5d89e6b9b0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralForInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralForInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralToNative.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralToNative.cs index 72610833d4..ab79a78349 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralToNative.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralToNative.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralToNativeClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralToNativeClass.cs index 3ca439e143..c263a06802 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralToNativeClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JSObjectLiteralToNativeClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JavaReservedWords.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JavaReservedWords.cs index eafe321392..df59a2e6a9 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JavaReservedWords.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JavaReservedWords.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Jsii487Derived.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Jsii487Derived.cs index dc4a364240..aa7d3d8b0b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Jsii487Derived.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Jsii487Derived.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Jsii496Derived.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Jsii496Derived.cs index 4670fd7055..416f9ac50e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Jsii496Derived.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Jsii496Derived.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsiiAgent_.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsiiAgent_.cs index f7b40c87ca..d01b95db87 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsiiAgent_.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsiiAgent_.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Host runtime version should be set via JSII_AGENT. @@ -33,9 +35,9 @@ protected JsiiAgent_(DeputyProps props): base(props) /// [JsiiOptional] [JsiiProperty(name: "jsiiAgent", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public static string JsiiAgent + public static string? JsiiAgent { - get => GetStaticProperty(typeof(Amazon.JSII.Tests.CalculatorNamespace.JsiiAgent_)); + get => GetStaticProperty(typeof(Amazon.JSII.Tests.CalculatorNamespace.JsiiAgent_)); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsonFormatter.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsonFormatter.cs index 0bbf861b7c..ea1591c1ab 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsonFormatter.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/JsonFormatter.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Make sure structs are un-decorated on the way in. @@ -146,9 +148,9 @@ public static object AnyZero() /// Stability: Experimental /// [JsiiMethod(name: "stringify", returnsJson: "{\"optional\":true,\"type\":{\"primitive\":\"string\"}}", parametersJson: "[{\"name\":\"value\",\"optional\":true,\"type\":{\"primitive\":\"any\"}}]")] - public static string Stringify(object @value = null) + public static string? Stringify(object? @value = null) { - return InvokeStaticMethod(typeof(Amazon.JSII.Tests.CalculatorNamespace.JsonFormatter), new System.Type[]{typeof(object)}, new object[]{@value}); + return InvokeStaticMethod(typeof(Amazon.JSII.Tests.CalculatorNamespace.JsonFormatter), new System.Type[]{typeof(object)}, new object?[]{@value}); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/LoadBalancedFargateServiceProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/LoadBalancedFargateServiceProps.cs index 402f0da473..1d6eda47cb 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/LoadBalancedFargateServiceProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/LoadBalancedFargateServiceProps.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// jsii#298: show default values in sphinx documentation, and respect newlines. @@ -42,7 +44,7 @@ public double? ContainerPort /// [JsiiOptional] [JsiiProperty(name: "cpu", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Cpu + public string? Cpu { get; set; @@ -71,7 +73,7 @@ public string Cpu /// [JsiiOptional] [JsiiProperty(name: "memoryMiB", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string MemoryMiB + public string? MemoryMiB { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/LoadBalancedFargateServicePropsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/LoadBalancedFargateServicePropsProxy.cs index 7528ae5b09..157359c801 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/LoadBalancedFargateServicePropsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/LoadBalancedFargateServicePropsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// jsii#298: show default values in sphinx documentation, and respect newlines. @@ -45,9 +47,9 @@ public double? ContainerPort /// [JsiiOptional] [JsiiProperty(name: "cpu", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Cpu + public string? Cpu { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } /// The amount (in MiB) of memory used by the task. @@ -73,9 +75,9 @@ public string Cpu /// [JsiiOptional] [JsiiProperty(name: "memoryMiB", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string MemoryMiB + public string? MemoryMiB { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } /// Determines whether the Application Load Balancer will be internet-facing. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/MethodNamedProperty.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/MethodNamedProperty.cs index 7a4148d59e..cd995d1ad8 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/MethodNamedProperty.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/MethodNamedProperty.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Multiply.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Multiply.cs index 839d18804e..60bdc6bd9e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Multiply.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Multiply.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// The "*" binary operation. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NamespaceDoc.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NamespaceDoc.cs index c5dc91e91a..f70481049f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NamespaceDoc.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NamespaceDoc.cs @@ -1,3 +1,5 @@ +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Negate.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Negate.cs index e880d38651..65270cc992 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Negate.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Negate.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// The negation operation ("-value"). diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NestedStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NestedStruct.cs index 271fa97798..a0ae6d4c83 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NestedStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NestedStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NestedStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NestedStructProxy.cs index 72c0bdee60..e19f2ab74e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NestedStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NestedStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NodeStandardLibrary.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NodeStandardLibrary.cs index 2d2feb9109..2c6addda10 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NodeStandardLibrary.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NodeStandardLibrary.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Test fixture to verify that jsii modules can use the node standard library. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefined.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefined.cs index 86f81790bb..f4a238d7fe 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefined.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefined.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// jsii#282, aws-cdk#157: null should be treated as "undefined". @@ -12,7 +14,7 @@ public class NullShouldBeTreatedAsUndefined : DeputyBase /// /// Stability: Experimental /// - public NullShouldBeTreatedAsUndefined(string param1, object optional = null): base(new DeputyProps(new object[]{param1, optional})) + public NullShouldBeTreatedAsUndefined(string param1, object? optional = null): base(new DeputyProps(new object?[]{param1, optional})) { } @@ -34,9 +36,9 @@ protected NullShouldBeTreatedAsUndefined(DeputyProps props): base(props) /// Stability: Experimental /// [JsiiMethod(name: "giveMeUndefined", parametersJson: "[{\"name\":\"value\",\"optional\":true,\"type\":{\"primitive\":\"any\"}}]")] - public virtual void GiveMeUndefined(object @value = null) + public virtual void GiveMeUndefined(object? @value = null) { - InvokeInstanceVoidMethod(new System.Type[]{typeof(object)}, new object[]{@value}); + InvokeInstanceVoidMethod(new System.Type[]{typeof(object)}, new object?[]{@value}); } /// @@ -62,9 +64,9 @@ public virtual void VerifyPropertyIsUndefined() /// [JsiiOptional] [JsiiProperty(name: "changeMeToUndefined", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public virtual string ChangeMeToUndefined + public virtual string? ChangeMeToUndefined { - get => GetInstanceProperty(); + get => GetInstanceProperty(); set => SetInstanceProperty(value); } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedData.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedData.cs index 4dce7694af..7bf97343ff 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedData.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedData.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// @@ -23,7 +27,7 @@ public object[] ArrayWithThreeElementsAndUndefinedAsSecondArgument /// [JsiiOptional] [JsiiProperty(name: "thisShouldBeUndefined", typeJson: "{\"primitive\":\"any\"}", isOptional: true, isOverride: true)] - public object ThisShouldBeUndefined + public object? ThisShouldBeUndefined { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedDataProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedDataProxy.cs index 69f418b458..196225af4a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedDataProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NullShouldBeTreatedAsUndefinedDataProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -26,9 +28,9 @@ public object[] ArrayWithThreeElementsAndUndefinedAsSecondArgument /// [JsiiOptional] [JsiiProperty(name: "thisShouldBeUndefined", typeJson: "{\"primitive\":\"any\"}", isOptional: true)] - public object ThisShouldBeUndefined + public object? ThisShouldBeUndefined { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NumberGenerator.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NumberGenerator.cs index 31c92ef241..574e60fb11 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NumberGenerator.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/NumberGenerator.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This allows us to test that a reference can be stored for objects that implement interfaces. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ObjectRefsInCollections.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ObjectRefsInCollections.cs index a4956f9708..7e08cf4e69 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ObjectRefsInCollections.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ObjectRefsInCollections.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verify that object references can be passed inside collections. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ObjectWithPropertyProvider.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ObjectWithPropertyProvider.cs index 3cef110f8b..32e1cc2176 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ObjectWithPropertyProvider.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ObjectWithPropertyProvider.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Old.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Old.cs index e189e45b17..a1b2d15a4b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Old.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Old.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Old class. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalArgumentInvoker.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalArgumentInvoker.cs index 7ac694a687..71a808bded 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalArgumentInvoker.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalArgumentInvoker.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalConstructorArgument.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalConstructorArgument.cs index 42894bc518..c2af050109 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalConstructorArgument.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalConstructorArgument.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -11,7 +13,7 @@ public class OptionalConstructorArgument : DeputyBase /// /// Stability: Experimental /// - public OptionalConstructorArgument(double arg1, string arg2, System.DateTime? arg3 = null): base(new DeputyProps(new object[]{arg1, arg2, arg3})) + public OptionalConstructorArgument(double arg1, string arg2, System.DateTime? arg3 = null): base(new DeputyProps(new object?[]{arg1, arg2, arg3})) { } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStruct.cs index 9246ac05b9..a734f19e6a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStruct.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -13,7 +15,7 @@ public class OptionalStruct : Amazon.JSII.Tests.CalculatorNamespace.IOptionalStr /// [JsiiOptional] [JsiiProperty(name: "field", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Field + public string? Field { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStructConsumer.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStructConsumer.cs index 4b7ea61585..a6d80e094c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStructConsumer.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStructConsumer.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -11,7 +13,7 @@ public class OptionalStructConsumer : DeputyBase /// /// Stability: Experimental /// - public OptionalStructConsumer(Amazon.JSII.Tests.CalculatorNamespace.IOptionalStruct optionalStruct = null): base(new DeputyProps(new object[]{optionalStruct})) + public OptionalStructConsumer(Amazon.JSII.Tests.CalculatorNamespace.IOptionalStruct? optionalStruct = null): base(new DeputyProps(new object?[]{optionalStruct})) { } @@ -43,9 +45,9 @@ public virtual bool ParameterWasUndefined /// [JsiiOptional] [JsiiProperty(name: "fieldValue", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public virtual string FieldValue + public virtual string? FieldValue { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStructProxy.cs index cda6d325f5..ea0c9fa351 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OptionalStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -17,9 +19,9 @@ private OptionalStructProxy(ByRefValue reference): base(reference) /// [JsiiOptional] [JsiiProperty(name: "field", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Field + public string? Field { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OverridableProtectedMember.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OverridableProtectedMember.cs index 0ac4fe997e..e86b9610d5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OverridableProtectedMember.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OverridableProtectedMember.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OverrideReturnsObject.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OverrideReturnsObject.cs index f8e90f3ac7..35434cc6d5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OverrideReturnsObject.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/OverrideReturnsObject.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ParentStruct982.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ParentStruct982.cs index 4c104191f5..85afd15639 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ParentStruct982.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ParentStruct982.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// https://github.com/aws/jsii/issues/982. /// /// Stability: Experimental diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ParentStruct982Proxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ParentStruct982Proxy.cs index 4a86d415f5..275ef7c034 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ParentStruct982Proxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ParentStruct982Proxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// https://github.com/aws/jsii/issues/982. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PartiallyInitializedThisConsumer.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PartiallyInitializedThisConsumer.cs index 46698fcb49..87ede7b7a4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PartiallyInitializedThisConsumer.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PartiallyInitializedThisConsumer.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PartiallyInitializedThisConsumerProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PartiallyInitializedThisConsumerProxy.cs index ac0b29eb9c..721a24c93a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PartiallyInitializedThisConsumerProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PartiallyInitializedThisConsumerProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Polymorphism.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Polymorphism.cs index be8f9d3f48..566aaa57e6 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Polymorphism.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Polymorphism.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Power.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Power.cs index 54e68e70e5..fe37ebe7b0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Power.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Power.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// The power operation. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PropertyNamedProperty.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PropertyNamedProperty.cs index 2ab873a0d9..bd5f0b289f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PropertyNamedProperty.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PropertyNamedProperty.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Reproduction for https://github.com/aws/jsii/issues/1113 Where a method or property named "property" would result in impossible to load Python code. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PublicClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PublicClass.cs index 87fad9174d..93eba8a103 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PublicClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PublicClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PythonReservedWords.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PythonReservedWords.cs index fe69305d34..ac65bd5f4c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PythonReservedWords.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/PythonReservedWords.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ReferenceEnumFromScopedPackage.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ReferenceEnumFromScopedPackage.cs index 999f5f750c..6ad440ee3c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ReferenceEnumFromScopedPackage.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ReferenceEnumFromScopedPackage.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// See awslabs/jsii#138. @@ -31,9 +33,9 @@ protected ReferenceEnumFromScopedPackage(DeputyProps props): base(props) /// Stability: Experimental /// [JsiiMethod(name: "loadFoo", returnsJson: "{\"optional\":true,\"type\":{\"fqn\":\"@scope/jsii-calc-lib.EnumFromScopedModule\"}}")] - public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.EnumFromScopedModule LoadFoo() + public virtual Amazon.JSII.Tests.CalculatorNamespace.LibNamespace.EnumFromScopedModule? LoadFoo() { - return InvokeInstanceMethod(new System.Type[]{}, new object[]{}); + return InvokeInstanceMethod(new System.Type[]{}, new object[]{}); } /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ReturnsPrivateImplementationOfInterface.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ReturnsPrivateImplementationOfInterface.cs index 304a848520..2dcb05a14e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ReturnsPrivateImplementationOfInterface.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/ReturnsPrivateImplementationOfInterface.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Helps ensure the JSII kernel & runtime cooperate correctly when an un-exported instance of a class is returned with a declared type that is an exported interface, and the instance inherits from an exported class. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStruct.cs index 11243847d0..68f3a11453 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// This is here to check that we can pass a nested struct into a kwargs by specifying it as an in-line dictionary. /// /// This is cheating with the (current) declared types, but this is the "more @@ -28,7 +32,7 @@ public string StringProp /// [JsiiOptional] [JsiiProperty(name: "nestedStruct", typeJson: "{\"fqn\":\"jsii-calc.NestedStruct\"}", isOptional: true, isOverride: true)] - public Amazon.JSII.Tests.CalculatorNamespace.INestedStruct NestedStruct + public Amazon.JSII.Tests.CalculatorNamespace.INestedStruct? NestedStruct { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStructProxy.cs index 4d16713896..35c3c57f12 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This is here to check that we can pass a nested struct into a kwargs by specifying it as an in-line dictionary. @@ -31,9 +33,9 @@ public string StringProp /// [JsiiOptional] [JsiiProperty(name: "nestedStruct", typeJson: "{\"fqn\":\"jsii-calc.NestedStruct\"}", isOptional: true)] - public Amazon.JSII.Tests.CalculatorNamespace.INestedStruct NestedStruct + public Amazon.JSII.Tests.CalculatorNamespace.INestedStruct? NestedStruct { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStructValidator.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStructValidator.cs index 6abecf9924..f560779442 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStructValidator.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RootStructValidator.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RuntimeTypeChecking.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RuntimeTypeChecking.cs index a94f531df4..cbc8ad3849 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RuntimeTypeChecking.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/RuntimeTypeChecking.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -30,18 +32,18 @@ protected RuntimeTypeChecking(DeputyProps props): base(props) /// Stability: Experimental /// [JsiiMethod(name: "methodWithDefaultedArguments", parametersJson: "[{\"name\":\"arg1\",\"optional\":true,\"type\":{\"primitive\":\"number\"}},{\"name\":\"arg2\",\"optional\":true,\"type\":{\"primitive\":\"string\"}},{\"name\":\"arg3\",\"optional\":true,\"type\":{\"primitive\":\"date\"}}]")] - public virtual void MethodWithDefaultedArguments(double? arg1 = null, string arg2 = null, System.DateTime? arg3 = null) + public virtual void MethodWithDefaultedArguments(double? arg1 = null, string? arg2 = null, System.DateTime? arg3 = null) { - InvokeInstanceVoidMethod(new System.Type[]{typeof(double), typeof(string), typeof(System.DateTime)}, new object[]{arg1, arg2, arg3}); + InvokeInstanceVoidMethod(new System.Type[]{typeof(double), typeof(string), typeof(System.DateTime)}, new object?[]{arg1, arg2, arg3}); } /// /// Stability: Experimental /// [JsiiMethod(name: "methodWithOptionalAnyArgument", parametersJson: "[{\"name\":\"arg\",\"optional\":true,\"type\":{\"primitive\":\"any\"}}]")] - public virtual void MethodWithOptionalAnyArgument(object arg = null) + public virtual void MethodWithOptionalAnyArgument(object? arg = null) { - InvokeInstanceVoidMethod(new System.Type[]{typeof(object)}, new object[]{arg}); + InvokeInstanceVoidMethod(new System.Type[]{typeof(object)}, new object?[]{arg}); } /// Used to verify verification of number of method arguments. @@ -51,7 +53,7 @@ public virtual void MethodWithOptionalAnyArgument(object arg = null) [JsiiMethod(name: "methodWithOptionalArguments", parametersJson: "[{\"name\":\"arg1\",\"type\":{\"primitive\":\"number\"}},{\"name\":\"arg2\",\"type\":{\"primitive\":\"string\"}},{\"name\":\"arg3\",\"optional\":true,\"type\":{\"primitive\":\"date\"}}]")] public virtual void MethodWithOptionalArguments(double arg1, string arg2, System.DateTime? arg3 = null) { - InvokeInstanceVoidMethod(new System.Type[]{typeof(double), typeof(string), typeof(System.DateTime)}, new object[]{arg1, arg2, arg3}); + InvokeInstanceVoidMethod(new System.Type[]{typeof(double), typeof(string), typeof(System.DateTime)}, new object?[]{arg1, arg2, arg3}); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SecondLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SecondLevelStruct.cs index 7300c691eb..18f6fa479d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SecondLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SecondLevelStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// @@ -25,7 +29,7 @@ public string DeeperRequiredProp /// [JsiiOptional] [JsiiProperty(name: "deeperOptionalProp", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string DeeperOptionalProp + public string? DeeperOptionalProp { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SecondLevelStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SecondLevelStructProxy.cs index 26c649a638..45f51b425f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SecondLevelStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SecondLevelStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -28,9 +30,9 @@ public string DeeperRequiredProp /// [JsiiOptional] [JsiiProperty(name: "deeperOptionalProp", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string DeeperOptionalProp + public string? DeeperOptionalProp { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingleInstanceTwoTypes.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingleInstanceTwoTypes.cs index a98043db6b..0cbbc600a7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingleInstanceTwoTypes.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingleInstanceTwoTypes.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Test that a single instance can be returned under two different FQNs. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonInt.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonInt.cs index 740a769462..172df42f94 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonInt.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonInt.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that singleton enums are handled correctly. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonIntEnum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonIntEnum.cs index 0124e83768..255d9ad793 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonIntEnum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonIntEnum.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonString.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonString.cs index 60fbde086e..0443985851 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonString.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonString.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that singleton enums are handled correctly. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonStringEnum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonStringEnum.cs index b55692e29d..5e9afb5734 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonStringEnum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SingletonStringEnum.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SmellyStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SmellyStruct.cs index 6b1c45c64d..3e01f5c21d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SmellyStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SmellyStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SmellyStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SmellyStructProxy.cs index ac7771ae58..e11ad625ea 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SmellyStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SmellyStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SomeTypeJsii976.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SomeTypeJsii976.cs index 027b56eb04..c9c17b6804 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SomeTypeJsii976.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SomeTypeJsii976.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableClass.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableClass.cs index c7acef75c4..02354c12df 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableClass.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableClass.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -11,7 +13,7 @@ public class StableClass : DeputyBase /// /// Stability: Stable /// - public StableClass(string readonlyString, double? mutableNumber = null): base(new DeputyProps(new object[]{readonlyString, mutableNumber})) + public StableClass(string readonlyString, double? mutableNumber = null): base(new DeputyProps(new object?[]{readonlyString, mutableNumber})) { } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableEnum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableEnum.cs index 126d89d220..464d91e8be 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableEnum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableEnum.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableStruct.cs index a060ff89a8..2c91c36aaf 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Stable /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableStructProxy.cs index 3c87738f36..db9e5f1e19 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StableStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StaticContext.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StaticContext.cs index 8e9c27e9d0..d803de2769 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StaticContext.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StaticContext.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This is used to validate the ability to use `this` from within a static context. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Statics.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Statics.cs index 0ab8962456..fabaa43e58 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Statics.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Statics.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StringEnum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StringEnum.cs index 280e8326a6..4c7851da65 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StringEnum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StringEnum.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StripInternal.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StripInternal.cs index a82b9ffa7f..e1b17595e7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StripInternal.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StripInternal.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructA.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructA.cs index a4d1d7f89a..a689765a1d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructA.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructA.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// We can serialize and deserialize structs without silently ignoring optional fields. /// /// Stability: Experimental @@ -35,7 +39,7 @@ public double? OptionalNumber /// [JsiiOptional] [JsiiProperty(name: "optionalString", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string OptionalString + public string? OptionalString { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructAProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructAProxy.cs index 7742ba3131..dfccd35da5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructAProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructAProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// We can serialize and deserialize structs without silently ignoring optional fields. @@ -37,9 +39,9 @@ public double? OptionalNumber /// [JsiiOptional] [JsiiProperty(name: "optionalString", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string OptionalString + public string? OptionalString { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructB.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructB.cs index 589a204f70..5e3288721b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructB.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructB.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// This intentionally overlaps with StructA (where only requiredString is provided) to test htat the kernel properly disambiguates those. /// /// Stability: Experimental @@ -35,7 +39,7 @@ public bool? OptionalBoolean /// [JsiiOptional] [JsiiProperty(name: "optionalStructA", typeJson: "{\"fqn\":\"jsii-calc.StructA\"}", isOptional: true, isOverride: true)] - public Amazon.JSII.Tests.CalculatorNamespace.IStructA OptionalStructA + public Amazon.JSII.Tests.CalculatorNamespace.IStructA? OptionalStructA { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructBProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructBProxy.cs index b76baf4d8b..fbeb80c2fe 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructBProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructBProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This intentionally overlaps with StructA (where only requiredString is provided) to test htat the kernel properly disambiguates those. @@ -37,9 +39,9 @@ public bool? OptionalBoolean /// [JsiiOptional] [JsiiProperty(name: "optionalStructA", typeJson: "{\"fqn\":\"jsii-calc.StructA\"}", isOptional: true)] - public Amazon.JSII.Tests.CalculatorNamespace.IStructA OptionalStructA + public Amazon.JSII.Tests.CalculatorNamespace.IStructA? OptionalStructA { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructParameterType.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructParameterType.cs index c1b8aab88f..498e8ebb67 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructParameterType.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructParameterType.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// Verifies that, in languages that do keyword lifting (e.g: Python), having a struct member with the same name as a positional parameter results in the correct code being emitted. /// /// See: https://github.com/aws/aws-cdk/issues/4302 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructParameterTypeProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructParameterTypeProxy.cs index d9939df08e..25ffff86b0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructParameterTypeProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructParameterTypeProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that, in languages that do keyword lifting (e.g: Python), having a struct member with the same name as a positional parameter results in the correct code being emitted. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructPassing.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructPassing.cs index 3548183d09..0d7de5953d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructPassing.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructPassing.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Just because we can. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructUnionConsumer.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructUnionConsumer.cs index fc09513726..550aa1ab46 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructUnionConsumer.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructUnionConsumer.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructWithJavaReservedWords.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructWithJavaReservedWords.cs index 5908b67305..ae29361d74 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructWithJavaReservedWords.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructWithJavaReservedWords.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// @@ -23,7 +27,7 @@ public string Default /// [JsiiOptional] [JsiiProperty(name: "assert", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Assert + public string? Assert { get; set; @@ -34,7 +38,7 @@ public string Assert /// [JsiiOptional] [JsiiProperty(name: "result", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Result + public string? Result { get; set; @@ -45,7 +49,7 @@ public string Result /// [JsiiOptional] [JsiiProperty(name: "that", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string That + public string? That { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructWithJavaReservedWordsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructWithJavaReservedWordsProxy.cs index 040a7bc4f1..82d29eef13 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructWithJavaReservedWordsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/StructWithJavaReservedWordsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -26,9 +28,9 @@ public string Default /// [JsiiOptional] [JsiiProperty(name: "assert", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Assert + public string? Assert { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } /// @@ -36,9 +38,9 @@ public string Assert /// [JsiiOptional] [JsiiProperty(name: "result", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Result + public string? Result { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } /// @@ -46,9 +48,9 @@ public string Result /// [JsiiOptional] [JsiiProperty(name: "that", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string That + public string? That { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Sum.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Sum.cs index 6bca4fd053..c58a18874c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Sum.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Sum.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// An operation that sums multiple values. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilder.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilder.cs index 98d5d33d66..4d125e367a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilder.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilder.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -15,7 +17,7 @@ public class SupportsNiceJavaBuilder : Amazon.JSII.Tests.CalculatorNamespace.Sup /// /// Stability: Experimental /// - public SupportsNiceJavaBuilder(double id, double? defaultBar = null, Amazon.JSII.Tests.CalculatorNamespace.ISupportsNiceJavaBuilderProps props = null, params string[] rest): base(new DeputyProps(new object[]{id, defaultBar, props, rest})) + public SupportsNiceJavaBuilder(double id, double? defaultBar = null, Amazon.JSII.Tests.CalculatorNamespace.ISupportsNiceJavaBuilderProps? props = null, params string[] rest): base(new DeputyProps(new object?[]{id, defaultBar, props, rest})) { } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderProps.cs index e054353717..16c2819a9d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderProps.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// @@ -27,7 +31,7 @@ public double Bar /// [JsiiOptional] [JsiiProperty(name: "id", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Id + public string? Id { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderPropsProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderPropsProxy.cs index cba35e3736..d11df3b092 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderPropsProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderPropsProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -30,9 +32,9 @@ public double Bar /// [JsiiOptional] [JsiiProperty(name: "id", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Id + public string? Id { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderWithRequiredProps.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderWithRequiredProps.cs index d8000f5ae5..2f9b227c46 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderWithRequiredProps.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SupportsNiceJavaBuilderWithRequiredProps.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// We can generate fancy builders in Java for classes which take a mix of positional & struct parameters. @@ -56,9 +58,9 @@ public virtual double Id /// [JsiiOptional] [JsiiProperty(name: "propId", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public virtual string PropId + public virtual string? PropId { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SyncVirtualMethods.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SyncVirtualMethods.cs index b5a676eb67..130db1db59 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SyncVirtualMethods.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/SyncVirtualMethods.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Thrower.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Thrower.cs index 72beae0e91..16df088228 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Thrower.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/Thrower.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/TopLevelStruct.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/TopLevelStruct.cs index f977c645cf..71952e0149 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/TopLevelStruct.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/TopLevelStruct.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// @@ -36,7 +40,7 @@ public object SecondLevel /// [JsiiOptional] [JsiiProperty(name: "optional", typeJson: "{\"primitive\":\"string\"}", isOptional: true, isOverride: true)] - public string Optional + public string? Optional { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/TopLevelStructProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/TopLevelStructProxy.cs index ac8c762695..9c94640e97 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/TopLevelStructProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/TopLevelStructProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -38,9 +40,9 @@ public object SecondLevel /// [JsiiOptional] [JsiiProperty(name: "optional", typeJson: "{\"primitive\":\"string\"}", isOptional: true)] - public string Optional + public string? Optional { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnaryOperation.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnaryOperation.cs index 1c402f5d09..20bcad5a4c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnaryOperation.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnaryOperation.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// An operation on a single operand. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnaryOperationProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnaryOperationProxy.cs index e0d8ec41ce..cf7df5d32b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnaryOperationProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnaryOperationProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// An operation on a single operand. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnionProperties.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnionProperties.cs index f02034633d..c827b0e642 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnionProperties.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnionProperties.cs @@ -1,7 +1,11 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { + #pragma warning disable CS8618 + /// /// Stability: Experimental /// @@ -23,7 +27,7 @@ public object Bar /// [JsiiOptional] [JsiiProperty(name: "foo", typeJson: "{\"union\":{\"types\":[{\"primitive\":\"string\"},{\"primitive\":\"number\"}]}}", isOptional: true, isOverride: true)] - public object Foo + public object? Foo { get; set; diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnionPropertiesProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnionPropertiesProxy.cs index 436b1f1a36..16732ebbcf 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnionPropertiesProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UnionPropertiesProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// @@ -26,9 +28,9 @@ public object Bar /// [JsiiOptional] [JsiiProperty(name: "foo", typeJson: "{\"union\":{\"types\":[{\"primitive\":\"string\"},{\"primitive\":\"number\"}]}}", isOptional: true)] - public object Foo + public object? Foo { - get => GetInstanceProperty(); + get => GetInstanceProperty(); } } } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseBundledDependency.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseBundledDependency.cs index c6e9b96255..cbf27fedd2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseBundledDependency.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseBundledDependency.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseCalcBase.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseCalcBase.cs index f9235114a6..ef9929be49 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseCalcBase.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UseCalcBase.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Depend on a type from jsii-calc-base as a test for awslabs/jsii#128. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UsesInterfaceWithProperties.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UsesInterfaceWithProperties.cs index febf3cc0c1..85b8ea2818 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UsesInterfaceWithProperties.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/UsesInterfaceWithProperties.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VariadicInvoker.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VariadicInvoker.cs index d9f790b1ff..2c7f3d7d65 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VariadicInvoker.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VariadicInvoker.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VariadicMethod.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VariadicMethod.cs index 37de546d70..102b19b473 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VariadicMethod.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VariadicMethod.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VirtualMethodPlayground.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VirtualMethodPlayground.cs index c3afa3c6d5..e55286686c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VirtualMethodPlayground.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VirtualMethodPlayground.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VoidCallback.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VoidCallback.cs index 9886d1b2e6..0b71fc3d26 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VoidCallback.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VoidCallback.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This test is used to validate the runtimes can return correctly from a void callback. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VoidCallbackProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VoidCallbackProxy.cs index 2914e93c16..17fcef5856 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VoidCallbackProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/VoidCallbackProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// This test is used to validate the runtimes can return correctly from a void callback. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/WithPrivatePropertyInConstructor.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/WithPrivatePropertyInConstructor.cs index 4810fc52a5..2dfcb9651f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/WithPrivatePropertyInConstructor.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/WithPrivatePropertyInConstructor.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace { /// Verifies that private property declarations in constructor arguments are hidden. @@ -12,7 +14,7 @@ public class WithPrivatePropertyInConstructor : DeputyBase /// /// Stability: Experimental /// - public WithPrivatePropertyInConstructor(string privateField = null): base(new DeputyProps(new object[]{privateField})) + public WithPrivatePropertyInConstructor(string? privateField = null): base(new DeputyProps(new object?[]{privateField})) { } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperation.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperation.cs index 0834928c12..3a63d09ea9 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperation.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperation.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.composition { /// Abstract operation composed from an expression of other operations. diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperationProxy.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperationProxy.cs index 93d28c6281..4f70dac317 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperationProxy.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon/JSII/Tests/CalculatorNamespace/composition/CompositeOperationProxy.cs @@ -1,5 +1,7 @@ using Amazon.JSII.Runtime.Deputy; +#pragma warning disable CS0672,CS0809,CS1591 + namespace Amazon.JSII.Tests.CalculatorNamespace.composition { /// Abstract operation composed from an expression of other operations. From e9e6cb2326b551d1cf73906cad05dcd73e2bd0d9 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 03:19:33 +0000 Subject: [PATCH 05/18] chore(deps-dev): bump @typescript-eslint/eslint-plugin (#1252) --- package.json | 2 +- yarn.lock | 32 +++++++++++++++++++++++++++----- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 5d8f9b8cab..cf6af59163 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "test:update": "lerna run test:update --stream" }, "devDependencies": { - "@typescript-eslint/eslint-plugin": "^2.19.0", + "@typescript-eslint/eslint-plugin": "^2.19.2", "@typescript-eslint/parser": "^2.19.0", "eslint": "^6.8.0", "eslint-plugin-import": "^2.20.1", diff --git a/yarn.lock b/yarn.lock index 758356e5d0..0ba6062aca 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1510,12 +1510,12 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^2.19.0": - version "2.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.19.0.tgz#bf743448a4633e4b52bee0c40148ba072ab3adbd" - integrity sha512-u7IcQ9qwsB6U806LupZmINRnQjC+RJyv36sV/ugaFWMHTbFm/hlLTRx3gGYJgHisxcGSTnf+I/fPDieRMhPSQQ== +"@typescript-eslint/eslint-plugin@^2.19.2": + version "2.19.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.19.2.tgz#e279aaae5d5c1f2547b4cff99204e1250bc7a058" + integrity sha512-HX2qOq2GOV04HNrmKnTpSIpHjfl7iwdXe3u/Nvt+/cpmdvzYvY0NHSiTkYN257jHnq4OM/yo+OsFgati+7LqJA== dependencies: - "@typescript-eslint/experimental-utils" "2.19.0" + "@typescript-eslint/experimental-utils" "2.19.2" eslint-utils "^1.4.3" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" @@ -1530,6 +1530,15 @@ "@typescript-eslint/typescript-estree" "2.19.0" eslint-scope "^5.0.0" +"@typescript-eslint/experimental-utils@2.19.2": + version "2.19.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.2.tgz#4611d44cf0f0cb460c26aa7676fc0a787281e233" + integrity sha512-B88QuwT1wMJR750YvTJBNjMZwmiPpbmKYLm1yI7PCc3x0NariqPwqaPsoJRwU9DmUi0cd9dkhz1IqEnwfD+P1A== + dependencies: + "@types/json-schema" "^7.0.3" + "@typescript-eslint/typescript-estree" "2.19.2" + eslint-scope "^5.0.0" + "@typescript-eslint/parser@^2.19.0": version "2.19.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.19.0.tgz#912160d9425395d09857dcd5382352bc98be11ae" @@ -1553,6 +1562,19 @@ semver "^6.3.0" tsutils "^3.17.1" +"@typescript-eslint/typescript-estree@2.19.2": + version "2.19.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.19.2.tgz#67485b00172f400474d243c6c0be27581a579350" + integrity sha512-Xu/qa0MDk6upQWqE4Qy2X16Xg8Vi32tQS2PR0AvnT/ZYS4YGDvtn2MStOh5y8Zy2mg4NuL06KUHlvCh95j9C6Q== + dependencies: + debug "^4.1.1" + eslint-visitor-keys "^1.1.0" + glob "^7.1.6" + is-glob "^4.0.1" + lodash "^4.17.15" + semver "^6.3.0" + tsutils "^3.17.1" + "@webassemblyjs/ast@1.8.5": version "1.8.5" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359" From 86572945b3b2ace25d8d239ad3ce520ca9b132a3 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 03:42:00 +0000 Subject: [PATCH 06/18] chore(deps): bump log4js from 6.1.1 to 6.1.2 (#1250) --- packages/jsii-diff/package.json | 2 +- packages/jsii/package.json | 2 +- yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index dbf7c0213b..3bdc191835 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -35,7 +35,7 @@ "@jsii/spec": "^0.22.0", "fs-extra": "^8.1.0", "jsii-reflect": "^0.22.0", - "log4js": "^6.1.1", + "log4js": "^6.1.2", "typescript": "~3.7.5", "yargs": "^15.1.0" }, diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 5fc1f7e98f..e666ed3ab6 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -38,7 +38,7 @@ "colors": "^1.4.0", "deep-equal": "^2.0.1", "fs-extra": "^8.1.0", - "log4js": "^6.1.1", + "log4js": "^6.1.2", "semver": "^7.1.2", "semver-intersect": "^1.4.0", "sort-json": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 0ba6062aca..c5a8ca2ebe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5653,10 +5653,10 @@ lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.2. resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== -log4js@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.1.1.tgz#cac96a09ff7e1b83f2598996a8517719e451a3d7" - integrity sha512-ZIhVqJrwWTIwEvSU08w4L18OTe2ikKpv9D7DbeastwaQTp2hz7bnVtjQMzha804aEBE0ohe78lpruQnnB04VNQ== +log4js@^6.1.2: + version "6.1.2" + resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.1.2.tgz#04688e1f4b8080c127b7dccb0db1c759cbb25dc4" + integrity sha512-knS4Y30pC1e0n7rfx3VxcLOdBCsEo0o6/C7PVTGxdVK+5b1TYOSGQPn9FDcrhkoQBV29qwmA2mtkznPAQKnxQg== dependencies: date-format "^3.0.0" debug "^4.1.1" From 127c8bc5326d6f8a5772b6faf3376d34370b6e8d Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 04:04:27 +0000 Subject: [PATCH 07/18] chore(deps-dev): bump @typescript-eslint/parser from 2.19.0 to 2.19.2 (#1251) --- package.json | 2 +- yarn.lock | 34 ++++++---------------------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index cf6af59163..404bb6c524 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ }, "devDependencies": { "@typescript-eslint/eslint-plugin": "^2.19.2", - "@typescript-eslint/parser": "^2.19.0", + "@typescript-eslint/parser": "^2.19.2", "eslint": "^6.8.0", "eslint-plugin-import": "^2.20.1", "eslint-import-resolver-node": "^0.3.3", diff --git a/yarn.lock b/yarn.lock index c5a8ca2ebe..59c4e06df7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1521,15 +1521,6 @@ regexpp "^3.0.0" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@2.19.0": - version "2.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.0.tgz#d5ca732f22c009e515ba09fcceb5f2127d841568" - integrity sha512-zwpg6zEOPbhB3+GaQfufzlMUOO6GXCNZq6skk+b2ZkZAIoBhVoanWK255BS1g5x9bMwHpLhX0Rpn5Fc3NdCZdg== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.19.0" - eslint-scope "^5.0.0" - "@typescript-eslint/experimental-utils@2.19.2": version "2.19.2" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.19.2.tgz#4611d44cf0f0cb460c26aa7676fc0a787281e233" @@ -1539,28 +1530,15 @@ "@typescript-eslint/typescript-estree" "2.19.2" eslint-scope "^5.0.0" -"@typescript-eslint/parser@^2.19.0": - version "2.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.19.0.tgz#912160d9425395d09857dcd5382352bc98be11ae" - integrity sha512-s0jZoxAWjHnuidbbN7aA+BFVXn4TCcxEVGPV8lWMxZglSs3NRnFFAlL+aIENNmzB2/1jUJuySi6GiM6uACPmpg== +"@typescript-eslint/parser@^2.19.2": + version "2.19.2" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.19.2.tgz#21f42c0694846367e7d6a907feb08ab2f89c0879" + integrity sha512-8uwnYGKqX9wWHGPGdLB9sk9+12sjcdqEEYKGgbS8A0IvYX59h01o8os5qXUHMq2na8vpDRaV0suTLM7S8wraTA== dependencies: "@types/eslint-visitor-keys" "^1.0.0" - "@typescript-eslint/experimental-utils" "2.19.0" - "@typescript-eslint/typescript-estree" "2.19.0" - eslint-visitor-keys "^1.1.0" - -"@typescript-eslint/typescript-estree@2.19.0": - version "2.19.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.19.0.tgz#6bd7310b9827e04756fe712909f26956aac4b196" - integrity sha512-n6/Xa37k0jQdwpUszffi19AlNbVCR0sdvCs3DmSKMD7wBttKY31lhD2fug5kMD91B2qW4mQldaTEc1PEzvGu8w== - dependencies: - debug "^4.1.1" + "@typescript-eslint/experimental-utils" "2.19.2" + "@typescript-eslint/typescript-estree" "2.19.2" eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^6.3.0" - tsutils "^3.17.1" "@typescript-eslint/typescript-estree@2.19.2": version "2.19.2" From 6d84a7e5d8fa96b9427b3f4adb0014ca490e72fe Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 20:19:47 +0000 Subject: [PATCH 08/18] chore(deps-dev): bump webpack from 4.41.5 to 4.41.6 (#1253) --- packages/@jsii/runtime/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 84238cd84a..9d812656ef 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -49,7 +49,7 @@ "source-map-loader": "^0.2.4", "typescript": "~3.7.5", "wasm-loader": "^1.3.0", - "webpack": "^4.41.5", + "webpack": "^4.41.6", "webpack-cli": "^3.3.10" }, "jest": { diff --git a/yarn.lock b/yarn.lock index 59c4e06df7..7e1105d6f7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8747,10 +8747,10 @@ webpack-sources@^1.4.0, webpack-sources@^1.4.1: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.41.5: - version "4.41.5" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz#3210f1886bce5310e62bb97204d18c263341b77c" - integrity sha512-wp0Co4vpyumnp3KlkmpM5LWuzvZYayDwM2n17EHFr4qxBBbRokC7DJawPJC7TfSFZ9HZ6GsdH40EBj4UV0nmpw== +webpack@^4.41.6: + version "4.41.6" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.6.tgz#12f2f804bf6542ef166755050d4afbc8f66ba7e1" + integrity sha512-yxXfV0Zv9WMGRD+QexkZzmGIh54bsvEs+9aRWxnN8erLWEOehAKUTeNBoUbA6HPEZPlRo7KDi2ZcNveoZgK9MA== dependencies: "@webassemblyjs/ast" "1.8.5" "@webassemblyjs/helper-module-context" "1.8.5" From e99d1ab948ac48cb381c8e42117d0ae7f39d8028 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 21:05:19 +0000 Subject: [PATCH 09/18] chore(deps-dev): bump @types/node from 10.17.14 to 10.17.15 (#1254) --- packages/@jsii/dotnet-analyzers/package.json | 2 +- packages/@jsii/dotnet-jsonmodel/package.json | 2 +- packages/@jsii/dotnet-runtime-test/package.json | 2 +- packages/@jsii/dotnet-runtime/package.json | 2 +- packages/@jsii/java-runtime/package.json | 2 +- packages/@jsii/kernel/package.json | 2 +- packages/@jsii/ruby-runtime/package.json | 2 +- packages/@jsii/runtime/package.json | 2 +- packages/@jsii/spec/package.json | 2 +- packages/@scope/jsii-calc-base-of-base/package.json | 2 +- packages/@scope/jsii-calc-base/package.json | 2 +- packages/@scope/jsii-calc-lib/package.json | 2 +- packages/codemaker/package.json | 2 +- packages/jsii-calc/package.json | 2 +- packages/jsii-config/package.json | 2 +- packages/jsii-diff/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii-reflect/package.json | 2 +- packages/jsii-rosetta/package.json | 2 +- packages/jsii/package.json | 2 +- packages/oo-ascii-tree/package.json | 2 +- yarn.lock | 8 ++++---- 22 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/@jsii/dotnet-analyzers/package.json b/packages/@jsii/dotnet-analyzers/package.json index b50e202286..fae03b6007 100644 --- a/packages/@jsii/dotnet-analyzers/package.json +++ b/packages/@jsii/dotnet-analyzers/package.json @@ -37,7 +37,7 @@ "package": "package-dotnet" }, "devDependencies": { - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii-build-tools": "^0.22.0", "typescript": "~3.7.5" } diff --git a/packages/@jsii/dotnet-jsonmodel/package.json b/packages/@jsii/dotnet-jsonmodel/package.json index 1c85be40d0..ae36dd3407 100644 --- a/packages/@jsii/dotnet-jsonmodel/package.json +++ b/packages/@jsii/dotnet-jsonmodel/package.json @@ -35,7 +35,7 @@ "package": "package-dotnet" }, "devDependencies": { - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii-build-tools": "^0.22.0", "typescript": "~3.7.5" } diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index 1894ea3435..648919aec6 100644 --- a/packages/@jsii/dotnet-runtime-test/package.json +++ b/packages/@jsii/dotnet-runtime-test/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@jsii/dotnet-runtime": "^0.22.0", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii-calc": "^0.22.0", "jsii-pacmak": "^0.22.0", "typescript": "~3.7.5" diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index 27a4316bd8..15624ad796 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -39,7 +39,7 @@ "devDependencies": { "@jsii/dotnet-jsonmodel": "^0.22.0", "@jsii/runtime": "^0.22.0", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "@types/semver": "^7.1.0", "jsii-build-tools": "^0.22.0", "semver": "^7.1.2", diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index b61ab8f1e2..1d556cc98e 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.22.0", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii-build-tools": "^0.22.0", "typescript": "~3.7.5" } diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 9452688a3f..937f6d8431 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -41,7 +41,7 @@ "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "@types/tar": "^4.0.3", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/packages/@jsii/ruby-runtime/package.json b/packages/@jsii/ruby-runtime/package.json index d5c0be23b3..6b527602a1 100644 --- a/packages/@jsii/ruby-runtime/package.json +++ b/packages/@jsii/ruby-runtime/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@jsii/runtime": "^0.22.0", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii-build-tools": "^0.22.0", "jsii-calc": "^0.22.0", "jsii-pacmak": "^0.22.0", diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 9d812656ef..fad9b3f7db 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -40,7 +40,7 @@ "@scope/jsii-calc-base": "^0.22.0", "@scope/jsii-calc-lib": "^0.22.0", "@types/jest": "^25.1.2", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "eslint": "^6.8.0", "jest": "^25.1.0", "jsii-build-tools": "^0.22.0", diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index a51c492458..3c8beb7722 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -34,7 +34,7 @@ }, "devDependencies": { "@types/jest": "^25.1.2", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "eslint": "^6.8.0", "jest": "^25.1.0", "jsii-build-tools": "^0.22.0", diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 4b53fac781..2b52f503ce 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -29,7 +29,7 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii": "^0.22.0", "jsii-build-tools": "^0.22.0", "jsii-rosetta": "^0.22.0" diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index 79b0489005..940d88d571 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -35,7 +35,7 @@ "@scope/jsii-calc-base-of-base": "^0.22.0" }, "devDependencies": { - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii": "^0.22.0", "jsii-build-tools": "^0.22.0", "jsii-rosetta": "^0.22.0" diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index 38bcc9b230..0cf2dc512e 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -37,7 +37,7 @@ "@scope/jsii-calc-base": "^0.22.0" }, "devDependencies": { - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii": "^0.22.0", "jsii-build-tools": "^0.22.0", "jsii-rosetta": "^0.22.0" diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 375994701a..5dc0819faa 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -38,7 +38,7 @@ "@types/decamelize": "^1.2.0", "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "eslint": "^6.8.0", "jest": "^25.1.0", "typescript": "~3.7.5" diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index 3c759857ac..4dabd747ec 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -47,7 +47,7 @@ "@scope/jsii-calc-lib": "^0.22.0" }, "devDependencies": { - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "jsii": "^0.22.0", "jsii-build-tools": "^0.22.0", "jsii-rosetta": "^0.22.0" diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 09a2b7b264..d0b103c1fa 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -21,7 +21,7 @@ "@types/inquirer": "^6.5.0", "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "@types/yargs": "^15.0.3", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 3bdc191835..45e8611d2d 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -43,7 +43,7 @@ "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "@types/tar-fs": "^1.16.2", "@types/yargs": "^15.0.3", "eslint": "^6.8.0", diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 1b02776ac9..1a7cfea17d 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -58,7 +58,7 @@ "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", "@types/mock-fs": "^4.10.0", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "@types/semver": "^7.1.0", "@types/yargs": "^15.0.3", "eslint": "^6.8.0", diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index 2853ec3e35..a1a8b2447a 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -43,7 +43,7 @@ "@scope/jsii-calc-lib": "^0.22.0", "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "@types/yargs": "^15.0.3", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index f27bcff323..29234b86c6 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -19,7 +19,7 @@ "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", "@types/mock-fs": "^4.10.0", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "@types/yargs": "^15.0.3", "eslint": "^6.8.0", "jest": "^25.1.0", diff --git a/packages/jsii/package.json b/packages/jsii/package.json index e666ed3ab6..5e8656b1ee 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -52,7 +52,7 @@ "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "@types/semver": "^7.1.0", "@types/yargs": "^15.0.3", "clone": "^2.1.2", diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 36df11dbb0..dd11633c9b 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -31,7 +31,7 @@ }, "devDependencies": { "@types/jest": "^25.1.2", - "@types/node": "^10.17.14", + "@types/node": "^10.17.15", "eslint": "^6.8.0", "jest": "^25.1.0", "jsii-build-tools": "^0.22.0", diff --git a/yarn.lock b/yarn.lock index 7e1105d6f7..95a20859ce 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1451,10 +1451,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.11.tgz#bec2961975888d964196bf0016a2f984d793d3ce" integrity sha512-O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ== -"@types/node@^10.17.14": - version "10.17.14" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.14.tgz#b6c60ebf2fb5e4229fdd751ff9ddfae0f5f31541" - integrity sha512-G0UmX5uKEmW+ZAhmZ6PLTQ5eu/VPaT+d/tdLd5IFsKRPcbe6lPxocBtcYBFSaLaCW8O60AX90e91Nsp8lVHCNw== +"@types/node@^10.17.15": + version "10.17.15" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.15.tgz#bfff4e23e9e70be6eec450419d51e18de1daf8e7" + integrity sha512-daFGV9GSs6USfPgxceDA8nlSe48XrVCJfDeYm7eokxq/ye7iuOH87hKXgMtEAVLFapkczbZsx868PMDT1Y0a6A== "@types/semver@^7.1.0": version "7.1.0" From b94fe5a5e71de9f4c525300b39b1381949658c98 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Tue, 11 Feb 2020 21:28:31 +0000 Subject: [PATCH 10/18] chore(deps-dev): bump webpack-cli from 3.3.10 to 3.3.11 (#1255) --- packages/@jsii/runtime/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index fad9b3f7db..8ae6494f71 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -50,7 +50,7 @@ "typescript": "~3.7.5", "wasm-loader": "^1.3.0", "webpack": "^4.41.6", - "webpack-cli": "^3.3.10" + "webpack-cli": "^3.3.11" }, "jest": { "collectCoverage": true, diff --git a/yarn.lock b/yarn.lock index 95a20859ce..8628d4897d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8722,10 +8722,10 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webpack-cli@^3.3.10: - version "3.3.10" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13" - integrity sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg== +webpack-cli@^3.3.11: + version "3.3.11" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.11.tgz#3bf21889bf597b5d82c38f215135a411edfdc631" + integrity sha512-dXlfuml7xvAFwYUPsrtQAA9e4DOe58gnzSxhgrO/ZM/gyXTBowrsYeubyN4mqGhYdpXMFNyQ6emjJS9M7OBd4g== dependencies: chalk "2.4.2" cross-spawn "6.0.5" From 503053dacd7cfe1eb53b38fdcfec374249fca305 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2020 14:43:11 +0100 Subject: [PATCH 11/18] chore(deps): bump semver from 7.1.2 to 7.1.3 (#1256) Bumps [semver](https://github.com/npm/node-semver) from 7.1.2 to 7.1.3. - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/master/CHANGELOG.md) - [Commits](https://github.com/npm/node-semver/compare/v7.1.2...v7.1.3) Signed-off-by: dependabot-preview[bot] --- packages/@jsii/dotnet-runtime/package.json | 2 +- packages/jsii-pacmak/package.json | 2 +- packages/jsii/package.json | 2 +- yarn.lock | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index 15624ad796..95fddfa521 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -42,7 +42,7 @@ "@types/node": "^10.17.15", "@types/semver": "^7.1.0", "jsii-build-tools": "^0.22.0", - "semver": "^7.1.2", + "semver": "^7.1.3", "typescript": "~3.7.5" } } diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 1a7cfea17d..35b5b736fe 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -43,7 +43,7 @@ "fs-extra": "^8.1.0", "jsii-reflect": "^0.22.0", "jsii-rosetta": "^0.22.0", - "semver": "^7.1.2", + "semver": "^7.1.3", "spdx-license-list": "^6.1.0", "xmlbuilder": "^13.0.2", "yargs": "^15.1.0" diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 5e8656b1ee..7c1bf78b35 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -39,7 +39,7 @@ "deep-equal": "^2.0.1", "fs-extra": "^8.1.0", "log4js": "^6.1.2", - "semver": "^7.1.2", + "semver": "^7.1.3", "semver-intersect": "^1.4.0", "sort-json": "^2.0.0", "spdx-license-list": "^6.1.0", diff --git a/yarn.lock b/yarn.lock index 8628d4897d..cfa19b99f9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7528,10 +7528,10 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== -semver@^7.1.1, semver@^7.1.2: - version "7.1.2" - resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.2.tgz#847bae5bce68c5d08889824f02667199b70e3d87" - integrity sha512-BJs9T/H8sEVHbeigqzIEo57Iu/3DG6c4QoqTfbQB3BPA4zgzAomh/Fk9E7QtjWQ8mx2dgA9YCfSF4y9k9bHNpQ== +semver@^7.1.1, semver@^7.1.3: + version "7.1.3" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.1.3.tgz#e4345ce73071c53f336445cfc19efb1c311df2a6" + integrity sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA== semver@~5.3.0: version "5.3.0" From a09b761d7b117a99fbeb3f432780c70b00d26696 Mon Sep 17 00:00:00 2001 From: Romain Marcadier-Muller Date: Fri, 14 Feb 2020 00:26:19 +0100 Subject: [PATCH 12/18] docs(spec): initial version of the jsii specification (#1133) --- docs/specifications/1-introduction.md | 205 ++++++ docs/specifications/2-type-system.md | 316 +++++++++ docs/specifications/3-kernel-api.md | 610 ++++++++++++++++++ .../4-standard-compliance-suite.md | 500 ++++++++++++++ docs/specifications/5-new-language-intake.md | 138 ++++ 5 files changed, 1769 insertions(+) create mode 100644 docs/specifications/1-introduction.md create mode 100644 docs/specifications/2-type-system.md create mode 100644 docs/specifications/3-kernel-api.md create mode 100644 docs/specifications/4-standard-compliance-suite.md create mode 100644 docs/specifications/5-new-language-intake.md diff --git a/docs/specifications/1-introduction.md b/docs/specifications/1-introduction.md new file mode 100644 index 0000000000..6c52d6b539 --- /dev/null +++ b/docs/specifications/1-introduction.md @@ -0,0 +1,205 @@ +# Introduction + +This document provides a high level overview of *jsii*, starting with it's +design tenets. It introduces the concepts and components that compose *jsii*. + + +## Updating the Specification + +### Introduction + +The *jsii* specification follows the guiding principles of an RFC. It is a +living document that describes the current understanding of how the various +[components](#components) of *jsii* are operating, as well as the approaches +used to ensure consistent behavior across the various supported languages. + +The document is mastered with the *jsii* codebase, making it easy to determine +what specification was in place at the time of a give *jsii* release (by ways of +referring to the `vX.Y.Z` git tag). A single version of the specification is +considered **active** at any given time: the version of the specification that +is represented on the `HEAD` commit of the `master` branch of the [`aws/jsii`] +repository. The **active** specification must be the base version for any update +proposal. + +[`aws/jsii`]: https://github.com/aws/jsii + +The process to update the specification is intended to be as lightweight as +possible, while ensuring sufficient conversation takes place before implementing +significant (and breaking) changes. Since the process to update the +specification is part of the specification itself, it is amenable to be changed +following the process described in the currently **active** specification. + +### Process + +While the general process for updating the specification is to create a GitHub +pull request against the [`aws/jsii`] repository, the exact requirements for +what should be included in the pull request vary depending on the type of update +that is proposed: + +- [:warning: Changing Behavior](#new-behavior) describes the process to be + followed when introducing changes to the behavior of any component of *jsii*: + new features, breaking changes to existing features, ... +- [:mag: Addressing Gaps](#addressing-gaps) is the process used for adding + specification around existing but un-specified behavior. +- [:thumbsup: Trivial Changes](#trivial) explains how to propose changes that + improve the specification without changing it's meaning. + +#### :warning: Changing Behavior + +If the change is **not backwards compatible** (it is a breaking change to an +existing feature, or it is a new feature that requires all runtime libraries +implement support immediately), a new RFC should be created in the +[`awslabs/aws-cdk-rfcs`] repository, following the [RFC Process]. This ensures +enough time is spent considering alternatives to breaking changes, and to create +consensus that the change is desirable before time is spent implementing it. + +[`awslabs/aws-cdk-rfcs`]: https://github.com/awslabs/aws-cdk-rfcs +[RFC Process]: https://github.com/aws/aws-cdk-rfcs#what-the-process-is + +> While going through the RFC process upfront is **strongly recommended**, +> contributors may choose not to file an RFC for a behavior change. In this case +> however, any core maintainer may decide that an RFC is required and block the +> contribution until the RFC process has been followed. +> +> It is worth noting that a draft pull request with proposed modifications to +> the specification (and possibly a proof-of-concept implementation), can b + +When the RFC is **ready**, a GitHub pull request is created that must contain: + +- Relevant additions or modifications to the specification documents +- Relevant additions or modifications to the compliance suite +- Implementation of the new behavior, including new or updated tests in all the + language bindings + +The pull request's body must reference the RFC if there has been one, and +otherwise must include all discussion necessary to explain the reasoning behind +the proposal (including alternatives considered, risks, ...). + +#### :mag: Addressing Gaps + +Proposal that increase the specification's coverage (desribing behavior that +already exists) are handled as GitHub pull request that must contain the +following elements: + +- Relevant additions to the specification documents +- New compliance test(s) that enshrine the described behavior +- Implementation of the new compliance test(s) for all *Generally Available* + language bindings + +The pull request body should provide pointers to any and all elements that can +be used to verify that the behavior that is described is indeed what is +currently implemented. + +#### :thumbsup: Trivial Changes + +Proposal of trivial changes, such as correcting typos in the document, or +re-phrasing elements of the specification without altering the meaning +(typically to improve clarity) are handled in a simple GitHub pull request. + + +## Design Tenets (unless you know better ones) + +* *jsii* APIs strive to feel idiomatic in all supported languages. +* *jsii* applications behave identically regardless of the language they are + written in. It favors correctness over performance. +* *jsii* **does not** attempt to support all TypeScript idioms (many features of + TypeScript cannot be expressed in some target languages). + * Unsupported idioms will cause a compile-time error to be emitted. + * When prohibiting an idiom, *jsii* strives to provide an error message that + gives the user insight into why the pattern cannot be supported. +* *jsii* does not force API design opinions on the developer: + * Reserved names are limited to a minimum. + * TypeScript API design patterns that are known to result in poor developer + experience when represented in other languages will cause warnings to be + issued, but the developer is ultimately entitled to decide whether they want + to take or leave the advice. +* *jsii* produces artifacts compatible with idiomatic tools whenever possible: + * Generated libraries can be easily published to the "standard" package + repository for the language. + * Standard tools can be used to work with the generated libraries, and do not + require any special configuration. + + +## Annotations + +Annotations are present in the *jsii* specification to provide additional +information to the reader that is non-normative. Those take the form of +block-quotes that use the following chart: + +- > :construction: Is used to annotate parts of the specification that are known + > to be partially or incorrectly implemented in the current releases. Those + > are known issues in the current implementation that will be addressed in the + > future. + +- > :question: Is used to annotate open questions. They are typically in parts + > of the specification that is likely to change in future releases, and that + > may be good candidates for introducing RFCs. + +- > :warning: Is used to draw the reader's attention on specific points. They + > are used primarily to help the reader identify areas of the specification + > that, when incorrectly implemented, may result in hard-to-troubleshoot bugs; + > or to identify behavior that is intentionally undefined. + +- > :information_source: Is used to provide additional context which may not be + > obvious to the reader. They typically contain trivia that can help the + > reader understand the motivation for certain behaviors that are not always + > intuitive. + +## Concepts + +*jsii* allows developers to author code once in **TypeScript**, while allowing +use in a variety of other programming languages (including **C#**, **Java** and +**Python**). + +### Assemblies + +The *jsii Assembly* document contains a specific representation of the API +exported by the **TypeScript** module. Similar to a header file in the **C++** +world, it contains only information about the signatures of APIs (type names +with method and property signatures, associated documentation elements, ...) and +no implementation. + +The *npm* package produced as a result of compiling the **TypeScript** source +remains the source of truth with respects to implementation of the API. + +### Host & Kernel + +The [*jsii* runtime architecture] defines two processes: + +1. The *host* process runs the users' code native environment (a Java virtual + machine, the .NET Runtime, ...). +2. The *kernel* process hosts the **JavaScript** code from the standard *npm* + package. + +The *host* process is responsible for starting the *kernel* process as needed. A +designated *host runtime library* provides helper functions that will perform +the necessary initialization when needed, so the *host* app does not need to +include any special boilerplate code. + +The two processes exchange messages over a designated communication channel (for +example, using pipes), using a *kernel API* that is standardized in the *jsii +specification*. + +[*jsii* runtime architecture]: ../runtime-architecture.md + + +## Components + +Several tools are involved in making this possible: + +* [`jsii`] is a modified **TypeScript** compiler. In addition to generating + **JavaScript** code from the source, it produces a *jsii Assembly* document. +* [`jsii-pacmak`] generates language bindings from a package compiled using + `jsii`. It generates code in *host* languages that expose the API declared in + the *jsii Assembly* document. +* *Host runtime libraries* centralize features used by code generated by + [`jsii-pacmak`], such as primitives to interact with the *kernel* process, so + that this code does not need to be duplicated in every generated module. +* [`@jsii/kernel`] (and [`@jsii/runtime`]) provide the functionality exposed by + the *kernel* process, and allow the *host* code to seamlessly interact with + the **JavaScript** implementation. + +[`jsii`]: ../../../packages/jsii +[`jsii-pacmak`]: ../../../packages/jsii-pacmak +[`@jsii/kernel`]: ../../../packages/@jsii/kernel +[`@jsii/runtime`]: ../../../packages/@jsii/runtime diff --git a/docs/specifications/2-type-system.md b/docs/specifications/2-type-system.md new file mode 100644 index 0000000000..1d66f796dc --- /dev/null +++ b/docs/specifications/2-type-system.md @@ -0,0 +1,316 @@ +# The *jsii* type system + +## Preamble +The base language for authoring *jsii* libraries for re-use from other languages +is **TypeScript**, which compiles to **JavaScript**. Consequently, the base type +system that *jsii* sources from is that of **TypeScript**. + +When used from another language than **TypeScript** or **JavaScript**, *jsii* +libraries are running the **JavaScript** code in a child *node* process, and +data is exchanged using **JSON**-based protocol. + +This document describes how **TypeScript** types map into the *jsii* type +system. + +The API represented by the *jsii* assembly only covers declarations that are +exported from the main file in the **TypeScript** project (as specified in the +`package.json` file by the `types` attribute). Restrictions described in this +document only apply to such declarations, the rest of the module can leverage +any **TypeScript** feature. + +## Basic Types + +### Introduction +In order to build useful programs, the simplest units of data need to be +modeled: booleans, numbers, strings, etc... Those basic building blocks are the +foundations on which APIs stand. *jsii* supports much of the same types that +**TypeScript** and **JavaScript** support, although with notable differences. + +### Boolean +The *jsii* type system mirrors **TypeScript**'s `boolean`, which is the simplest +primitive data types, with only two supported values: `true` and `false`. + +### Number +The *jsii* type system mirrors **TypeScript**'s `number`. All numbers are +floating point values. + +### String +The *jsii* type system mirrors **TypeScript**'s `string`. Strings are used to +represent textual data. + +### List +**TypeScript** arrays (`Array`, `T[]`, `ReadonlyArray` and `readonly T[]`) +are represented as *lists* in the *jsii* type model. Lists are shared between +the *node* process and the host process by-value, meaning a copy of the array is +produced each time it is passed through the process boundary. + +> :information_source: Items in the list may be passed by-reference (according +> to their type's specification), in which case mutating operations performed on +> those may be visible across the process boundary. + +### Enum +As in many languages, `enum` can be used to represent a group of related +constants. Whle **TypeScript** `enum` entries are associated with a value that +is either a `string` or a `number`, the *jsii* type system does not allow for +those to be down-casted to their value type (e.g: a `string`-valued `enum` entry +cannot be directly passed into a `string` parameter). + +> :information_source: Unlike in certain languages such as **Java**, `enum` +> types cannot declare new properties or methods. + +### Any and Unknown +**TypeScript** defines two opaque types: `any` and `unknown` that can be used to +represent a value of arbitary type. The difference between them is that while +`any` is assignable to any other type, `unknown` requires a type assertion or +explicit cast to be performed before it can be assigned. + +> :information_source: It is important to note that, contrary to the other types +> in the **TypeScript** type system, `any` and `unknown` types are inherently +> `null`-able. + +### Void +As in most languages, the `void` type is used to denote a method does not return +anything. + +### Null and Undefined +**JavaScript** differentiates `undefined` and `null` values. While `undefined` +denotes that *no value* has been set, `null` denotes an intentional signal of +there being *no data*. Most other programming languages (particularly statically +typed languages) however lack this distinction, and the *jsii* type model +consequently considers `null` and `undefined` are semantically equivalent. + +> :information_source: Unlike certain other programming languages, such as +> **Java**, **TypeScript** does not allow `null` (or `undefined`) values unless +> the type signature expressedly supports that (with the exception of `any` and +> `unknown`, which are implicitly `null`-able, as was discussed earlier). + +### Object +**TypeScript**'s `object` type denotes anything that is not a *primitive* type, +meaning anything other than a `number`, `srting`, `boolean`, `biging`, `symbol`, +`null` or `undefined`. + +In the *jsii* type model, `object` indicates a block of structured data that can +be shared by-value across the process boundary. As a consequence, they may not +include any method. + +> :construction: This type is called `Json` in the current implementation. + +> :question: The by-value nature of `object` is problematic because +> **TypeScript** makes no guarantee with respects to the absence of methods on +> `object`, and properties may be dynamic. + +### Promises +*jsii* supports asynchronous methods, and the **TypeScript** `Promise` type +has to be used as the result of `async` methods. Promises can only be used as +the result type of methods, not as the type of a property or parameter. + +### Unsupported **TypeScript** basic types +Due to how such types cannot be represented in many other programming languages, +the *jsii* type model does not support the following **TypeScript** entities: +- Tuples, a group of arbitrarily-typed values, often used as the result type for + multi-valued functions. +- The `never` type, which is used as the return type of functions that will not + yield control back to their invoker (infinite loops, `process.exit()`, ...). +- `bigint` and `symbol` don't have equivalents in many other programming + languages and are generally of limited value in API design. + + +## Complex Types +The goal of *jsii* is to enable cross-language re-use of class libraries. +**TypeScript** enables representing classic object-oriented concepts such as +*classes*, *interfaces* and such. The *jsii* type system supports some +additional nuances on top of those, to better represent **TypeScript** and +**JavaScript** idioms in a way that enables generating convenient APIs in other +languages. + +### Classes +Exported **TypeScript** classes are represented in the *jsii* type system, with +the following restrictions from plain **TypeScript**: +- Methods overloads are not supported. +- Overridden methods or properties must retain the exact same type signature as + the one declared in a parent type. The **jsii** type system strictly enforces + the [Liskov substitution principle]. + +[Liskov substitution principle]: https://en.wikipedia.org/wiki/Liskov_substitution_principle + +### Interfaces & Structs +Exported **TypeScript** interfaces are interpreted as one of two entities in the +*jsii* type system: +- If the `interface` name is prefixed with an `I` (e.g: `ISomething`), it is + interpreted as a *behavioral interface*. +- Otherwise (e.g: `Something`), it is interpreted as a *struct*. + +#### Behavioral Interfaces +*Behavioral interfaces* are the usual object-oriented interface: they can extend +other *behavioral interfaces*, and can be extended by *classes*. They may +however not extend *structs*. + +#### Structs +*Structs* are used to model the **JavaScript** idiom of receiving options as an +object literal passed as the last parameter of a function. They are a formal +description of a bag of properties, and are not meant to be implemented by other +types. Since those types are used as inputs, they can be handled as pure-data, +immutable objects, and the following restrictions apply: +- A *struct* cannot declare any *method*: they must be kept behavior-free. +- All properties declared by a *struct* must be `readonly`. The values of the + properties may however be mutable. + +*Structs* may extend one or more other *structs*, but cannot extend or be +extended by *behavioral interfaces*, and may not be implemented by *classes*. + +### Type Unions +In certain cases, several different kinds of values are acceptable for a given +parameter or return type. **TypeScript** models those cases using *type unions*, +which are represented as `TypeA | TypeB`. The *jsii* type model supports those, +however most other statically typed languages do not have such a concept, making +those parameters or return values difficult to use from those languages, as the +value has to be declared using the most generic reference type available (for +example, in **Java**, those are returned as `java.lang.Object`). + +When used as inputs (parameters, or properties of a *struct*), it may be +possible to generate method overloads that will allow for a convenient API in +languages that support overloards. + +In general however, *type unions* are discouraged and should only be used when +there is no alternate way to model the API. + + +## Serialization Behavior + +When values are passed between the *host* process and the `node` process, they +are serialized as JSON documents. They can be passed by value or by reference, +depending on the type of the value as well as the declared type of the transfer +point (method return type, property type, argument type, ...). + +The table below describes the serialization behavior applied for each possible +*declared* type (rows) for a value of a given dynamic type (columns). The :x: +sign expresses cases that are illegal and should cause immediate failure. The +term *primitive* encompasses `boolean`, `string`, and `number`. + +  | `undefined` | `Date` | *primitive* | `Array` | *instance* | `object` +------------|-------------|-------------|-------------|-------------|-------------|------------- +`void` | `undefined` | `undefined` | `undefined` | `undefined` | `undefined` | `undefined` +`Date` | `undefined` | [Date] | :x: | :x: | :x: | :x: +*primitive* | `undefined` | :x: | [Identity] | :x: | :x: | :x: +`enum` | `undefined` | :x: | [Enum] | :x: | :x: | :x: +`List` | `undefined` | :x: | :x: | [Array] | :x: | :x: +`Map` | `undefined` | :x: | :x: | :x: | :x: | [Mapping] +`interface` | `undefined` | :x: | :x: | :x: | [Reference] | [Reference] +`struct` | `undefined` | :x: | :x: | :x: | :x: | [Value] +`class` | `undefined` | :x: | :x: | :x: | [Reference] | [Reference] +`any` | `undefined` | [Date] | [Identity] | [Array] | [Reference] | [Mapping] + + +> :warning: The serialization behavior around `undefined` values is affected by +> the `optional` attribute of the declared type. As discussed earlier, the `any` +> type is implicitly `optional`; but all other types' serialization process will +> only allow serialization of `undefined` if they were declared `optional`. + + +### Array Serialization +[Array]: #array-serialization + +Arrays are serialized into the standard JSON representation for them. Each value +in the array is serialized according to the behavior dictated by the declared +element type of the list, combined with the dynamic type of the value itself. + +### Date Serialization +[Date]: #date-serialization + +JSON has no standard expression for `Date`. A special JSON object representation +is used to allow unambiguously conveying a date. The wrapper has a single key +(`$jsii.date`) with the [ISO 8601-1] UTC representation of the `Date` value: + +```json +{ "$jsii.date": "2020-01-20T14:04:00.000Z" } +``` + +[ISO 8601-1]: https://www.iso.org/obp/ui#iso:std:iso:8601:-1:ed-1:v1:en + +### Enum Serialization +[Enum]: #enum-serialization + +In **JavaScript**, `enum` entries are represented by their value equivalent. In +order to support statically typed representations in other languages, these are +serialized using a dedicated wrapper object, using a single key (`$jsii.enum`) +with the fully qualified name of the `enum` entry: + +```json +{ "$jsii.enum": "@scope/module.EnumType.ENTRY_NAME" } +``` + +### Identity Serialization +[Identity]: #identity-serialization + +The identity serialization is achieved by using the standard JSON representation +of the primitive type. JSON strings are expressed using the `UTF-8` character +set. + +### Mapping Serialization +[Mapping]: #mapping-serialization + +Key-value pairs are passed by-value between the processes and is wrapped using a +single-key (`$jsii.map`) associated with the JSON representation of the encoded +object; where values are serialized according to the behavior dictated by the +element type of the mapping, combined with the dynamic type of the value itself: + +```json +{ + "$jsii.map": { + "foo": { + "date": { "$jsii.date": "2020-01-20T14:04:00.000Z" }, + "map": { "$jsii.map": {} } + } + } +} +``` + +### Reference Serialization +[Reference]: #reference-serialization + +Objects serialized by reference are passed using a special object that provides +sufficient information to tie back to the instance within it's owning process. +It includes a `$jsii.byref` key associated with a string that uniquely +identifies the instance, and an optional `$jsii.interfaces` key that provides a +list of interfaces that the object implements. + +```js +{ + "$jsii.byref": "@scope/module.Foo@1337", + "$jsii.interfaces": ["@scope/module.IBar", "@scope/module.IBaz"] +} +``` + +### Value Serialization +[Value]: #value-serialization + +*Structs* can be serialized by-value. In those cases, the value is wrapped using +a special object that encapsulates the type information for the provided data as +well as the *struct*'s members. + +The wrapper uses a single `$jsii.struct` key with a `fqn` key that indicates the +fully qualified name of the *struct* type, and a `data` key that contains the +members of the *struct*, serialized according to the behavior described in this +document. + +```js +{ + "$jsii.struct": { + "fqn": "@scope/module.StructType", + "data": { + "enumValue": { "$jsii.enum": "@scope/module.EnumType.ENTRY_NAME" }, + "stringProperty": "Hello, I'm a string!" + } + } +} +``` + +## References + +The [**TypeScript** Handbook] describes the language's type system and syntax +elements that serve as the basis for the *jsii* type system. Additionally, the +**JavaScript** type system is described in the [**JavaScript** Fundamentals] +document. + +[**JavaScript** Fundamentals]: https://javascript.info/types +[**TypeScript** Handbook]: https://www.typescriptlang.org/docs/handbook/basic-types.html diff --git a/docs/specifications/3-kernel-api.md b/docs/specifications/3-kernel-api.md new file mode 100644 index 0000000000..920a8d0504 --- /dev/null +++ b/docs/specifications/3-kernel-api.md @@ -0,0 +1,610 @@ +# The *jsii* kernel API +This document describes the API for the `@jsii/kernel` module, which is to be +used by all *host* libraries. It provides the fundational features necesarry for +*host* processes to interact with the original module's code. + +> :construction: Currently, `@jsii/kernel` contains the bulk of the logic, +> however a separate `@jsii/runtime` package owns the dialogue between the +> *host* and *kernel* processes. The `@jsii/runtime` is a very thin glue layer +> and it will eventually be merged into `@jsii/kernel`. + +## Errors +Most of the calls described in this document may result in an error being +raised. It is the responsibility of the *host* runtime library to deal with such +errors correctly: action retries, propagate the error to the *host* app's code, +and so on. + +Error responses are signaled by the `error` key: + +```ts +export interface ErrorResponse { + /** A simple message describing what happened. */ + message: string; + /** Whenever possible, the stack trace of the error. */ + stack?: string; +} +``` + +Where possible, the *host* runtime libraries should make sure to affix their own +stack trace information where relevant to the *kernel* process's stack trace +when such errors are propagated to *host* app's code, in order to offer as much +relevant context information as possible. + +## Initialization - the `hello` message +The *host* library is responsible for spawning the `node` process that will run +the original module's code. This `node` process runs the `@jsii/kernel` +application, and API messages are exchanged of the `node` processes' standard +input and output pipes. + +Upon initialization, the `@jsii/kernel` process introduces itself to the *host* +application by emitting a single JSON message: + +```js +{ + // The package name@version of the @jsii/kernel in use + "hello": "@jsii/runtime@0.21.1", +} +``` + +Any additional key present on the `hello` message will be silently ignored by a +*host* library that does not know how to process it, ensuring forward +compatibility of this message, if and when new attributes are added. + +> :construction: In the future, this message may be augmented with additional +> keys to enable feature negotiation between the *host* application and the +> `@jsii/kernel`. + +## General Kernel API +Once the `hello` handshake is complete, a sequence of request and responses are +exchanged with the `@jsii/kernel`. Requests take the form of JSON-encoded +messages that all follow the following pattern: + +```ts +interface Request { + /** + * This field discriminates the various request types. + */ + api: 'load' // Loading jsii assemblies into the Kernel + | 'naming' // Obtaining naming information for loaded assemblies + | 'stats' // Obtaining statistics about the Kernel usage + | 'create' // Creating objects + | 'del' // Destroying objects + | 'invoke' | 'sinvoke' // Invoking methods (and static methods) + | 'get' | 'sget' // Invoking getters (and static getters) + | 'set' | 'sset' // Invoking setters (and static setters) + | 'begin' | 'end' // Asynchronous method invocation + ; + + // ... request-type specific fields ... +} +``` + +### Loading *jsii* assemblies into the Kernel +Before any *jsii* type can be used, the assembly that provides it must be loaded +into the kernel. Similarly, all dependencies of a given *jsii* module must have +been loaded into the kernel before the module itself can be loaded (the +`@jsii/kernel` do not perofrm any kind of dependency resolution). + +Loading new assemblies into the `@jsii/kernel` is done using the `load` API: + +```ts +interface LoadRequest { + /** The name of the assembly being loaded */ + name: string; + /** The version of the assembly being loaded */ + version: string; + /** The local path to the npm package for the assembly */ + tarball: string; + + // The discriminator + api: 'load'; +} +``` + +The response to the `load` call provides some high level information pertaining +to the loaded assembly, which may be used by the *host* app to validate the +result of the operation: + +```ts +interface LoadResponse { + /** The name of the assembly that was just loaded */ + assembly: string; + /** The number of types the assembly declared */ + types: number; +} +``` + +Once a module is loaded, all the types it declares immediately become available. + +### Obtaining naming information for loaded assemblies +In certain cases, *host* runtime libraries may need to obtain naming information +from assemblies in order to determine the translation table from a *jsii* +fully-qualified name to a *host*-native name. This can be retrieved using the +`naming` call: + +```ts +export interface NamingRequest { + /** The name of the assembly for which naming is requested */ + assembly: string; + + // The discriminator + api: 'naming'; +} +``` + +In response to the `naming` call, the `@jsii/kernel` returns the configuration +block for each language supported by the named `assembly`: + +```ts +export interface NamingResponse { + /** The naming information for the requested assembly. */ + naming: { + /** + * For each language, provides the jsii configuration block. The content of + * this configuration block is specified by each language implementation. + */ + [language: string]: { [key: string]: any }; + }; +} +``` + +### Obtaining statistics about the Kernel usage +The `stats` call can be used to obtain information about the current `Kernel` +instance, which can be leveraged by unit tests or in order to produce metrics +for tracking the health of a long-running *jsii* app. + +```ts +export interface StatsRequest { + // The discriminator + api: 'stats'; +} +``` + +The response to the `stats` call contains synthetic information about the +current state of the `Kernel`: + +```ts +export interface StatsResponse { + /** The number of object reference currently tracked by the Kernel */ + objectCount: number; +} +``` + +### Creating objects +Most *jsii* workflows start with creating instances of objects. This can mean +creating a pure **JavaScript** object, instantiating a sub-class of some +**JavaScript** class, or even creating a pure-*host* instance that implements +a collection of *behavioral interfaces*. + +Creating objects is achieved using the `create` API, which accepts the following +parameters: + +```ts +interface CreateRequest { + /** The jsii fully qualified name of the class */ + fqn: string; + /** Any arguments to provide to the constructor */ + args?: any[]; + /** Additional interfaces implemented in the host app */ + interfaces?: string[]; + /** Any methods or property overridden in the host app */ + overrides?: Override[]; + + // The discriminator + api: 'create'; +} +``` + +The response to the object call is a decorated `ObjectReference` object (which +is a common parameter to other calls in the `@jsii/kernel` API, used to refer +to a particular instance): + +```ts +interface ObjectReference { + /** A handle that uniquely idenfies an instance */ + '$jsii.byref': string; +} + +interface CreateResponse extends ObjectReference { + /** The list of interfaces implemented by the instance */ + '$jsii.interfaces'?: string[]; +} +``` + +The value of the `'$jsii.byref'` field of the `ObjectReference` type is +formatted in the following way: + +``` +@aws-cdk/core.Stack@10003 +└────────┬────────┘ └─┬─┘ + │ └─ Opaque numeric identifier + └─ Object instance's base class' jsii fully qualified name +``` + +The first part of the reference identifier can have the special un-qualified +value `Object` to denote the absence of a *jsii*-known base class (for example +when the object *only* implements a *jsii* interface). + +#### Additional Interfaces +Sometimes, the *host* app will extend a *jsii* class and implement new *jsii* +interfaces that were not present on the original type. Such interfaces must be +declared by providing their *jsii* fully qualified name as an entry in the +`interfaces` list. + +Providing interfaces in this list that are implicitly present from another +delcaration (either because they are already implemented by the class denoted by +the `fqn` field, or because another entry in the `interfaces` list extends it) +is valid, but not necessary. The `@jsii/kernel` is responsible for correctly +handling redundant declarations. + +**:warning:** while declared `interfaces` may contain redundant declarations of +members already declared by other `interfaces` or by the type denoted by `fqn`, +undefined behavior results if any such declaration is not identical to the +others (e.g: property `foo` declared with type `boolean` on one of the +`interfaces`, and with type `string` on another). + +#### Overrides +For any method that is implemented or overridden from the *host* app, the +`create` call must specify an `override` entry. This will inform the Kernel that +calls to these methods must be relayed to the *host* app for execution, instead +of executing the original library's version. + +An optional `cookie` string can be provided. This string will be recorded on the +**Javascript** proxying implementation, and will be provided to the **host** app +with any *callback* request. This information can be used, for example, to +improve the performance of implementation lookups in the *host* app, where the +necessary reflection calls would otherwise be prohibitively expensive. + +Override declarations adhere to the following schema: + +```ts +interface MethodOverride { + /** The name of the overridden method */ + method: string; + /** An arbitrary override cookie string */ + cookie?: string; +} + +interface PropertyOverride { + /** The name of the overridden property */ + property: string; + /** An arbitrary override cookie string */ + cookie?: string; +} + +type Override = MethodOverride | PropertyOverride; +``` + +#### A note about callbacks +All `@jsii/runtime` calls that interact with object instances (that is, any call +except for `load`, `naming` and `stats`; as well as the `del` call since *jsii* +does not support customized destructors or finalizers) may result in the need to +execute code that is defined in the *host* app, when the code path traverses a +method or property that was implemented or overridden in the *host* app. + +Such cases will result in a callback request substituting itself to the response +of the original call being made; execution fo which will resume once the +callback response is provided. + +A callback request is sent from the `@jsii/kernel`'s `node` process to the +*host* app and has the following schema: + +```ts +interface CallbackRequest { + /** Callback requests are identified by the presence of the `callback` key */ + callback: Callback; +} + +interface CallbackBase { + /** A unique identifier for this callback request */ + cbid: string; + /** The object on which the callback must be executed */ + objref: ObjectReference; + /** The callback cookie, if one was specified */ + cookie?: string; +} + +interface InvokeCallback extends CallbackBase { + /** The name of the host method to be invoked */ + method: string; +} + +interface GetCallback extends CallbackBase { + /** The name of the property to be read */ + property: string; +} + +interface SetCallback extends CallbackBase { + /** The name of the property to be written to */ + property: string; + /** The value to be set */ + value: any; +} + +type Callback = InvokeCallback | GetCallback | SetCallback; +``` + +In order to fulfill the callback request, the *host* app may need to perform +futher API calls (loading new assemblies, creating new instances, invoking +methods - including delegating to the `super` implementation, ...). Such calls +will behave as they otherwise would (including the possible introduction of +further callback requests). + +Once the *host* happ has fulfilled the request, it must signal the result of +that execution back to the `@jsii/kernel` process by using the `complete` call: + +```ts +interface CompleteBase { + /** The callback ID from the corresponding request */ + cbid: string; + + // The discriminator + api: `complete`; +} + +interface CallbackSuccess extends CompleteBase { + /** The result of the execution (`undefined` if void) */ + result: any; +} + +interface CallbackFailure extends CompleteBase { + /** The error that was raised during fulfilling */ + err: string; +} + +type CompleteRequest = CallbackSuccess | CallbackFailure; +``` + +As discussed earlier, the response to the `complete` call is the result of +resuming execution of the code path that triggered the callback request. This +may be another callback request, or the final result of that call. + +The `callbacks` call may be used to determine the list of all outstanding +callback requests: + +```ts +interface CallbacksRequest { + // The discriminator + api: 'callbacks'; +} +``` + +This call results in a list of outstanding callbacks: + +```ts +interface CallbacksResponse { + /** The list of outstanding callback requests */ + callbacks: Callback[]; +} +``` + +### Destroying Objects +Once the *host* app no longer needs a particular object, it can be discarded. +This can happen for example when the *host* reference to an object is garbage +collected or freed. In order to allow the **JavaScript** process to also +recclaim the associated memory footprint, the `del` API must be used: + +```ts +interface DelRequest { + /** The object reference that can be released */ + objref: ObjectReference; + + // The discriminator + api: 'del'; +} +``` + +> **:warning:** Failure to use the `del` API will result in memory leakage as +> the **JavaScript** process accumulates garbage in it's Kernel instance. This +> can eventually result in a *Javascript heap out of memory* error, and the +> abnormal termination of the `node` process, and consequently of the *host* app. + +> :construction: The existing *host* runtime libraries do not implement this +> behavior! + +> :question: There is currently no provision for the `node` process to inform +> the *host* app about object references it dropped. This mechanism is necessary +> in order to support garbage collection of resources that involve +> *host*-implemented code (in such cases, the *host* app must hold on to any +> instance it passed to **JavaScript** until it is no longer reachable from +> there). + +Upon successfully deleting an object reference, the `@jsii/kernel` will return +an empty response object: + +```ts +export interface DelResponse {} +``` + +### Invoking methods (and static methods) +Invoking methods is done via the `invoke` call: + +```ts +interface InvokeRequest { + /** The object reference on which a method is invoked */ + objref: ObjectReference; + /** The name of the method being invoked */ + method: string; + /** Any arguments passed to the method invocation */ + args?: any[]; + + // The discriminator + api: 'invoke'; +} +``` + +Static method invocations do not have a receiving instance, and instead are +implemented by way of the `sinvoke` call: + +```ts +interface StaticInvokeRequest { + /** The jsii fully qualified name of the declaring type */ + fqn: string; + /** The name of the static method being invoked */ + method: string; + /** Any arguments passed to the method invocation */ + args?: any[]; + + // The discriminator + api: 'sinvoke'; +} +``` + +Note that, unlike in certain programming languages such as **Java**, it is +illegal to attempt invoking a static method on the static type of some instance +using the `invoke` call. All static invocations *must* be done using `sinvoke`. + +Both the `invoke` and `sinvoke` calls result in the same response: + +```ts +interface InvokeResponse { + /** The result of the method invokation. */ + result: any; +} +``` + +When the method's return type is `void`, the `result` value should typicaly be +`undefined`, however it may not be (**TypeScript** may in certain circumstances +allow returning a value from a `void` method): the *host* app should ignore such +values. + +#### Asynchronous method invocation +The `invoke` call can only be used to invoke *synchronous* methods. In order to +invoke *asynchronous* methods, the `begin` and `end` calls must be used instead. +Once the *host* app has entered an asynchronous workflow (after it made the +first `begin` call), and until it has completed all asynchronous operations +(after all `begin` calss were matched with an `end` call), no *synchronous* +operation (including synchronous callbacks) may be initiated. + +```ts +interface BeginRequest { + /** The object reference on which an asynchronous method is invoked */ + objref: ObjectReference; + /** The name of the method being invoked */ + method: string; + /** Any arguments passed to the method invocation */ + args?: any[]; + + // The discriminator + api: 'begin'; +} +``` + +> :construction: There is no static form of this call. Should there be one? + +The `begin` call results in a promise being made: + +```ts +interface BeginResponse { + /** + * An opaque string that uniquely idenfies the promised result of this + * invocation. + */ + promiseid: string; +} +``` + +Whenever the *host* app needs to obtain the promised value (possibly in a +blocking way), it makes the corresponding `end` call: + +```ts +interface EndRequest { + /** The promiseid that was returned from the corresponding `begin` call. */ + promiseid: string; + + // The discriminator + api: 'end'; +} +``` + +This will result in the promise being awaited and then resolved: + +```ts +interface EndResponse { + /** The resolved value of the promise */ + result: any; +} +``` + +> **:warning:** All `begin` calls must be matched with an `end` call. Failure to +> do so may result in unhandled promise rejections that might cause the +> application to terminate in certain environments. + +### Invoking getters (and static getters) +In order to obtain the value of properties, the `get` call is used: + +```ts +interface GetRequest { + /** The object reference on which a poperty is read */ + objref: ObjectReference; + /** The name of the property being read */ + property: string; + + // The discriminator + api: 'get'; +} +``` + +When operating on static properties, or in order to obtain the value of `enum` +constants, the `sget` API must be used instead: + +```ts +interface StaticGetRequest { + /** The jsii fully qualified name of the declaring type */ + fqn: ObjectReference; + /** The name of the property being read */ + property: string; + + // The discriminator + api: 'sget'; +} +``` + +Both the `get` and `sget` calls result in the same response: + +```ts +interface GetResponse { + /** The value of the property. */ + result: any; +} +``` + +### Invoking setters (and static setters) +In order to change the value of a property, the `set` call is used: + +```ts +interface SetRequest { + /** The object reference on which a poperty is written to */ + objref: ObjectReference; + /** The name of the property being written to */ + property: string; + /** The value that is written to the property */ + value: any; + + // The discriminator + api: 'set'; +} +``` + +When operating on static properties, the `sset` API must be used instead: + +```ts +interface StaticSetRequest { + /** The jsii fully qualified name of the declaring type */ + fqn: ObjectReference; + /** The name of the property being written to */ + property: string; + /** The value that is written to the property */ + value: any; + + // The discriminator + api: 'sset'; +} +``` + +Both the `set` and `sset` calls result in the same response, which is an empty +object: + +```ts +interface SetResponse {} +``` diff --git a/docs/specifications/4-standard-compliance-suite.md b/docs/specifications/4-standard-compliance-suite.md new file mode 100644 index 0000000000..1f0faab8a5 --- /dev/null +++ b/docs/specifications/4-standard-compliance-suite.md @@ -0,0 +1,500 @@ +# Standard Compliance Suite + +## Goal +The goal of the standard compliance suite is to be a normative description of +the behaviors that all language runtime implementations (*host runtime library* +in combination with *code generation*) must implement. This description takes +the form of a collection of test cases that must be re-implemented in each +*host* language, so that compliance can be asserted. + +Since the goal of *jsii* is to expose a single Object-Oriented API to multiple +programming languages, it is important to ensure the behavior is consistent +across all of them. This can be achieved by making sure that the interactions +between the *host* and *kernel* processes are the same for a given use-case. + +## Format +In order to assert whether a new runtime implementation is correct, a formal +compliance test suite is defined, that all language runtimes must fully +implement before they can be deemed eligible for General Availability. + +This document describes these tests, as well as a general approach for ensuring +conformance requirements are met in a systematic manner. + +### Categories +Test cases in the standard compliance suite are grouped by categories, which +help implementors direct their effort in the early stages of the implementation +of new language bindings. Each category is declared in an `H3` title (a line +that starts with `### `) within the [`## Test Suite`] title. A description of +the category immediately follows the opening title. The category ends with the +end of the document, or whenever another `H2` title is reached. + +[`## Test Suite`]: #test-suite + +### Test Case +Within a category title, test cases are delimited by `H4` (`#### `) titles, +which correspond to the test case name. The test case name should be kept +concise (dieally within 75 characters) and try to be as descriptive as possible. + +Immediately after the `H4` title is an english language description of the test +case that explains the property the test is designed to validate in as much +detail as possible. As much as possible, test case descriptions should be +self-sufficient. + +After the attributes table, a **TypeScript** block of code describes the +canonical form of the test. It includes any type declaration that is used by the +test (so the code example is self-contained). Assertions performed by the test +should be written in the form of [`jest`] expectations. + +> :question: The assertion code is intended as a formal representation of the +> tests' normative procedure. It is not currently executed against the *kernel*, +> but this could be achieved in the future. Additionally, we might be able to +> automatically transliterate the tests to other languages using +> [`jsii-rosetta`]. + +[`jest`]: https://jestjs.io/docs/en/getting-started +[`jsii-rosetta`]: ../../../packages/jsii-rosetta + +Finally, another code block details the sequence of messages that should be +exchanged between the *host* and `node` processes during the execution of the +test case, such that implementations can assert coherent behavior. + +Initial messages corresponding to the `hello` and `load` calls can be omitted at +the beginning of the kernel trace. Those messages are typically identicall +across tests and there is little value in asserting around those. Any `load` +call happening after the first call that is neither the `hello` message or +another `load` call **must** however be included. + +The dialogue is the sequence of JSON formatted messages, from the perspective of +the *host* app, using the following notation: + +* Messages sent by the *host* runtime to the `node` process: + ``` + > { "api": "foo" } + ``` +* Messages received by the *host* runtime from the `node` process: + ``` + < { "result": "bar" } + ``` +* Comments to improve readability of the trace: + ``` + # Comment continues until the end of the line + ``` +* Blank lines can be added to logically group trace elements + +> :question: is there a need to support some form of a capture mechanism to +> provision for non-deterministric results, or non-normative elements such as +> the exact Object IDs issued for created instances? + +
Show Template + +Below is the template markdown to copy-paste when introducing a new test case in +the compliance suite. New tests should always be added at the very end of the +category they belong to, right after the last test in said category. + +````md +### Test Category +#### Test Case Name + +A short english language description of what property this test verifies. The +description should include enough detail for a reader to be able to understand +the test without having to search for any additional information. Prefer a long, +unambiguous description to a terse one that could be subject to interpretation. + +
Show test + +##### Reference Implementation +```ts +// GIVEN +export class Foo { /* ... */ } + +// WHEN +const bar = new Foo().bar(); + +// THEN +expect(bar.baz).toBeUndefined(); +``` + +##### Reference Kernel Messaging +``` +## You can omit the initial hello/load messages +# < { "hello": "@jsii/runtime@1.2.3" } +# > { "load": { "name": "test-case-001", "version": "1.2.3", "tarball": "/tmp/jsii-kernel-test/lib.tgz" } } +# < { "assembly": "test-case-001", "types": 3 } +``` +
+```` +
+ +## Compliance +In order to be able to assert compliance of language binding libraries to the +standard test suite, implementations are responsible for providing a test +harness (typically as part of the runtime library) that can produce a +standardized test report in the form of a JSON document that follows the +following schema: + +```ts +interface TestReport { + /** The report is broken down by test category, using the name as-is */ + [category: string]: { + /** For each test in the category, using it's name as-is */ + [test: string]: { + /** Whether the test passed or failed */ + status: 'PASS' | 'FAIL'; + /** The kernel messages captured during the test */ + kernelTrace: Array; + }; + }; +} + +interface KernelMessage { + /** The direction the message was sent (Host -> Kernel / Kernel -> Host) */ + direction: 'FromKernel' | 'ToKernel'; + /** The message, as a JSON object */ + message: { [key: string]: unknown }; +} +``` + +The `@jsii/compliance` package provides the necessary tools to consume such a +test report, together with the Markdown document describing the compliance suite, +and procuces a report describing compliance test coverage as well as information +about any non-conformant test result. + +> :construction: The `@jsii/compliance` tool does not exist yet. + +> :question: Should a "somewhat standard" format such as XUnit test report be +> used instead of rolling our own JSON document? + +## Test Suite + +### Legacy +This section is due to contain all compliance tests that were implemented before +the *jsii specification* was initially written. They are going to be gradually +replaced by more focused tests with better descriptions. + +#### Type Unions are correctly disambiguated by the Kernel +In certain cases, two or more types in a *Type Union* can overlap in such a way +that they are all valid structural types for the value. Statically typed +languages however will not be satisfied with structural typing only, and require +the correct declared type to be preserved. + +
Show test + +##### Reference Implementation +```ts +// GIVEN +export interface BluePill { + readonly offeredTo: string; + readonly makesYouForgetTheMatrix?: boolean; +} +export interface RedPill { + readonly offeredTo: string; + readonly makesYouExitTheMatrix?: boolean; +} +export class Morpheus { + public static isBlue(pill: BluePill | RedPill): pill is BluePill { + const keys = new Set(Object.keys(pill)); + switch (keys.size) { + case 1: + return keys.has('offeredTo'); + case 2: + return keys.has('offeredTo') && keys.has('makesYouForgetTheMatrix'); + default: + return false; + } + } + public static isRed(pill: BluePill | RedPill): pill is RedPill { + const keys = new Set(Object.keys(pill)); + switch (keys.size) { + case 1: + return keys.has('offeredTo'); + case 2: + return keys.has('offeredTo') && keys.has('makesYouExitTheMatrix'); + default: + return false; + } + } + private constructor(){} +} +export class Neo { + public readonly tookBlue: boolean; + public readonly tookRed: boolean; + + public constructor(public readonly pill: BluePill | RedPill) { + this.tookBlue = pill.offeredTo == 'Neo' && Morpheus.isBlue(pill); + this.tookRed = pill.offeredTo == 'Neo' && Morpheus.isRed(pill); + } +} + +// WHEN +const bluePillA = new Neo({ offeredTo: 'not Neo' }); +const bluePillB = new Neo({ offeredTo: 'Neo', makesYouForgetTheMatrix: true }); +const redPillA = new Neo({ offeredTo: 'not Neo' }); +const redPillB = new Neo({ offeredTo: 'Neo', makesYouExitTheMatrix: true }); + +// THEN +expect(bluePillA.pill instanceof BluePill).toBeTruthy(); +expect(bluePillA.tookBlue).toBeFalsy(); +expect(bluePillA.tookRed).toBeFalsy(); + +expect(bluePillB.pill instanceof BluePill).toBeTruthy(); +expect(bluePillA.tookBlue).toBeTruthy(); +expect(bluePillA.tookRed).toBeFalsy(); + +expect(redPillA.pill instanceof RedPill).toBeTruthy(); +expect(bluePillA.tookBlue).toBeFalsy(); +expect(bluePillA.tookRed).toBeFalsy(); + +expect(redPillB.pill instanceof RedPill).toBeTruthy(); +expect(bluePillA.tookBlue).toBeFalsy(); +expect(bluePillA.tookRed).toBeTruthy(); +``` + +##### Kernel Trace +``` +``` +
+ +#### Partially initialized object consumption +When a constructor passes `this` out from **JavaScript** to the *host* app, the +reference must be correctly identified and passed across. + +> :construction: The .NET Runtime does not currently honor object identity, +> meaning that despite the same object reference is returned twice, two distinct +> proxies exist for it in the *host* .NET app. + +
Show test + +##### Reference Implementation +```ts +// GIVEN +export abstract class PartiallyInitializedThisConsumer { + public abstract consumePartiallyInitializedThis(obj: ConstructorPassesThisOut): void; +} +export class ConstructorPassesThisOut { + public constructor(consumer: PartiallyInitializedThisConsumer) { + consumer.consumePartiallyInitializedThis(this); + } +} + +// WHEN +class MyConsumer extends PartiallyInitializedThisConsumer { + public obj?: ConstructorPassesThisOut = null; + + public consumePartiallyInitializedThis(obj: ConstructorPassesThisOut) { + this.obj = obj; + } +} +const consumer = new MyConsumer(); +const object = new ConstructorPassesThisOut(consumer); + +// THEN +expect(consumer.obj).toBe(object); +``` + +##### Kernel Trace +``` +# < {"hello":"@jsii/runtime@..."} +# > {"api":"load","name":"...","version":"...","tarball":"..."} +# < {"ok":{"assembly":"...","types":2}} + +> {"api":"create","fqn":"test.PartiallyInitializedThisConsumer","args":[],"overrides":[{"method":"consumePartiallyInitializedThis"}],"interfaces":[]} +< {"ok":{"$jsii.byref":"test.PartiallyInitializedThisConsumer@10000"}} +> {"api":"create","fqn":"test.ConstructorPassesThisOut","args":[{"$jsii.byref":"test.PartiallyInitializedThisConsumer@10000","$jsii.interfaces":[]}],"overrides":[],"interfaces":[]} +< {"callback":{"cbid":"jsii::callback::20000","invoke":{"objref":{"$jsii.byref":"test.PartiallyInitializedThisConsumer@10000"},"method":"consumePartiallyInitializedThis","args":[{"$jsii.byref":"test.ConstructorPassesThisOut@10001"}]}}} +> {"complete":{"api":"complete","cbid":"jsii::callback::20000"}} +< {"ok":{"$jsii.byref":"test.ConstructorPassesThisOut@10001"}} +``` +
+ +### Interfaces +Tests in this section ensure correct behavior of *behavioral interfaces*. + +#### Host app can implement an interface "from scratch" +It is possible for a "pure" host interface implementation to be passed across +the language boundary, it's methods and properties can be used by **JavaScript** +code within the Kernel process. + +> :construction: The .NET Runtime currently requires that pure interfaces +> implementations extend from `Amazon.JSII.Rutime.Deputy.DepytyBase`. + +> :construction: The Python Runtime currently expects a somewhat un-pythonic way +> to implement interfaces, which requires decorating the implementing class with +> `@jsii.implements("implemented-type.JsiiInterfaceFQN")`. + +
Show test + +##### Reference Implementation +```ts +// GIVEN +export interface IBehavioralInterface { + methodCall(): string; + readonly property: number; +} +export class InterfaceConsumer { + constructor(private readonly iface: IBehavioralInterface) { } + + public composeResult() { + return `${this.iface.methodCall()} / ${this.iface.property}`; + } +} + +// WHEN +class Implementation implements IBehavioralInterface { + public readonly property = 1337; + public methodCall() { return "Hello!"; } +} +const impl = new Implementation(); +const consumer = new InterfaceConsumer(impl); + +// THEN +expect(consumer.composeResult()).toBe("Hello! / 1337") +``` + +##### Kernel Trace +``` +# < {"hello":"@jsii/runtime@..."} +# > {"api":"load","name":"...","version":"...","tarball":"..."} +# < {"ok":{"assembly":"...","types":2}} + +> {"api":"create","fqn":"Object","args":[],"overrides":[{"method":"methodCall"},{"property":"property"}],"interfaces":["test.IBehavioralInterface"]} +< {"ok":{"$jsii.byref":"Object@10000","$jsii.interfaces":["test.IBehavioralInterface"]}} +> {"api":"create","fqn":"test.InterfaceConsumer","args":[{"$jsii.byref":"Object@10000","$jsii.interfaces":[]}],"overrides":[],"interfaces":[]} +< {"ok":{"$jsii.byref":"test.InterfaceConsumer@10001"}} +> {"api":"invoke","objref":{"$jsii.byref":"test.InterfaceConsumer@10001"},"method":"composeResult","args":[]} +< {"callback":{"cbid":"jsii::callback::20000","invoke":{"objref":{"$jsii.byref":"Object@10000","$jsii.interfaces":["test.IBehavioralInterface"]},"method":"methodCall","args":[]}}} +> {"complete":{"api":"complete","cbid":"jsii::callback::20000","result":"Hello!"}} +< {"callback":{"cbid":"jsii::callback::20001","get":{"objref":{"$jsii.byref":"Object@10000","$jsii.interfaces":["test.IBehavioralInterface"]},"property":"property"}}} +> {"complete":{"api":"complete","cbid":"jsii::callback::20001","result":1337.0}} +< {"ok":{"result":"Hello! / 1337"}} +``` +
+ +### Structs & Keyword Arguments + +#### Ambiguous arguments are handled correctly +When a method accepts both a positional parameter named `foo` and a struct +parameter with a property named `foo`, the respective values are passed in the +correct parameter location when calling into the **JavaScript** code. + +
Show test + +##### Reference Implementation +```ts +// GIVEN +export interface StructType { + readonly foo: string; +} +export class ClassType { + public constructor( + public readonly foo: number, + public readonly opts: StructType, + ) {} +} + +// WHEN +var result = new ClassType('Bazinga!', { foo: 1337 }); + +// THEN +expect(typeof result.foo).toBe(1337); +expect(typeof result.opts.foo).toBe('Bazinga!'); +``` + +##### Kernel Trace +``` +# < {"hello":"@jsii/runtime@..."} +# > {"api":"load","name":"...","version":"...","tarball":"..."} +# < {"ok":{"assembly":"...","types":2}} + +> {"api":"create","fqn":"test.ClassType","args":[1337.0,{"$jsii.struct":{"fqn":"test.StructType","data":{"foo":"Bazinga!"}}}],"overrides":[],"interfaces":[]} +< {"ok":{"$jsii.byref":"test.ClassType@10000"}} +> {"api":"get","objref":{"$jsii.byref":"test.ClassType@10000"},"property":"foo"} +< {"ok":{"value":1337}} +> {"api":"get","objref":{"$jsii.byref":"test.ClassType@10000"},"property":"opts"} +< {"ok":{"value":{"$jsii.byref":"Object@10001","$jsii.interfaces":["test.StructType"]}}} +> {"api":"get","objref":{"$jsii.byref":"Object@10001"},"property":"foo"} +< {"ok":{"value":"Bazinga!"}} +``` +
+ +### Collections +Tests in this section ensure correct behavior of collections (`List` and `Map`). + +#### Struct elements of `List` are deserialized to the correct apparent type +When the declared element type of a `List` is a *struct*, the resulting list +must contain elements of the correct static type. This is a requirement for +statically typed languages such as Java where type parameters are reified. + +
Show test + +##### Reference Implementation +```ts +// GIVEN +export interface StructType { + readonly property: string; +} +export class StructProvider { + public static provide(): StructType[] { + return [{ property: 'value' }]; + } +} + +// WHEN +const items = StructProvider.provide(); + +// THEN +expect(items.length).toBeGreaterThan(0); +for (const item of items) { + expect(item instanceof StructType).toBeTruthy(); +} +``` + +##### Kernel Trace +``` +# < {"hello":"@jsii/runtime@..."} +# > {"api":"load","name":"...","version":"...","tarball":"..."} +# < {"ok":{"assembly":"...","types":2}} + +> {"api":"sinvoke","fqn":"test.StructProvider","method":"provide","args":[]} +< {"ok":{"result":[{"$jsii.byref":"Object@10000","$jsii.interfaces":["test.StructType"]}]}} +``` +
+ +#### Struct elements of `Map` are deserialized to the correct apparent type +When the declared element type of a `Map` is a *struct*, the resulting list +must contain elements of the correct static type. This is a requirement for +statically typed languages such as Java where type parameters are reified. + +
Show test + +##### Reference Implementation +```ts +// GIVEN +export interface StructType { + readonly property: string; +} +export class StructProvider { + public static provide(): { [key: string]: StructType } { + return { foo: { property: 'value' } }; + } +} + +// WHEN +const items = StructProvider.provide(); + +// THEN +expect(items.length).toBeGreaterThan(0); +for (const item of Object.values(items)) { + expect(item instanceof StructType).toBeTruthy(); +} +``` + +##### Kernel Trace +``` +# < {"hello":"@jsii/runtime@..."} +# > {"api":"load","name":"...","version":"...","tarball":"..."} +# < {"ok":{"assembly":"...","types":2}} + +> {"api":"sinvoke","fqn":"test.StructProvider","method":"provide","args":[]} +< {"ok":{"result":{"$jsii.map":{"foo":{"$jsii.byref":"Object@10000","$jsii.interfaces":["test.StructType"]}}}}} +``` +
diff --git a/docs/specifications/5-new-language-intake.md b/docs/specifications/5-new-language-intake.md new file mode 100644 index 0000000000..1b89f2fd53 --- /dev/null +++ b/docs/specifications/5-new-language-intake.md @@ -0,0 +1,138 @@ +# New Language Intake +This document outlines the process to be followed when introducing a new *jsii* +target language, including an estimated timeline (the exact timeline may vary +significantly depending on the specifics of the language being added). + +The estimated total duration for the process is 4 to 6 months. + +## Planning + +**:alarm_clock: Estimated Duration:** 2 weeks + +The first step is to study the *jsii* specification, as well as existing +language implementations, in order to have the knowledge necessary to write a +new language support proposal [RFC]. The [RFC] document produced will evolve and +be polished as development of the new language support progresses, but the +following elements must be present before any implementation begins: + +* Identification of the language's standard package repository +* Proposal for the binding's configuration block +* Sample API representations in the proposed language + + In particular, any element from the *jsii* type model that does not + naturally map into the proposed new language needs to be represented + + Where several options exist, links to prior art are instrumental to validate + the direction chosen +* Toolchain and platform requirements + +[RFC]: https://github.com/awslabs/aws-cdk-rfcs#readme + +## Code Generation (`jsii-pacmak`) + +**:alarm_clock: Estimated Duration:** 4 to 6 weeks + +The necessary code must be added to [`jsii-pacmak`] in order to map the *jsii* +assembly's declared types into the proposed language. While this code ought to +leverage the new language's *host* runtime library, we begin with writing the +code generator in order to ensure the appropriate developer experience is +achieved in the new language before writing the back-end components. + +Code generators are authored in **TypeScript**. + +The necessary reserved words need to be registered in the `jsii` compiler, so +that warnings are produced when identifiers are used in **TypeScript** code that +require slugification or escaping in the target language (and will hence cause a +degraded developer experience). + +[`jsii-pacmak`]: ../../packages/jsii-pacmak + +## Runtime Library + +**:alarm_clock: Estimated Duration:** 4 to 6 weeks + +Now that the appropriate developer experience has been identified, the *host* +runtime library supporting the generated code can be written. This component +must be written in the new language. + +> :construction: A reference architecture for *host* runtime libraries is to be +> developed, in order to ensure consistent naming and behavior across all the +> runtimes, reducing the cost of maintaining many of those. + +## Building & Packaging + +**:alarm_clock: Estimated Duration:** 2 weeks + +Once code is generated and it has a *host* runtime library to rely on, +[`jsii-pacmak`] needs to receive the additional logic required to compile and +package the generated libraries as required, producing ready-to-publish +artifacts. + +The necessary toolchain needs to be added to the [`jsii/superchain`] *Docker* +image, so that `jsii` customers can rely on this to build artifacts for any of +the supported languages. + +In addition to this, standardized *Amazon CodePipeline* actions need to be +developed in order to support publishing to the relevant idiomatic package +managers. + +[`jsii/superchain`]: ../../superchain + +## Compliance Tests + +**:alarm_clock: Estimated Duration:** 6 weeks + +The full standard compliance suite must be implemented for the new language. +Leveraging the new code generator, *host* runtime library and compilation logic, +the tests demonstrate that the new library behaves consistently with all other +language bindings. + +While it is possible to declare *developer preview* on a new language before all +the tests pass, full compliance is a pre-requisite to declaring *general +availability* of the new language. + +## Documentation + +**:alarm_clock: Estimated Duration:** 1 week + +The necessary documentation needs to be provided to support customers who want +to onboard the new language. This also includes updating [`jsii-config`] with +support for the new languages' configuration block. + +[`jsii-config`]: ../../packages/jsii-config + +## Developer Preview + +**:alarm_clock: Recommended Duration:** 4 to 8 weeks + +It is possible to declare *Developer Preview* for a new language support as soon +as the code generation and *host* runtime library are mature enough to be useful, +and cover the majority of use-cases. While certain edge-cases may still be +un-covered at the beginning of *Developer Preview*, a clear plan should exist +that ensures a path exists to address any known gaps. It is required to have +implemented most of the standard compliance suite prior to declaring *Developer +Preview*. + +During the *Developer Preview* phase, user experience studies should be +conducted to validate assumptions made during the code generator's design. If +any significant change is dictated by the results of the user experience studies, +fluback studies should be performed in order to confirm that the desired impact +has been achieved. + +> :construction: A standard set of user experience sutdy tasks is going to be +> developed, ensuring the learnings from previous experiences is factored into +> subsequent studies conducted. + +Finally, it is essential to give time to the community to use & vet the new +language support prior to considering *General Availability*. A minimum of a +full month without a major bug reported is advised. During this period, +intentional hands-on usage of the product msut be performed by engineers +familiar with the new language as well as engineers unfamilar with it. This +ensures the new experience is considered holistically, in a manner un-biased by +knowledge of the implementation. + +## General Availability + +Once the new language support has been *Developer Preview* for long enough and +the engineers involved have gained confidence that the API is stable, covers all +known use-cases reliably, and behaves consistently with other *Generally +Available* languages, the new support can be considered for *General +Availability*. From aa28ef6214ab364c102fb9eac1ff106f4aaded42 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Fri, 14 Feb 2020 17:56:37 +0000 Subject: [PATCH 13/18] chore(deps): bump xmlbuilder from 13.0.2 to 14.0.0 (#1258) --- packages/jsii-pacmak/package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 35b5b736fe..018fc401a8 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -45,7 +45,7 @@ "jsii-rosetta": "^0.22.0", "semver": "^7.1.3", "spdx-license-list": "^6.1.0", - "xmlbuilder": "^13.0.2", + "xmlbuilder": "^14.0.0", "yargs": "^15.1.0" }, "devDependencies": { diff --git a/yarn.lock b/yarn.lock index cfa19b99f9..e5176e8344 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8959,10 +8959,10 @@ xml-name-validator@^3.0.0: resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a" integrity sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw== -xmlbuilder@^13.0.2: - version "13.0.2" - resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz#02ae33614b6a047d1c32b5389c1fdacb2bce47a7" - integrity sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ== +xmlbuilder@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-14.0.0.tgz#876b5aec4f05ffd5feb97b0a871c855d16fbeb8c" + integrity sha512-ts+B2rSe4fIckR6iquDjsKbQFK2NlUk6iG5nf14mDEyldgoc2nEKZ3jZWMPTxGQwVgToSjt6VGIho1H8/fNFTg== xmlchars@^2.1.1: version "2.2.0" From e99d722fb7b12d6a87b423980aca70077c0ad1cb Mon Sep 17 00:00:00 2001 From: Mitchell Valine Date: Fri, 14 Feb 2020 12:00:02 -0800 Subject: [PATCH 14/18] feat: CDK Build Integration Test (#1219) * feat: CDK Build Integration Test Adds @jsii/integ-test private module for defining new integration tests. Adds a new integration test that downloads the latest CDK release source code and builds it with the local version of jsii and jsii-pacmak. This unit test requires a github access token defined in the environment to get the latest release version and download the asset. Fixes: #1209 --- package.json | 1 + packages/@jsii/integ-test/.env.example | 1 + packages/@jsii/integ-test/.eslintrc.yaml | 2 + packages/@jsii/integ-test/.gitignore | 2 + packages/@jsii/integ-test/README.md | 10 ++ packages/@jsii/integ-test/package.json | 41 ++++++ .../@jsii/integ-test/test/build-cdk.test.ts | 88 ++++++++++++ packages/@jsii/integ-test/tsconfig.json | 8 ++ packages/@jsii/integ-test/utils/index.ts | 134 ++++++++++++++++++ yarn.lock | 38 +++++ 10 files changed, 325 insertions(+) create mode 100644 packages/@jsii/integ-test/.env.example create mode 100644 packages/@jsii/integ-test/.eslintrc.yaml create mode 100644 packages/@jsii/integ-test/.gitignore create mode 100644 packages/@jsii/integ-test/README.md create mode 100644 packages/@jsii/integ-test/package.json create mode 100644 packages/@jsii/integ-test/test/build-cdk.test.ts create mode 100644 packages/@jsii/integ-test/tsconfig.json create mode 100644 packages/@jsii/integ-test/utils/index.ts diff --git a/package.json b/package.json index 404bb6c524..f0da92f355 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "fetch-dotnet-snk": "bash scripts/fetch-dotnet-snk.sh", "package": "bash scripts/package.sh", "test": "lerna run test --stream", + "test:integ": "lerna run test:integ --stream", "test:update": "lerna run test:update --stream" }, "devDependencies": { diff --git a/packages/@jsii/integ-test/.env.example b/packages/@jsii/integ-test/.env.example new file mode 100644 index 0000000000..46f8a2c396 --- /dev/null +++ b/packages/@jsii/integ-test/.env.example @@ -0,0 +1 @@ +GITHUB_TOKEN=personal_access_token diff --git a/packages/@jsii/integ-test/.eslintrc.yaml b/packages/@jsii/integ-test/.eslintrc.yaml new file mode 100644 index 0000000000..e04f6e39ef --- /dev/null +++ b/packages/@jsii/integ-test/.eslintrc.yaml @@ -0,0 +1,2 @@ +--- +extends: ../../../eslint-config.yaml diff --git a/packages/@jsii/integ-test/.gitignore b/packages/@jsii/integ-test/.gitignore new file mode 100644 index 0000000000..4ec96f4e9d --- /dev/null +++ b/packages/@jsii/integ-test/.gitignore @@ -0,0 +1,2 @@ +.env +*.js diff --git a/packages/@jsii/integ-test/README.md b/packages/@jsii/integ-test/README.md new file mode 100644 index 0000000000..1de37b7d6b --- /dev/null +++ b/packages/@jsii/integ-test/README.md @@ -0,0 +1,10 @@ +# JSII Integration Tests + +A suite of integration tests for JSII and related modules. + +## Running + +Running the integration tests locally requires a github access token. Copy the +`.env.example` file and replace the dummy value with a personal access token. + +then run `yarn run test:integ` diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json new file mode 100644 index 0000000000..513efb9135 --- /dev/null +++ b/packages/@jsii/integ-test/package.json @@ -0,0 +1,41 @@ +{ + "name": "@jsii/integ-test", + "version": "0.22.0", + "description": "A suite of integration tests for JSII and related modules.", + "private": true, + "scripts": { + "build": "tsc --build && npm run lint", + "lint": "eslint . --ext .ts --ignore-path=.gitignore", + "test:integ": "jest" + }, + "keywords": [], + "author": { + "name": "Amazon Web Services", + "url": "https://aws.amazon.com" + }, + "license": "Apache-2.0", + "dependencies": { + "tar": "^6.0.1" + }, + "devDependencies": { + "@octokit/rest": "^16.36.0", + "@types/dotenv": "^8.2.0", + "@types/fs-extra": "^8.0.1", + "@types/tar": "^4.0.3", + "dotenv": "^8.2.0", + "eslint": "^6.8.0", + "fs-extra": "^8.1.0", + "jest": "^25.1.0", + "jsii": "^0.22.0", + "jsii-pacmak": "^0.22.0", + "jsii-rosetta": "^0.22.0", + "typescript": "~3.7.5" + }, + "jest": { + "errorOnDeprecated": true, + "testEnvironment": "node", + "testMatch": [ + "**/?(*.)+(spec|test).js" + ] + } +} diff --git a/packages/@jsii/integ-test/test/build-cdk.test.ts b/packages/@jsii/integ-test/test/build-cdk.test.ts new file mode 100644 index 0000000000..ec525b6417 --- /dev/null +++ b/packages/@jsii/integ-test/test/build-cdk.test.ts @@ -0,0 +1,88 @@ +import * as Octokit from '@octokit/rest'; +import * as dotenv from 'dotenv'; +import { mkdtemp, remove } from 'fs-extra'; +import * as path from 'path'; +import { downloadReleaseAsset, minutes, ProcessManager, extractFileStream } from '../utils'; + +dotenv.config(); +const JSII_DIR = path.dirname(require.resolve('jsii/package.json')); +const JSII_PACMAK_DIR = path.dirname(require.resolve('jsii-pacmak/package.json')); +const JSII_ROSETTA_DIR = path.dirname(require.resolve('jsii-rosetta/package.json')); + +const octokit = new Octokit({ + auth: process.env.GITHUB_TOKEN +}); + +describe('Build CDK', () => { + let buildDir: string; + let processes: ProcessManager; + + beforeAll(async () => { + processes = new ProcessManager(); + buildDir = await mkdtemp(path.join(__dirname, 'build')); + }); + + afterAll(async () => { + await processes.killAll(); + await remove(buildDir); + }); + + test('can build latest cdk release', async () => { + // download latest release info + const release = await octokit.repos.getLatestRelease({ + owner: 'aws', + repo: 'aws-cdk' + }); + + // download and extract code + const code = await downloadReleaseAsset(`https://api.github.com/repos/aws/aws-cdk/tarball/${release.data.tag_name}`); + const srcDir = path.join(buildDir, `aws-aws-cdk-${release.data.target_commitish.substring(0, 7)}`); + await extractFileStream(code, buildDir); + + // install cdk dependencies + await processes.spawn('yarn', ['install', '--frozen-lockfile'], { + cwd: srcDir + }); + + // build cdk build tools + await processes.spawn('npx', [ + 'lerna', + '--stream', + '--scope', 'cdk-build-tools', + '--scope', 'pkglint', + '--scope', 'awslint', + 'run', 'build', + ], { cwd: srcDir }); + + // build jsii modules + await processes.spawn('npx', [ + 'lerna', + '--stream', + '--scope', '@aws-cdk/*', + '--scope', 'aws-cdk', + 'run', 'build', + '--', '--jsii', path.join(JSII_DIR, 'bin', 'jsii'), + ], { cwd: srcDir }); + + // build the rest + await processes.spawn('npx', [ + 'lerna', + '--stream', + '--ignore', '@aws-cdk/*', + '--ignore', 'aws-cdk', + '--ignore', 'cdk-build-tools', + '--ignore', 'pkglint', + '--ignore', 'awslint', + 'run', 'build', + ], { cwd: srcDir }); + + // package modules + await processes.spawn('./pack.sh', [], { + cwd: srcDir, + env: { + PACMAK: path.join(JSII_PACMAK_DIR, 'bin', 'jsii-pacmak'), + ROSETTA: path.join(JSII_ROSETTA_DIR, 'bin', 'jsii-rosetta') + } + }); + }, minutes(60)); +}); diff --git a/packages/@jsii/integ-test/tsconfig.json b/packages/@jsii/integ-test/tsconfig.json new file mode 100644 index 0000000000..75177cc9b5 --- /dev/null +++ b/packages/@jsii/integ-test/tsconfig.json @@ -0,0 +1,8 @@ +{ + "compilerOptions": { + "composite": false, + "declaration": false + }, + "extends": "../../../tsconfig-base", + "include": ["**/*.ts"] +} diff --git a/packages/@jsii/integ-test/utils/index.ts b/packages/@jsii/integ-test/utils/index.ts new file mode 100644 index 0000000000..c8b1525ed2 --- /dev/null +++ b/packages/@jsii/integ-test/utils/index.ts @@ -0,0 +1,134 @@ +import * as cp from 'child_process'; +import { IncomingMessage } from 'http'; +import * as https from 'https'; +import { Readable } from 'stream'; +import { extract } from 'tar'; + +/** + * @param num a quantity of minutes (could be fractional) + * + * @return equivalent number of milliseconds + */ +export function minutes(num: number): number { + return num * 1000 * 60; +} + +/** + * Used to track and clean up processes if tests fail or timeout + */ +export class ProcessManager { + private readonly processes: { + [pid: string]: { + proc: cp.ChildProcess; + promise: Promise; + }; + } = {}; + + /** + * kill all still running processes + * + * @param signal sent to terminate process + */ + public async killAll(signal?: string) { + const values = Object.values(this.processes); + await Promise.all(values.map(({ proc, promise }) => async() => { + proc.kill(signal); + await promise; + this.remove(proc); + })); + } + + private add(proc: cp.ChildProcess, promise: Promise) { + this.processes[proc.pid] = { proc, promise }; + } + + private remove(proc: cp.ChildProcess) { + delete this.processes[proc.pid]; + } + + /** + * spawn new child process + * + * @param shell command being called + * @param arguments passed to command + * @param options passed to child process spawn + */ + public async spawn(cmd: string, args: string[], opts: any = {}): Promise { + const proc = cp.spawn(cmd, args, { stdio: 'inherit', ...opts }); + + const promise = new Promise((ok, ko) => { + proc.once('exit', code => { + const message = `child process exited with code: ${code}`; + if (code === 0) { + process.stdout.write(message); + ok(); + } else { + process.stderr.write(message); + ko(new Error(message)); + } + + this.remove(proc); + }); + + proc.once('error', error => { + process.stderr.write(`Process ${proc.pid} error: ${error}`); + ko(); + }); + }); + + this.add(proc, promise); + return promise; + } +} + +/** + * write downloaded asset to file + * + * @param source stream + * @param destination directory for extracted files + */ +export async function extractFileStream(source: Readable, destination: string) { + return new Promise((ok, ko) => { + const destStream = extract({ cwd: destination }); + destStream.once('close', ok); + destStream.once('error', ko); + source.once('error', ko); + + source.pipe(destStream); + }); +} + +/** + * Wrap http calls to download release asset in a promise. Github responds with + * a 302 sometimes which is required to be handled. Returns the buffer to be + * streamed to destination fs stream. + * + * @param url of downloadable asset + * + * @returns readable stream of asset data + */ +export async function downloadReleaseAsset(url: string): Promise { + return new Promise((ok, ko) => { + const config = { + headers: { + 'User-Agent': '@jsii/integ-test', + Authorization: `token ${process.env.GITHUB_TOKEN}` + } + }; + + https.get(url, config, (response: IncomingMessage) => { + if (response.statusCode === 302) { + + if (!response.headers.location) { + throw new Error('Bad redirect, no location header found'); + } + + return https.get(response.headers.location, config, ok); + } else if (response.statusCode && (response.statusCode < 200 || response.statusCode > 300)) { + return ko(new Error(`Status Code: ${response.statusCode}`)); + } + + return ok(response); + }); + }); +} diff --git a/yarn.lock b/yarn.lock index e5176e8344..9ba85c32bf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1221,6 +1221,13 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== +"@octokit/auth-token@^2.4.0": + version "2.4.0" + resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.0.tgz#b64178975218b99e4dfe948253f0673cbbb59d9f" + integrity sha512-eoOVMjILna7FVQf96iWc3+ZtE/ZT6y8ob8ZzcqKY1ibSQCnu4O/B7pJvzMx5cyZ/RjAff6DAdEb0O0Cjcxidkg== + dependencies: + "@octokit/types" "^2.0.0" + "@octokit/endpoint@^5.5.0": version "5.5.1" resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-5.5.1.tgz#2eea81e110ca754ff2de11c79154ccab4ae16b3f" @@ -1276,6 +1283,25 @@ once "^1.4.0" universal-user-agent "^4.0.0" +"@octokit/rest@^16.36.0": + version "16.38.1" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.38.1.tgz#be24e0faa7d0bdb9459fbc089ec866ed11774b72" + integrity sha512-zyNFx+/Bd1EXt7LQjfrc6H4wryBQ/oDuZeZhGMBSFr1eMPFDmpEweFQR3R25zjKwBQpDY7L5GQO6A3XSaOfV1w== + dependencies: + "@octokit/auth-token" "^2.4.0" + "@octokit/request" "^5.2.0" + "@octokit/request-error" "^1.0.2" + atob-lite "^2.0.0" + before-after-hook "^2.0.0" + btoa-lite "^1.0.0" + deprecation "^2.0.0" + lodash.get "^4.4.2" + lodash.set "^4.3.2" + lodash.uniq "^4.5.0" + octokit-pagination-methods "^1.1.0" + once "^1.4.0" + universal-user-agent "^4.0.0" + "@octokit/types@^2.0.0": version "2.0.2" resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.0.2.tgz#0888497f5a664e28b0449731d5e88e19b2a74f90" @@ -1348,6 +1374,13 @@ resolved "https://registry.yarnpkg.com/@types/deep-equal/-/deep-equal-1.0.1.tgz#71cfabb247c22bcc16d536111f50c0ed12476b03" integrity sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg== +"@types/dotenv@^8.2.0": + version "8.2.0" + resolved "https://registry.yarnpkg.com/@types/dotenv/-/dotenv-8.2.0.tgz#5cd64710c3c98e82d9d15844375a33bf1b45d053" + integrity sha512-ylSC9GhfRH7m1EUXBXofhgx4lUWmFeQDINW5oLuS+gxWdfUeW4zJdeVTYVkexEW+e2VUvlZR2kGnGGipAWR7kw== + dependencies: + dotenv "*" + "@types/eslint-visitor-keys@^1.0.0": version "1.0.0" resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d" @@ -3213,6 +3246,11 @@ dot-prop@^4.2.0: dependencies: is-obj "^1.0.0" +dotenv@*, dotenv@^8.2.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/dotenv/-/dotenv-8.2.0.tgz#97e619259ada750eea3e4ea3e26bceea5424b16a" + integrity sha512-8sJ78ElpbDJBHNeBzUbUVLsqKdccaa/BXF1uPTw3GrvQTBgrQrtObr2mUrE38vzYd8cEv+m/JBfDLioYcfXoaw== + duplexer@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" From abbf07f065d88a5efcf957e50890fc01ddc7a04c Mon Sep 17 00:00:00 2001 From: Elad Ben-Israel Date: Mon, 17 Feb 2020 17:15:57 +0200 Subject: [PATCH 15/18] release: v1.0.0 See CHANGELOG --- CHANGELOG.md | 13 +++++++++++ lerna.json | 2 +- packages/@jsii/dotnet-analyzers/CHANGELOG.md | 12 ++++++++++ packages/@jsii/dotnet-analyzers/package.json | 4 ++-- packages/@jsii/dotnet-jsonmodel/CHANGELOG.md | 12 ++++++++++ packages/@jsii/dotnet-jsonmodel/package.json | 4 ++-- .../@jsii/dotnet-runtime-test/CHANGELOG.md | 12 ++++++++++ .../@jsii/dotnet-runtime-test/package.json | 8 +++---- packages/@jsii/dotnet-runtime/CHANGELOG.md | 12 ++++++++++ packages/@jsii/dotnet-runtime/package.json | 8 +++---- packages/@jsii/integ-test/CHANGELOG.md | 11 ++++++++++ packages/@jsii/integ-test/package.json | 8 +++---- packages/@jsii/java-runtime-test/CHANGELOG.md | 8 +++++++ packages/@jsii/java-runtime-test/package.json | 8 +++---- packages/@jsii/java-runtime/CHANGELOG.md | 8 +++++++ packages/@jsii/java-runtime/package.json | 6 ++--- packages/@jsii/kernel/CHANGELOG.md | 8 +++++++ packages/@jsii/kernel/package.json | 12 +++++----- packages/@jsii/python-runtime/CHANGELOG.md | 8 +++++++ packages/@jsii/python-runtime/package.json | 10 ++++----- packages/@jsii/ruby-runtime/CHANGELOG.md | 8 +++++++ packages/@jsii/ruby-runtime/package.json | 10 ++++----- .../@jsii/ruby-runtime/project/Gemfile.lock | 4 ++-- packages/@jsii/runtime/CHANGELOG.md | 8 +++++++ packages/@jsii/runtime/package.json | 14 ++++++------ packages/@jsii/spec/CHANGELOG.md | 8 +++++++ packages/@jsii/spec/package.json | 4 ++-- .../jsii-calc-base-of-base/CHANGELOG.md | 8 +++++++ .../jsii-calc-base-of-base/package.json | 8 +++---- packages/@scope/jsii-calc-base/CHANGELOG.md | 8 +++++++ packages/@scope/jsii-calc-base/package.json | 12 +++++----- packages/@scope/jsii-calc-lib/CHANGELOG.md | 8 +++++++ packages/@scope/jsii-calc-lib/package.json | 12 +++++----- packages/codemaker/CHANGELOG.md | 8 +++++++ packages/codemaker/package.json | 2 +- packages/jsii-calc/CHANGELOG.md | 8 +++++++ packages/jsii-calc/package.json | 20 ++++++++--------- packages/jsii-config/CHANGELOG.md | 8 +++++++ packages/jsii-config/package.json | 4 ++-- packages/jsii-diff/CHANGELOG.md | 8 +++++++ packages/jsii-diff/package.json | 10 ++++----- packages/jsii-pacmak/CHANGELOG.md | 12 ++++++++++ packages/jsii-pacmak/package.json | 22 +++++++++---------- packages/jsii-reflect/CHANGELOG.md | 8 +++++++ packages/jsii-reflect/package.json | 14 ++++++------ packages/jsii-rosetta/CHANGELOG.md | 8 +++++++ packages/jsii-rosetta/package.json | 8 +++---- packages/jsii/CHANGELOG.md | 8 +++++++ packages/jsii/package.json | 6 ++--- packages/oo-ascii-tree/CHANGELOG.md | 8 +++++++ packages/oo-ascii-tree/package.json | 4 ++-- tools/jsii-build-tools/CHANGELOG.md | 8 +++++++ tools/jsii-build-tools/package.json | 2 +- 53 files changed, 349 insertions(+), 113 deletions(-) create mode 100644 packages/@jsii/integ-test/CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md index 6031ff3426..f3556fe888 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,19 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + + +### Features + +* CDK Build Integration Test ([#1219](https://github.com/aws/jsii/issues/1219)) ([e99d722](https://github.com/aws/jsii/commit/e99d722fb7b12d6a87b423980aca70077c0ad1cb)), closes [#1209](https://github.com/aws/jsii/issues/1209) +* **csharp:** enable nullable reference types ([#1246](https://github.com/aws/jsii/issues/1246)) ([cbc7258](https://github.com/aws/jsii/commit/cbc72588b7a70fb2cb1d6d3012bec53d27263001)) +* **dotnet:** upgrade target framework to netcoreapp3.1 ([#1241](https://github.com/aws/jsii/issues/1241)) ([c324439](https://github.com/aws/jsii/commit/c32443979548faa283894d5aaf4f4baf31350063)) + + + + + ## [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) diff --git a/lerna.json b/lerna.json index 3e05ffba8f..9fa36764b2 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "rejectCycles": true } }, - "version": "0.22.0" + "version": "1.0.0" } diff --git a/packages/@jsii/dotnet-analyzers/CHANGELOG.md b/packages/@jsii/dotnet-analyzers/CHANGELOG.md index e721f95700..882ff95660 100644 --- a/packages/@jsii/dotnet-analyzers/CHANGELOG.md +++ b/packages/@jsii/dotnet-analyzers/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + + +### Features + +* **csharp:** enable nullable reference types ([#1246](https://github.com/aws/jsii/issues/1246)) ([cbc7258](https://github.com/aws/jsii/commit/cbc72588b7a70fb2cb1d6d3012bec53d27263001)) +* **dotnet:** upgrade target framework to netcoreapp3.1 ([#1241](https://github.com/aws/jsii/issues/1241)) ([c324439](https://github.com/aws/jsii/commit/c32443979548faa283894d5aaf4f4baf31350063)) + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @jsii/dotnet-analyzers diff --git a/packages/@jsii/dotnet-analyzers/package.json b/packages/@jsii/dotnet-analyzers/package.json index fae03b6007..03b6066055 100644 --- a/packages/@jsii/dotnet-analyzers/package.json +++ b/packages/@jsii/dotnet-analyzers/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-analyzers", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": ".NET Roslyn Analyzers for Jsii", "license": "Apache-2.0", @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/node": "^10.17.15", - "jsii-build-tools": "^0.22.0", + "jsii-build-tools": "^1.0.0", "typescript": "~3.7.5" } } diff --git a/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md b/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md index 477a61f5ea..807682a18a 100644 --- a/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md +++ b/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + + +### Features + +* **csharp:** enable nullable reference types ([#1246](https://github.com/aws/jsii/issues/1246)) ([cbc7258](https://github.com/aws/jsii/commit/cbc72588b7a70fb2cb1d6d3012bec53d27263001)) +* **dotnet:** upgrade target framework to netcoreapp3.1 ([#1241](https://github.com/aws/jsii/issues/1241)) ([c324439](https://github.com/aws/jsii/commit/c32443979548faa283894d5aaf4f4baf31350063)) + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @jsii/dotnet-jsonmodel diff --git a/packages/@jsii/dotnet-jsonmodel/package.json b/packages/@jsii/dotnet-jsonmodel/package.json index ae36dd3407..c0f3f88af6 100644 --- a/packages/@jsii/dotnet-jsonmodel/package.json +++ b/packages/@jsii/dotnet-jsonmodel/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-jsonmodel", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": ".NET json model for jsii spec and api.", "license": "Apache-2.0", @@ -36,7 +36,7 @@ }, "devDependencies": { "@types/node": "^10.17.15", - "jsii-build-tools": "^0.22.0", + "jsii-build-tools": "^1.0.0", "typescript": "~3.7.5" } } diff --git a/packages/@jsii/dotnet-runtime-test/CHANGELOG.md b/packages/@jsii/dotnet-runtime-test/CHANGELOG.md index abbd3e80da..3301a12a43 100644 --- a/packages/@jsii/dotnet-runtime-test/CHANGELOG.md +++ b/packages/@jsii/dotnet-runtime-test/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + + +### Features + +* **csharp:** enable nullable reference types ([#1246](https://github.com/aws/jsii/issues/1246)) ([cbc7258](https://github.com/aws/jsii/commit/cbc72588b7a70fb2cb1d6d3012bec53d27263001)) +* **dotnet:** upgrade target framework to netcoreapp3.1 ([#1241](https://github.com/aws/jsii/issues/1241)) ([c324439](https://github.com/aws/jsii/commit/c32443979548faa283894d5aaf4f4baf31350063)) + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index 648919aec6..aa243c26a2 100644 --- a/packages/@jsii/dotnet-runtime-test/package.json +++ b/packages/@jsii/dotnet-runtime-test/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-runtime-test", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "Tests for the .NET client for jsii runtime", "license": "Apache-2.0", @@ -30,10 +30,10 @@ "test:update": "UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@jsii/dotnet-runtime": "^0.22.0", + "@jsii/dotnet-runtime": "^1.0.0", "@types/node": "^10.17.15", - "jsii-calc": "^0.22.0", - "jsii-pacmak": "^0.22.0", + "jsii-calc": "^1.0.0", + "jsii-pacmak": "^1.0.0", "typescript": "~3.7.5" } } diff --git a/packages/@jsii/dotnet-runtime/CHANGELOG.md b/packages/@jsii/dotnet-runtime/CHANGELOG.md index 847554174a..ad98b1213c 100644 --- a/packages/@jsii/dotnet-runtime/CHANGELOG.md +++ b/packages/@jsii/dotnet-runtime/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + + +### Features + +* **csharp:** enable nullable reference types ([#1246](https://github.com/aws/jsii/issues/1246)) ([cbc7258](https://github.com/aws/jsii/commit/cbc72588b7a70fb2cb1d6d3012bec53d27263001)) +* **dotnet:** upgrade target framework to netcoreapp3.1 ([#1241](https://github.com/aws/jsii/issues/1241)) ([c324439](https://github.com/aws/jsii/commit/c32443979548faa283894d5aaf4f4baf31350063)) + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @jsii/dotnet-runtime diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index 95fddfa521..205d0747f3 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-runtime", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": ".NET client for jsii runtime", "license": "Apache-2.0", @@ -37,11 +37,11 @@ "package": "package-dotnet" }, "devDependencies": { - "@jsii/dotnet-jsonmodel": "^0.22.0", - "@jsii/runtime": "^0.22.0", + "@jsii/dotnet-jsonmodel": "^1.0.0", + "@jsii/runtime": "^1.0.0", "@types/node": "^10.17.15", "@types/semver": "^7.1.0", - "jsii-build-tools": "^0.22.0", + "jsii-build-tools": "^1.0.0", "semver": "^7.1.3", "typescript": "~3.7.5" } diff --git a/packages/@jsii/integ-test/CHANGELOG.md b/packages/@jsii/integ-test/CHANGELOG.md new file mode 100644 index 0000000000..34910372fe --- /dev/null +++ b/packages/@jsii/integ-test/CHANGELOG.md @@ -0,0 +1,11 @@ +# Change Log + +All notable changes to this project will be documented in this file. +See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. + +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + + +### Features + +* CDK Build Integration Test ([#1219](https://github.com/aws/jsii/issues/1219)) ([e99d722](https://github.com/aws/jsii/commit/e99d722fb7b12d6a87b423980aca70077c0ad1cb)), closes [#1209](https://github.com/aws/jsii/issues/1209) diff --git a/packages/@jsii/integ-test/package.json b/packages/@jsii/integ-test/package.json index 513efb9135..c0be8ebb60 100644 --- a/packages/@jsii/integ-test/package.json +++ b/packages/@jsii/integ-test/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/integ-test", - "version": "0.22.0", + "version": "1.0.0", "description": "A suite of integration tests for JSII and related modules.", "private": true, "scripts": { @@ -26,9 +26,9 @@ "eslint": "^6.8.0", "fs-extra": "^8.1.0", "jest": "^25.1.0", - "jsii": "^0.22.0", - "jsii-pacmak": "^0.22.0", - "jsii-rosetta": "^0.22.0", + "jsii": "^1.0.0", + "jsii-pacmak": "^1.0.0", + "jsii-rosetta": "^1.0.0", "typescript": "~3.7.5" }, "jest": { diff --git a/packages/@jsii/java-runtime-test/CHANGELOG.md b/packages/@jsii/java-runtime-test/CHANGELOG.md index 28c5ae369a..e6155e12e7 100644 --- a/packages/@jsii/java-runtime-test/CHANGELOG.md +++ b/packages/@jsii/java-runtime-test/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @jsii/java-runtime-test + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) diff --git a/packages/@jsii/java-runtime-test/package.json b/packages/@jsii/java-runtime-test/package.json index 26afccca95..aeaae2ff42 100644 --- a/packages/@jsii/java-runtime-test/package.json +++ b/packages/@jsii/java-runtime-test/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/java-runtime-test", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "Tests for the Java client for jsii runtime", "license": "Apache-2.0", @@ -28,8 +28,8 @@ "test:update": "UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@jsii/java-runtime": "^0.22.0", - "jsii-calc": "^0.22.0", - "jsii-pacmak": "^0.22.0" + "@jsii/java-runtime": "^1.0.0", + "jsii-calc": "^1.0.0", + "jsii-pacmak": "^1.0.0" } } diff --git a/packages/@jsii/java-runtime/CHANGELOG.md b/packages/@jsii/java-runtime/CHANGELOG.md index cf20d0964b..85d30aa912 100644 --- a/packages/@jsii/java-runtime/CHANGELOG.md +++ b/packages/@jsii/java-runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @jsii/java-runtime + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index 1d556cc98e..ebc8c135f6 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/java-runtime", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "Java client for jsii runtime", "license": "Apache-2.0", @@ -31,9 +31,9 @@ "package": "package-java" }, "devDependencies": { - "@jsii/runtime": "^0.22.0", + "@jsii/runtime": "^1.0.0", "@types/node": "^10.17.15", - "jsii-build-tools": "^0.22.0", + "jsii-build-tools": "^1.0.0", "typescript": "~3.7.5" } } diff --git a/packages/@jsii/kernel/CHANGELOG.md b/packages/@jsii/kernel/CHANGELOG.md index b07332c9f5..c0dbd9209c 100644 --- a/packages/@jsii/kernel/CHANGELOG.md +++ b/packages/@jsii/kernel/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @jsii/kernel + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @jsii/kernel diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 937f6d8431..2bdee4910b 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/kernel", - "version": "0.22.0", + "version": "1.0.0", "description": "kernel for jsii execution environment", "license": "Apache-2.0", "author": { @@ -30,14 +30,14 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.22.0", + "@jsii/spec": "^1.0.0", "fs-extra": "^8.1.0", "source-map": "^0.7.3", "tar": "^6.0.1" }, "devDependencies": { - "@scope/jsii-calc-base": "^0.22.0", - "@scope/jsii-calc-lib": "^0.22.0", + "@scope/jsii-calc-base": "^1.0.0", + "@scope/jsii-calc-lib": "^1.0.0", "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", "@types/jest-expect-message": "^1.0.1", @@ -46,8 +46,8 @@ "eslint": "^6.8.0", "jest": "^25.1.0", "jest-expect-message": "^1.0.2", - "jsii-build-tools": "^0.22.0", - "jsii-calc": "^0.22.0", + "jsii-build-tools": "^1.0.0", + "jsii-calc": "^1.0.0", "typescript": "~3.7.5" }, "jest": { diff --git a/packages/@jsii/python-runtime/CHANGELOG.md b/packages/@jsii/python-runtime/CHANGELOG.md index 8d04b74349..54d286acdf 100644 --- a/packages/@jsii/python-runtime/CHANGELOG.md +++ b/packages/@jsii/python-runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @jsii/python-runtime + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json index 0bf95cfd09..c34e2b52ca 100644 --- a/packages/@jsii/python-runtime/package.json +++ b/packages/@jsii/python-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/python-runtime", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "Python client for jsii runtime", "license": "Apache-2.0", @@ -30,9 +30,9 @@ "test:update": "UPDATE_DIFF=1 .env/bin/python bin/generate-calc && .env/bin/py.test -v --mypy" }, "dependencies": { - "@jsii/runtime": "^0.22.0", - "jsii-build-tools": "^0.22.0", - "jsii-calc": "^0.22.0", - "jsii-pacmak": "^0.22.0" + "@jsii/runtime": "^1.0.0", + "jsii-build-tools": "^1.0.0", + "jsii-calc": "^1.0.0", + "jsii-pacmak": "^1.0.0" } } diff --git a/packages/@jsii/ruby-runtime/CHANGELOG.md b/packages/@jsii/ruby-runtime/CHANGELOG.md index d89a76a7d5..77eedd5b97 100644 --- a/packages/@jsii/ruby-runtime/CHANGELOG.md +++ b/packages/@jsii/ruby-runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @jsii/ruby-runtime + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @jsii/ruby-runtime diff --git a/packages/@jsii/ruby-runtime/package.json b/packages/@jsii/ruby-runtime/package.json index 6b527602a1..a778dbc525 100644 --- a/packages/@jsii/ruby-runtime/package.json +++ b/packages/@jsii/ruby-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/ruby-runtime", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "Ruby client for jsii runtime", "license": "Apache-2.0", @@ -33,11 +33,11 @@ "package": "package-ruby" }, "devDependencies": { - "@jsii/runtime": "^0.22.0", + "@jsii/runtime": "^1.0.0", "@types/node": "^10.17.15", - "jsii-build-tools": "^0.22.0", - "jsii-calc": "^0.22.0", - "jsii-pacmak": "^0.22.0", + "jsii-build-tools": "^1.0.0", + "jsii-calc": "^1.0.0", + "jsii-pacmak": "^1.0.0", "typescript": "~3.7.5" } } diff --git a/packages/@jsii/ruby-runtime/project/Gemfile.lock b/packages/@jsii/ruby-runtime/project/Gemfile.lock index e1cc6c5c62..1e3421e08a 100644 --- a/packages/@jsii/ruby-runtime/project/Gemfile.lock +++ b/packages/@jsii/ruby-runtime/project/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - jsii_runtime (0.22.0) + jsii_runtime (1.0.0) GEM remote: https://rubygems.org/ @@ -34,4 +34,4 @@ DEPENDENCIES test-unit (~> 3.3.3) BUNDLED WITH - 2.0.2 + 2.1.4 diff --git a/packages/@jsii/runtime/CHANGELOG.md b/packages/@jsii/runtime/CHANGELOG.md index 97f920cd54..b27e9c2f7a 100644 --- a/packages/@jsii/runtime/CHANGELOG.md +++ b/packages/@jsii/runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @jsii/runtime + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @jsii/runtime diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index 8ae6494f71..11de89c9b9 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/runtime", - "version": "0.22.0", + "version": "1.0.0", "description": "jsii runtime kernel process", "license": "Apache-2.0", "author": { @@ -33,18 +33,18 @@ "package": "package-js" }, "dependencies": { - "@jsii/kernel": "^0.22.0", - "@jsii/spec": "^0.22.0" + "@jsii/kernel": "^1.0.0", + "@jsii/spec": "^1.0.0" }, "devDependencies": { - "@scope/jsii-calc-base": "^0.22.0", - "@scope/jsii-calc-lib": "^0.22.0", + "@scope/jsii-calc-base": "^1.0.0", + "@scope/jsii-calc-lib": "^1.0.0", "@types/jest": "^25.1.2", "@types/node": "^10.17.15", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii-build-tools": "^0.22.0", - "jsii-calc": "^0.22.0", + "jsii-build-tools": "^1.0.0", + "jsii-calc": "^1.0.0", "source-map": "^0.7.3", "source-map-loader": "^0.2.4", "typescript": "~3.7.5", diff --git a/packages/@jsii/spec/CHANGELOG.md b/packages/@jsii/spec/CHANGELOG.md index 0205e52a3a..4083e7e784 100644 --- a/packages/@jsii/spec/CHANGELOG.md +++ b/packages/@jsii/spec/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @jsii/spec + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @jsii/spec diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index 3c8beb7722..a9e710708b 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/spec", - "version": "0.22.0", + "version": "1.0.0", "description": "Specification for jsii assemblies", "license": "Apache-2.0", "author": { @@ -37,7 +37,7 @@ "@types/node": "^10.17.15", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii-build-tools": "^0.22.0", + "jsii-build-tools": "^1.0.0", "typescript": "~3.7.5", "typescript-json-schema": "^0.42.0" }, diff --git a/packages/@scope/jsii-calc-base-of-base/CHANGELOG.md b/packages/@scope/jsii-calc-base-of-base/CHANGELOG.md index e56f35bd45..a6755816b6 100644 --- a/packages/@scope/jsii-calc-base-of-base/CHANGELOG.md +++ b/packages/@scope/jsii-calc-base-of-base/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @scope/jsii-calc-base-of-base + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @scope/jsii-calc-base-of-base diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 2b52f503ce..b86a0da314 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-base-of-base", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "An example transitive dependency for jsii-calc.", "license": "Apache-2.0", @@ -30,9 +30,9 @@ }, "devDependencies": { "@types/node": "^10.17.15", - "jsii": "^0.22.0", - "jsii-build-tools": "^0.22.0", - "jsii-rosetta": "^0.22.0" + "jsii": "^1.0.0", + "jsii-build-tools": "^1.0.0", + "jsii-rosetta": "^1.0.0" }, "jsii": { "outdir": "dist", diff --git a/packages/@scope/jsii-calc-base/CHANGELOG.md b/packages/@scope/jsii-calc-base/CHANGELOG.md index 343c4c6f77..f645fa59e6 100644 --- a/packages/@scope/jsii-calc-base/CHANGELOG.md +++ b/packages/@scope/jsii-calc-base/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @scope/jsii-calc-base + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @scope/jsii-calc-base diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index 940d88d571..a30ede4285 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-base", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "An example direct dependency for jsii-calc.", "license": "Apache-2.0", @@ -29,16 +29,16 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^0.22.0" + "@scope/jsii-calc-base-of-base": "^1.0.0" }, "peerDependencies": { - "@scope/jsii-calc-base-of-base": "^0.22.0" + "@scope/jsii-calc-base-of-base": "^1.0.0" }, "devDependencies": { "@types/node": "^10.17.15", - "jsii": "^0.22.0", - "jsii-build-tools": "^0.22.0", - "jsii-rosetta": "^0.22.0" + "jsii": "^1.0.0", + "jsii-build-tools": "^1.0.0", + "jsii-rosetta": "^1.0.0" }, "jsii": { "outdir": "dist", diff --git a/packages/@scope/jsii-calc-lib/CHANGELOG.md b/packages/@scope/jsii-calc-lib/CHANGELOG.md index 7bdaad70bf..ccc7114eb6 100644 --- a/packages/@scope/jsii-calc-lib/CHANGELOG.md +++ b/packages/@scope/jsii-calc-lib/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package @scope/jsii-calc-lib + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package @scope/jsii-calc-lib diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index 0cf2dc512e..1f11b8ee3f 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-lib", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "A simple calcuator library built on JSII.", "deprecated": "Really just deprecated for shows...", @@ -31,16 +31,16 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "dependencies": { - "@scope/jsii-calc-base": "^0.22.0" + "@scope/jsii-calc-base": "^1.0.0" }, "peerDependencies": { - "@scope/jsii-calc-base": "^0.22.0" + "@scope/jsii-calc-base": "^1.0.0" }, "devDependencies": { "@types/node": "^10.17.15", - "jsii": "^0.22.0", - "jsii-build-tools": "^0.22.0", - "jsii-rosetta": "^0.22.0" + "jsii": "^1.0.0", + "jsii-build-tools": "^1.0.0", + "jsii-rosetta": "^1.0.0" }, "jsii": { "outdir": "dist", diff --git a/packages/codemaker/CHANGELOG.md b/packages/codemaker/CHANGELOG.md index bed2d20636..53618e7e19 100644 --- a/packages/codemaker/CHANGELOG.md +++ b/packages/codemaker/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package codemaker + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package codemaker diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 5dc0819faa..e5c8656dc1 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -1,6 +1,6 @@ { "name": "codemaker", - "version": "0.22.0", + "version": "1.0.0", "description": "A tiny utility for generating source code", "license": "Apache-2.0", "author": { diff --git a/packages/jsii-calc/CHANGELOG.md b/packages/jsii-calc/CHANGELOG.md index 5b43b74965..796f927035 100644 --- a/packages/jsii-calc/CHANGELOG.md +++ b/packages/jsii-calc/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package jsii-calc + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index 4dabd747ec..19949d8abf 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -1,6 +1,6 @@ { "name": "jsii-calc", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "A simple calcuator built on JSII.", "stability": "experimental", @@ -37,20 +37,20 @@ }, "dependencies": { "@fixtures/jsii-calc-bundled": "file:../@fixtures/jsii-calc-bundled", - "@scope/jsii-calc-base": "^0.22.0", - "@scope/jsii-calc-base-of-base": "^0.22.0", - "@scope/jsii-calc-lib": "^0.22.0" + "@scope/jsii-calc-base": "^1.0.0", + "@scope/jsii-calc-base-of-base": "^1.0.0", + "@scope/jsii-calc-lib": "^1.0.0" }, "peerDependencies": { - "@scope/jsii-calc-base": "^0.22.0", - "@scope/jsii-calc-base-of-base": "^0.22.0", - "@scope/jsii-calc-lib": "^0.22.0" + "@scope/jsii-calc-base": "^1.0.0", + "@scope/jsii-calc-base-of-base": "^1.0.0", + "@scope/jsii-calc-lib": "^1.0.0" }, "devDependencies": { "@types/node": "^10.17.15", - "jsii": "^0.22.0", - "jsii-build-tools": "^0.22.0", - "jsii-rosetta": "^0.22.0" + "jsii": "^1.0.0", + "jsii-build-tools": "^1.0.0", + "jsii-rosetta": "^1.0.0" }, "jsii": { "outdir": "dist", diff --git a/packages/jsii-config/CHANGELOG.md b/packages/jsii-config/CHANGELOG.md index 6fc7eb9762..81c6a9cd7d 100644 --- a/packages/jsii-config/CHANGELOG.md +++ b/packages/jsii-config/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package jsii-config + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package jsii-config diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index d0b103c1fa..d04192189b 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -1,6 +1,6 @@ { "name": "jsii-config", - "version": "0.22.0", + "version": "1.0.0", "description": "CLI tool for configuring jsii module configuration in package.json", "main": "lib/index.js", "repository": "https://github.com/aws/jsii", @@ -29,7 +29,7 @@ "typescript": "~3.7.5" }, "dependencies": { - "@jsii/spec": "^0.22.0", + "@jsii/spec": "^1.0.0", "inquirer": "^7.0.4", "yargs": "^15.1.0" }, diff --git a/packages/jsii-diff/CHANGELOG.md b/packages/jsii-diff/CHANGELOG.md index d98a1a5f3c..6a89308374 100644 --- a/packages/jsii-diff/CHANGELOG.md +++ b/packages/jsii-diff/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package jsii-diff + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package jsii-diff diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 45e8611d2d..43f68bd8cc 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -1,6 +1,6 @@ { "name": "jsii-diff", - "version": "0.22.0", + "version": "1.0.0", "description": "Assembly comparison for jsii", "license": "Apache-2.0", "author": { @@ -32,9 +32,9 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.22.0", + "@jsii/spec": "^1.0.0", "fs-extra": "^8.1.0", - "jsii-reflect": "^0.22.0", + "jsii-reflect": "^1.0.0", "log4js": "^6.1.2", "typescript": "~3.7.5", "yargs": "^15.1.0" @@ -49,8 +49,8 @@ "eslint": "^6.8.0", "jest": "^25.1.0", "jest-expect-message": "^1.0.2", - "jsii": "^0.22.0", - "jsii-build-tools": "^0.22.0" + "jsii": "^1.0.0", + "jsii-build-tools": "^1.0.0" }, "jest": { "collectCoverage": true, diff --git a/packages/jsii-pacmak/CHANGELOG.md b/packages/jsii-pacmak/CHANGELOG.md index aa3197971f..2cff5239b5 100644 --- a/packages/jsii-pacmak/CHANGELOG.md +++ b/packages/jsii-pacmak/CHANGELOG.md @@ -3,6 +3,18 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + + +### Features + +* **csharp:** enable nullable reference types ([#1246](https://github.com/aws/jsii/issues/1246)) ([cbc7258](https://github.com/aws/jsii/commit/cbc72588b7a70fb2cb1d6d3012bec53d27263001)) +* **dotnet:** upgrade target framework to netcoreapp3.1 ([#1241](https://github.com/aws/jsii/issues/1241)) ([c324439](https://github.com/aws/jsii/commit/c32443979548faa283894d5aaf4f4baf31350063)) + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 018fc401a8..17af3163c9 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -1,6 +1,6 @@ { "name": "jsii-pacmak", - "version": "0.22.0", + "version": "1.0.0", "description": "A code generation framework for jsii backend languages", "license": "Apache-2.0", "author": { @@ -34,25 +34,25 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.22.0", + "@jsii/spec": "^1.0.0", "camelcase": "^5.1.3", "clone": "^2.1.2", - "codemaker": "^0.22.0", + "codemaker": "^1.0.0", "commonmark": "^0.29.1", "escape-string-regexp": "^2.0.0", "fs-extra": "^8.1.0", - "jsii-reflect": "^0.22.0", - "jsii-rosetta": "^0.22.0", + "jsii-reflect": "^1.0.0", + "jsii-rosetta": "^1.0.0", "semver": "^7.1.3", "spdx-license-list": "^6.1.0", "xmlbuilder": "^14.0.0", "yargs": "^15.1.0" }, "devDependencies": { - "@jsii/dotnet-jsonmodel": "^0.22.0", - "@jsii/dotnet-runtime": "^0.22.0", - "@jsii/java-runtime": "^0.22.0", - "@scope/jsii-calc-lib": "^0.22.0", + "@jsii/dotnet-jsonmodel": "^1.0.0", + "@jsii/dotnet-runtime": "^1.0.0", + "@jsii/java-runtime": "^1.0.0", + "@scope/jsii-calc-lib": "^1.0.0", "@types/clone": "^0.1.30", "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.0.1", @@ -63,8 +63,8 @@ "@types/yargs": "^15.0.3", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii-build-tools": "^0.22.0", - "jsii-calc": "^0.22.0", + "jsii-build-tools": "^1.0.0", + "jsii-calc": "^1.0.0", "mock-fs": "^4.10.4", "typescript": "~3.7.5" }, diff --git a/packages/jsii-reflect/CHANGELOG.md b/packages/jsii-reflect/CHANGELOG.md index 31fbfc0385..cfb42acaaa 100644 --- a/packages/jsii-reflect/CHANGELOG.md +++ b/packages/jsii-reflect/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package jsii-reflect + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index a1a8b2447a..e5d482fef1 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -1,6 +1,6 @@ { "name": "jsii-reflect", - "version": "0.22.0", + "version": "1.0.0", "description": "strongly-typed reflection library and tools for jsii", "license": "Apache-2.0", "author": { @@ -33,23 +33,23 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.22.0", + "@jsii/spec": "^1.0.0", "colors": "^1.4.0", "fs-extra": "^8.1.0", - "oo-ascii-tree": "^0.22.0", + "oo-ascii-tree": "^1.0.0", "yargs": "^15.1.0" }, "devDependencies": { - "@scope/jsii-calc-lib": "^0.22.0", + "@scope/jsii-calc-lib": "^1.0.0", "@types/fs-extra": "^8.0.1", "@types/jest": "^25.1.2", "@types/node": "^10.17.15", "@types/yargs": "^15.0.3", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii": "^0.22.0", - "jsii-build-tools": "^0.22.0", - "jsii-calc": "^0.22.0", + "jsii": "^1.0.0", + "jsii-build-tools": "^1.0.0", + "jsii-calc": "^1.0.0", "typescript": "~3.7.5" }, "jest": { diff --git a/packages/jsii-rosetta/CHANGELOG.md b/packages/jsii-rosetta/CHANGELOG.md index 01d4b21bc9..08600f2a38 100644 --- a/packages/jsii-rosetta/CHANGELOG.md +++ b/packages/jsii-rosetta/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package jsii-rosetta + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package jsii-rosetta diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 29234b86c6..7961f13be0 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -1,6 +1,6 @@ { "name": "jsii-rosetta", - "version": "0.22.0", + "version": "1.0.0", "description": "Translate TypeScript code snippets to other languages", "main": "lib/index.js", "bin": { @@ -23,14 +23,14 @@ "@types/yargs": "^15.0.3", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii": "^0.22.0", - "jsii-build-tools": "^0.22.0", + "jsii": "^1.0.0", + "jsii-build-tools": "^1.0.0", "memory-streams": "^0.1.3", "mock-fs": "^4.10.4", "typescript": "~3.7.5" }, "dependencies": { - "@jsii/spec": "^0.22.0", + "@jsii/spec": "^1.0.0", "commonmark": "^0.29.1", "fs-extra": "^8.1.0", "typescript": "~3.7.5", diff --git a/packages/jsii/CHANGELOG.md b/packages/jsii/CHANGELOG.md index e9ced95a17..da8ad60324 100644 --- a/packages/jsii/CHANGELOG.md +++ b/packages/jsii/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package jsii + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package jsii diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 7c1bf78b35..d38f25bf56 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -1,6 +1,6 @@ { "name": "jsii", - "version": "0.22.0", + "version": "1.0.0", "description": "TypeScript compiler for jsii", "license": "Apache-2.0", "author": { @@ -33,7 +33,7 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.22.0", + "@jsii/spec": "^1.0.0", "case": "^1.6.2", "colors": "^1.4.0", "deep-equal": "^2.0.1", @@ -59,7 +59,7 @@ "eslint": "^6.8.0", "jest": "^25.1.0", "jest-expect-message": "^1.0.2", - "jsii-build-tools": "^0.22.0" + "jsii-build-tools": "^1.0.0" }, "jest": { "collectCoverage": true, diff --git a/packages/oo-ascii-tree/CHANGELOG.md b/packages/oo-ascii-tree/CHANGELOG.md index b6a4963904..33c3c53bf1 100644 --- a/packages/oo-ascii-tree/CHANGELOG.md +++ b/packages/oo-ascii-tree/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package oo-ascii-tree + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package oo-ascii-tree diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index dd11633c9b..40273e1eb7 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -1,6 +1,6 @@ { "name": "oo-ascii-tree", - "version": "0.22.0", + "version": "1.0.0", "description": "object-oriented ascii tree renderer", "license": "Apache-2.0", "author": { @@ -34,7 +34,7 @@ "@types/node": "^10.17.15", "eslint": "^6.8.0", "jest": "^25.1.0", - "jsii-build-tools": "^0.22.0", + "jsii-build-tools": "^1.0.0", "typescript": "~3.7.5" }, "jest": { diff --git a/tools/jsii-build-tools/CHANGELOG.md b/tools/jsii-build-tools/CHANGELOG.md index 31e44ae5cc..1f7c33506a 100644 --- a/tools/jsii-build-tools/CHANGELOG.md +++ b/tools/jsii-build-tools/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) + +**Note:** Version bump only for package jsii-build-tools + + + + + # [0.22.0](https://github.com/aws/jsii/compare/v0.21.2...v0.22.0) (2020-02-06) **Note:** Version bump only for package jsii-build-tools diff --git a/tools/jsii-build-tools/package.json b/tools/jsii-build-tools/package.json index 4aaa410b2d..68018ffc0b 100644 --- a/tools/jsii-build-tools/package.json +++ b/tools/jsii-build-tools/package.json @@ -1,6 +1,6 @@ { "name": "jsii-build-tools", - "version": "0.22.0", + "version": "1.0.0", "private": true, "description": "Internal repository-level tools", "license": "Apache-2.0", From ee1fa67a43f500dc221bd515f36b24ccbd15dbc8 Mon Sep 17 00:00:00 2001 From: Elad Ben-Israel Date: Mon, 17 Feb 2020 17:18:30 +0200 Subject: [PATCH 16/18] change version heading to H2 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3556fe888..6882133957 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. -# [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) +## [1.0.0](https://github.com/aws/jsii/compare/v0.22.0...v1.0.0) (2020-02-17) ### Features From 6f6dbf4bb47652c9bfc40f23a46156a3b620eadf Mon Sep 17 00:00:00 2001 From: Elad Ben-Israel Date: Tue, 18 Feb 2020 09:26:09 +0200 Subject: [PATCH 17/18] update exp --- .../@scope/jsii-calc-base-of-base/test/assembly.jsii | 6 +++--- packages/@scope/jsii-calc-base/test/assembly.jsii | 8 ++++---- packages/@scope/jsii-calc-lib/test/assembly.jsii | 8 ++++---- packages/jsii-calc/test/assembly.jsii | 12 ++++++------ 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii b/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii index 05f844fc62..b1f0f97f8f 100644 --- a/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii +++ b/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii @@ -9,7 +9,7 @@ }, "description": "An example transitive dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.22.0", + "jsiiVersion": "1.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-base-of-base", "repository": { @@ -110,6 +110,6 @@ ] } }, - "version": "0.22.0", - "fingerprint": "JfUxigwBmQ7GF9nJ5wnc4s5+lNJwcPC2QBjjv/KA6VI=" + "version": "1.0.0", + "fingerprint": "9Ni2MoMycfltfmlok/Elj6Rf08vZB0I6ugX+4eY94as=" } diff --git a/packages/@scope/jsii-calc-base/test/assembly.jsii b/packages/@scope/jsii-calc-base/test/assembly.jsii index 6db01e73ad..5f9950b6de 100644 --- a/packages/@scope/jsii-calc-base/test/assembly.jsii +++ b/packages/@scope/jsii-calc-base/test/assembly.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^0.22.0" + "@scope/jsii-calc-base-of-base": "^1.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base-of-base": { @@ -36,7 +36,7 @@ }, "description": "An example direct dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.22.0", + "jsiiVersion": "1.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-base", "repository": { @@ -150,6 +150,6 @@ "name": "IBaseInterface" } }, - "version": "0.22.0", - "fingerprint": "ajVoqlQslGoM3+L8TvwOYbqLWGNMwn1Vioe+WY7H4Eo=" + "version": "1.0.0", + "fingerprint": "haBNSe7Z5qvqzSPCTTZ8DLPPSWyAbiVc83/8h/5QaGw=" } diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii index b05e977509..86f7fc14b3 100644 --- a/packages/@scope/jsii-calc-lib/test/assembly.jsii +++ b/packages/@scope/jsii-calc-lib/test/assembly.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base": "^0.22.0" + "@scope/jsii-calc-base": "^1.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -62,7 +62,7 @@ "stability": "deprecated" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.22.0", + "jsiiVersion": "1.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-lib", "repository": { @@ -515,6 +515,6 @@ ] } }, - "version": "0.22.0", - "fingerprint": "i2VZu3yga2n7APt6oa8RYA14jfrlqkD8zPc+xoxXQfw=" + "version": "1.0.0", + "fingerprint": "50CWMBad9hPa0ffMCQJNMgP/iFBvq+3AN5U2T2Slcsw=" } diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii index c47c6011d5..89b9a106cd 100644 --- a/packages/jsii-calc/test/assembly.jsii +++ b/packages/jsii-calc/test/assembly.jsii @@ -34,9 +34,9 @@ } ], "dependencies": { - "@scope/jsii-calc-base": "^0.22.0", - "@scope/jsii-calc-base-of-base": "^0.22.0", - "@scope/jsii-calc-lib": "^0.22.0" + "@scope/jsii-calc-base": "^1.0.0", + "@scope/jsii-calc-base-of-base": "^1.0.0", + "@scope/jsii-calc-lib": "^1.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -113,7 +113,7 @@ "stability": "experimental" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.22.0", + "jsiiVersion": "1.0.0", "keywords": [ "aws", "jsii", @@ -12122,6 +12122,6 @@ "namespace": "composition.CompositeOperation" } }, - "version": "0.22.0", - "fingerprint": "dmFWtiHlAAJTZImTNAjLUtdrfFpMaJzHMBqCsDDG1Dk=" + "version": "1.0.0", + "fingerprint": "rtlqfLVk+YuqJRqeFCR5A3mesEPpfJgo5m1gRM323+U=" } From 10c3dadb1aaa6bf7d1d5760f61f55ae41d2dc08d Mon Sep 17 00:00:00 2001 From: Elad Ben-Israel Date: Tue, 18 Feb 2020 09:30:29 +0200 Subject: [PATCH 18/18] update expectations --- .../.jsii | 6 +++--- ...ts.CalculatorPackageId.BaseOfBasePackageId.csproj | 6 +++--- .../AssemblyInfo.cs | 2 +- ....0.tgz => scope-jsii-calc-base-of-base-1.0.0.tgz} | 0 .../expected.jsii-calc-base-of-base/java/pom.xml | 4 ++-- .../jsii/tests/calculator/baseofbase/$Module.java | 2 +- ...sii.tgz => jsii-calc-base-of-base@1.0.0.jsii.tgz} | 0 ...sii.tgz => jsii-calc-base-of-base@1.0.0.jsii.tgz} | 0 .../expected.jsii-calc-base-of-base/python/setup.py | 6 +++--- .../src/scope/jsii_calc_base_of_base/__init__.py | 2 +- ...sii.tgz => jsii-calc-base-of-base@1.0.0.jsii.tgz} | 0 .../.jsii | 8 ++++---- ...II.Tests.CalculatorPackageId.BasePackageId.csproj | 8 ++++---- .../AssemblyInfo.cs | 2 +- ...ase-0.22.0.tgz => scope-jsii-calc-base-1.0.0.tgz} | 0 .../test/expected.jsii-calc-base/java/pom.xml | 6 +++--- .../amazon/jsii/tests/calculator/base/$Module.java | 2 +- ...0.22.0.jsii.tgz => jsii-calc-base@1.0.0.jsii.tgz} | 0 ...0.22.0.jsii.tgz => jsii-calc-base@1.0.0.jsii.tgz} | 0 .../test/expected.jsii-calc-base/python/setup.py | 8 ++++---- .../python/src/scope/jsii_calc_base/__init__.py | 2 +- ...0.22.0.jsii.tgz => jsii-calc-base@1.0.0.jsii.tgz} | 0 .../.jsii | 8 ++++---- ...SII.Tests.CalculatorPackageId.LibPackageId.csproj | 8 ++++---- .../AssemblyInfo.cs | 2 +- ...-lib-0.22.0.tgz => scope-jsii-calc-lib-1.0.0.tgz} | 0 .../test/expected.jsii-calc-lib/java/pom.xml | 6 +++--- .../amazon/jsii/tests/calculator/lib/$Module.java | 2 +- ...@0.22.0.jsii.tgz => jsii-calc-lib@1.0.0.jsii.tgz} | 0 ...@0.22.0.jsii.tgz => jsii-calc-lib@1.0.0.jsii.tgz} | 0 .../test/expected.jsii-calc-lib/python/setup.py | 8 ++++---- .../python/src/scope/jsii_calc_lib/__init__.py | 2 +- ...@0.22.0.jsii.tgz => jsii-calc-lib@1.0.0.jsii.tgz} | 0 .../Amazon.JSII.Tests.CalculatorPackageId/.jsii | 12 ++++++------ .../Amazon.JSII.Tests.CalculatorPackageId.csproj | 12 ++++++------ .../AssemblyInfo.cs | 2 +- .../{jsii-calc-0.22.0.tgz => jsii-calc-1.0.0.tgz} | 0 .../jsii-pacmak/test/expected.jsii-calc/java/pom.xml | 10 +++++----- .../amazon/jsii/tests/calculator/$Module.java | 2 +- ...calc@0.22.0.jsii.tgz => jsii-calc@1.0.0.jsii.tgz} | 0 ...calc@0.22.0.jsii.tgz => jsii-calc@1.0.0.jsii.tgz} | 0 .../test/expected.jsii-calc/python/setup.py | 12 ++++++------ .../python/src/jsii_calc/__init__.py | 2 +- ...calc@0.22.0.jsii.tgz => jsii-calc@1.0.0.jsii.tgz} | 0 44 files changed, 76 insertions(+), 76 deletions(-) rename packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/{scope-jsii-calc-base-of-base-0.22.0.tgz => scope-jsii-calc-base-of-base-1.0.0.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/{jsii-calc-base-of-base@0.22.0.jsii.tgz => jsii-calc-base-of-base@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/{jsii-calc-base-of-base@0.22.0.jsii.tgz => jsii-calc-base-of-base@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/{jsii-calc-base-of-base@0.22.0.jsii.tgz => jsii-calc-base-of-base@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/{scope-jsii-calc-base-0.22.0.tgz => scope-jsii-calc-base-1.0.0.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/{jsii-calc-base@0.22.0.jsii.tgz => jsii-calc-base@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/js/{jsii-calc-base@0.22.0.jsii.tgz => jsii-calc-base@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/{jsii-calc-base@0.22.0.jsii.tgz => jsii-calc-base@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/{scope-jsii-calc-lib-0.22.0.tgz => scope-jsii-calc-lib-1.0.0.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/{jsii-calc-lib@0.22.0.jsii.tgz => jsii-calc-lib@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/js/{jsii-calc-lib@0.22.0.jsii.tgz => jsii-calc-lib@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/{jsii-calc-lib@0.22.0.jsii.tgz => jsii-calc-lib@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/{jsii-calc-0.22.0.tgz => jsii-calc-1.0.0.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/{jsii-calc@0.22.0.jsii.tgz => jsii-calc@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/js/{jsii-calc@0.22.0.jsii.tgz => jsii-calc@1.0.0.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/{jsii-calc@0.22.0.jsii.tgz => jsii-calc@1.0.0.jsii.tgz} (100%) diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii index 05f844fc62..b1f0f97f8f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii @@ -9,7 +9,7 @@ }, "description": "An example transitive dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.22.0", + "jsiiVersion": "1.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-base-of-base", "repository": { @@ -110,6 +110,6 @@ ] } }, - "version": "0.22.0", - "fingerprint": "JfUxigwBmQ7GF9nJ5wnc4s5+lNJwcPC2QBjjv/KA6VI=" + "version": "1.0.0", + "fingerprint": "9Ni2MoMycfltfmlok/Elj6Rf08vZB0I6ugX+4eY94as=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj index 0943deac72..9c975b7fa3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj @@ -4,7 +4,7 @@ An example transitive dependency for jsii-calc. Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId Apache-2.0 - 0.22.0 + 1.0.0 Amazon Web Services Amazon Web Services @@ -22,10 +22,10 @@ netcoreapp3.1 - + - + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs index ce8c692d51..66a0191d9f 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-base-of-base", "0.22.0", "scope-jsii-calc-base-of-base-0.22.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-base-of-base", "1.0.0", "scope-jsii-calc-base-of-base-1.0.0.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.22.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-1.0.0.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.22.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-1.0.0.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml index b7974e100a..e72cbe9468 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-base-of-base - 0.22.0 + 1.0.0 jar UTF-8 @@ -36,7 +36,7 @@ software.amazon.jsii jsii-runtime - [0.22.0,0.23.0) + [1.0.0,2.0.0) org.jetbrains diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java index 6a47d738b2..cb07d2c19c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java @@ -4,7 +4,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-base-of-base", "0.22.0", $Module.class, "jsii-calc-base-of-base@0.22.0.jsii.tgz"); + super("@scope/jsii-calc-base-of-base", "1.0.0", $Module.class, "jsii-calc-base-of-base@1.0.0.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py index c557b7be3b..ead8b7b261 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-base-of-base", - "version": "0.22.0", + "version": "1.0.0", "description": "An example transitive dependency for jsii-calc.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_base_of_base._jsii": [ - "jsii-calc-base-of-base@0.22.0.jsii.tgz" + "jsii-calc-base-of-base@1.0.0.jsii.tgz" ], "scope.jsii_calc_base_of_base": [ "py.typed" @@ -30,7 +30,7 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.22.0", + "jsii~=1.0.0", "publication>=0.0.3" ], "classifiers": [ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py index 271d30ad61..c209b26559 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py @@ -8,7 +8,7 @@ import jsii.compat import publication -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base-of-base", "0.22.0", __name__, "jsii-calc-base-of-base@0.22.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base-of-base", "1.0.0", __name__, "jsii-calc-base-of-base@1.0.0.jsii.tgz") @jsii.interface(jsii_type="@scope/jsii-calc-base-of-base.IVeryBaseInterface") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii index 6db01e73ad..5f9950b6de 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^0.22.0" + "@scope/jsii-calc-base-of-base": "^1.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base-of-base": { @@ -36,7 +36,7 @@ }, "description": "An example direct dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.22.0", + "jsiiVersion": "1.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-base", "repository": { @@ -150,6 +150,6 @@ "name": "IBaseInterface" } }, - "version": "0.22.0", - "fingerprint": "ajVoqlQslGoM3+L8TvwOYbqLWGNMwn1Vioe+WY7H4Eo=" + "version": "1.0.0", + "fingerprint": "haBNSe7Z5qvqzSPCTTZ8DLPPSWyAbiVc83/8h/5QaGw=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj index b7c9c7416b..d4a2225628 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj @@ -4,7 +4,7 @@ An example direct dependency for jsii-calc. Amazon.JSII.Tests.CalculatorPackageId.BasePackageId Apache-2.0 - 0.22.0 + 1.0.0 Amazon Web Services Amazon Web Services @@ -22,11 +22,11 @@ netcoreapp3.1 - + - - + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs index 22a7610adf..c0511cb314 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-base", "0.22.0", "scope-jsii-calc-base-0.22.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-base", "1.0.0", "scope-jsii-calc-base-1.0.0.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.22.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-1.0.0.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.22.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-1.0.0.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml index c37607ce5b..d42ccae55d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-base - 0.22.0 + 1.0.0 jar UTF-8 @@ -36,12 +36,12 @@ software.amazon.jsii.tests calculator-base-of-base - [0.22.0,0.23.0) + [1.0.0,2.0.0) software.amazon.jsii jsii-runtime - [0.22.0,0.23.0) + [1.0.0,2.0.0) org.jetbrains diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java index c33299273e..cc8a621c81 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-base", "0.22.0", $Module.class, "jsii-calc-base@0.22.0.jsii.tgz"); + super("@scope/jsii-calc-base", "1.0.0", $Module.class, "jsii-calc-base@1.0.0.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py index 70cf0d8c20..fa10b75434 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-base", - "version": "0.22.0", + "version": "1.0.0", "description": "An example direct dependency for jsii-calc.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_base._jsii": [ - "jsii-calc-base@0.22.0.jsii.tgz" + "jsii-calc-base@1.0.0.jsii.tgz" ], "scope.jsii_calc_base": [ "py.typed" @@ -30,9 +30,9 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.22.0", + "jsii~=1.0.0", "publication>=0.0.3", - "scope.jsii-calc-base-of-base>=0.22.0, <0.23.0" + "scope.jsii-calc-base-of-base>=1.0.0, <2.0.0" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py index 6d4f65c399..c6ebb1a33c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py @@ -10,7 +10,7 @@ import scope.jsii_calc_base_of_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "0.22.0", __name__, "jsii-calc-base@0.22.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "1.0.0", __name__, "jsii-calc-base@1.0.0.jsii.tgz") class Base(metaclass=jsii.JSIIAbstractClass, jsii_type="@scope/jsii-calc-base.Base"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii index b05e977509..86f7fc14b3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base": "^0.22.0" + "@scope/jsii-calc-base": "^1.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -62,7 +62,7 @@ "stability": "deprecated" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.22.0", + "jsiiVersion": "1.0.0", "license": "Apache-2.0", "name": "@scope/jsii-calc-lib", "repository": { @@ -515,6 +515,6 @@ ] } }, - "version": "0.22.0", - "fingerprint": "i2VZu3yga2n7APt6oa8RYA14jfrlqkD8zPc+xoxXQfw=" + "version": "1.0.0", + "fingerprint": "50CWMBad9hPa0ffMCQJNMgP/iFBvq+3AN5U2T2Slcsw=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj index b5ad472bbd..01779fa259 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj @@ -4,7 +4,7 @@ A simple calcuator library built on JSII. (Stability: Deprecated) Amazon.JSII.Tests.CalculatorPackageId.LibPackageId Apache-2.0 - 0.22.0-devpreview + 1.0.0-devpreview Amazon Web Services Amazon Web Services @@ -22,11 +22,11 @@ netcoreapp3.1 - + - - + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs index 9ec4e5ef89..e66de67cb5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-lib", "0.22.0", "scope-jsii-calc-lib-0.22.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-lib", "1.0.0", "scope-jsii-calc-lib-1.0.0.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.22.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-1.0.0.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.22.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-1.0.0.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml index 612b6b7504..f2ecba673c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-lib - 0.22.0.DEVPREVIEW + 1.0.0.DEVPREVIEW jar UTF-8 @@ -36,12 +36,12 @@ software.amazon.jsii.tests calculator-base - [0.22.0,0.23.0) + [1.0.0,2.0.0) software.amazon.jsii jsii-runtime - [0.22.0,0.23.0) + [1.0.0,2.0.0) org.jetbrains diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java index ff5ddb1443..a7bc6809b0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-lib", "0.22.0", $Module.class, "jsii-calc-lib@0.22.0.jsii.tgz"); + super("@scope/jsii-calc-lib", "1.0.0", $Module.class, "jsii-calc-lib@1.0.0.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py index e16644fc5f..b89067e075 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-lib", - "version": "0.22.0", + "version": "1.0.0", "description": "A simple calcuator library built on JSII.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_lib._jsii": [ - "jsii-calc-lib@0.22.0.jsii.tgz" + "jsii-calc-lib@1.0.0.jsii.tgz" ], "scope.jsii_calc_lib": [ "py.typed" @@ -30,9 +30,9 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.22.0", + "jsii~=1.0.0", "publication>=0.0.3", - "scope.jsii-calc-base>=0.22.0, <0.23.0" + "scope.jsii-calc-base>=1.0.0, <2.0.0" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py index 91384b6ace..6fe6a7c546 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py @@ -10,7 +10,7 @@ import scope.jsii_calc_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "0.22.0", __name__, "jsii-calc-lib@0.22.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "1.0.0", __name__, "jsii-calc-lib@1.0.0.jsii.tgz") @jsii.enum(jsii_type="@scope/jsii-calc-lib.EnumFromScopedModule") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii index c47c6011d5..89b9a106cd 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii @@ -34,9 +34,9 @@ } ], "dependencies": { - "@scope/jsii-calc-base": "^0.22.0", - "@scope/jsii-calc-base-of-base": "^0.22.0", - "@scope/jsii-calc-lib": "^0.22.0" + "@scope/jsii-calc-base": "^1.0.0", + "@scope/jsii-calc-base-of-base": "^1.0.0", + "@scope/jsii-calc-lib": "^1.0.0" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -113,7 +113,7 @@ "stability": "experimental" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.22.0", + "jsiiVersion": "1.0.0", "keywords": [ "aws", "jsii", @@ -12122,6 +12122,6 @@ "namespace": "composition.CompositeOperation" } }, - "version": "0.22.0", - "fingerprint": "dmFWtiHlAAJTZImTNAjLUtdrfFpMaJzHMBqCsDDG1Dk=" + "version": "1.0.0", + "fingerprint": "rtlqfLVk+YuqJRqeFCR5A3mesEPpfJgo5m1gRM323+U=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj index db8a01df9f..ef539cac9b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj @@ -5,7 +5,7 @@ https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png Amazon.JSII.Tests.CalculatorPackageId Apache-2.0 - 0.22.0 + 1.0.0 Amazon Web Services Amazon Web Services @@ -24,13 +24,13 @@ netcoreapp3.1 - + - - - - + + + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs index f16cc757f2..48cba02f28 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("jsii-calc", "0.22.0", "jsii-calc-0.22.0.tgz")] +[assembly: JsiiAssembly("jsii-calc", "1.0.0", "jsii-calc-1.0.0.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.22.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-1.0.0.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.22.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-1.0.0.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml index 27b9a28c3b..619358b2bf 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml @@ -48,7 +48,7 @@ software.amazon.jsii.tests calculator - 0.22.0 + 1.0.0 jar UTF-8 @@ -57,22 +57,22 @@ software.amazon.jsii.tests calculator-base - [0.22.0,0.23.0) + [1.0.0,2.0.0) software.amazon.jsii.tests calculator-base-of-base - [0.22.0,0.23.0) + [1.0.0,2.0.0) software.amazon.jsii.tests calculator-lib - [0.22.0.DEVPREVIEW,0.23.0.DEVPREVIEW) + [1.0.0.DEVPREVIEW,2.0.0.DEVPREVIEW) software.amazon.jsii jsii-runtime - [0.22.0,0.23.0) + [1.0.0,2.0.0) org.jetbrains diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java index 63a73cc811..8e2bfe8177 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("jsii-calc", "0.22.0", $Module.class, "jsii-calc@0.22.0.jsii.tgz"); + super("jsii-calc", "1.0.0", $Module.class, "jsii-calc@1.0.0.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@1.0.0.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py index 3be2aa8fa4..e915d3af2b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "jsii-calc", - "version": "0.22.0", + "version": "1.0.0", "description": "A simple calcuator built on JSII.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "jsii_calc._jsii": [ - "jsii-calc@0.22.0.jsii.tgz" + "jsii-calc@1.0.0.jsii.tgz" ], "jsii_calc": [ "py.typed" @@ -30,11 +30,11 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.22.0", + "jsii~=1.0.0", "publication>=0.0.3", - "scope.jsii-calc-base>=0.22.0, <0.23.0", - "scope.jsii-calc-base-of-base>=0.22.0, <0.23.0", - "scope.jsii-calc-lib>=0.22.0, <0.23.0" + "scope.jsii-calc-base>=1.0.0, <2.0.0", + "scope.jsii-calc-base-of-base>=1.0.0, <2.0.0", + "scope.jsii-calc-lib>=1.0.0, <2.0.0" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py index 75ff8c8a7b..f9f0a5df05 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py @@ -41,7 +41,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.22.0", __name__, "jsii-calc@0.22.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "1.0.0", __name__, "jsii-calc@1.0.0.jsii.tgz") class AbstractClassBase(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.AbstractClassBase"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.22.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@1.0.0.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.22.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@1.0.0.jsii.tgz