fix(dotnet/analyzer): remove dependency on Runtime (#927)

* fix(dotnet/analyzer): remove dependency on Runtime Remove the dependency from the Amazon.JSII.Analyzers package to the Amazon.JSII.Runtime package - as that dependency was not used and turned out to be a source of problems. Also - pins the version of the runtimes to the exact version (this could later be extended to a range). * relax runtime version constraint * fix test expectations
aws · Nov 5, 2019 · 815b449 · 815b449
1 parent 32be0d9
commit 815b449
Show file tree

Hide file tree

Showing 34 changed files with 709 additions and 14 deletions.
diff --git a/packages/jsii-dotnet-analyzers/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj b/packages/jsii-dotnet-analyzers/src/Amazon.JSII.Analyzers/Amazon.JSII.Analyzers.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
    <Import Project="../NuGet.Metadata.props" />
 
     <PropertyGroup>
@@ -10,9 +10,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Amazon.JSII.Runtime" Version="$(JsiiVersion)" />
-      <PackageReference Include="Microsoft.CodeAnalysis" Version="3.2.0" />
-      <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.2.0" />
+      <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.2.0" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/packages/jsii-dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.sln b/packages/jsii-dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests.sln
@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Amazon.JSII.Runtime.IntegrationTests", "Amazon.JSII.Runtime.IntegrationTests\Amazon.JSII.Runtime.IntegrationTests.csproj", "{CE3CAFBD-25F8-422D-925A-8F9CCEA1F548}"

diff --git a/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts
@@ -2,8 +2,9 @@ import { CodeMaker } from 'codemaker';
 import { Assembly } from 'jsii-spec';
 import path = require('path');
 import xmlbuilder = require('xmlbuilder');
-import logging = require('../../logging');
 import { DotNetNameUtils } from './nameutils';
+import logging = require('../../logging');
+import { nextMajorVersion } from '../../util';
 
 // Represents a dependency in the dependency tree.
 export class DotNetDependency {
@@ -95,13 +96,14 @@ export class FileGenerator {
     const embeddedResource = itemGroup1.ele('EmbeddedResource');
     embeddedResource.att('Include', this.tarballFileName);
 
+    // Strip " (build abcdef)" from the jsii version
+    const jsiiVersion = assembly.jsiiVersion.replace(/ .*$/, '');
+    const jsiiVersionNextMajor = nextMajorVersion(jsiiVersion);
+
     const itemGroup2 = rootNode.ele('ItemGroup');
     const packageReference = itemGroup2.ele('PackageReference');
     packageReference.att('Include', 'Amazon.JSII.Runtime');
-
-    // Strip " (build abcdef)" from the jsii version
-    const jsiiVersionSimple = assembly.jsiiVersion.replace(/ .*$/, '');
-    packageReference.att('Version', jsiiVersionSimple);
+    packageReference.att('Version', `[${jsiiVersion},${jsiiVersionNextMajor})`);
 
     dependencies.forEach((value: DotNetDependency) => {
       const dependencyReference = itemGroup2.ele('PackageReference');

diff --git a/packages/jsii-pacmak/lib/util.ts b/packages/jsii-pacmak/lib/util.ts
@@ -3,6 +3,7 @@ import fs = require('fs-extra');
 import spec = require('jsii-spec');
 import os = require('os');
 import path = require('path');
+import semver = require('semver');
 import logging = require('./logging');
 
 export interface ShellOptions extends SpawnOptions {
@@ -120,4 +121,26 @@ export class Scratch<A> {
       await fs.remove(this.directory);
     }
   }
-}
+}
+
+/**
+ * Determines the next major version from a given current version. This honors
+ * the specificities of pre-1.0.0 releases, too.
+ *
+ * @param version the current version from which to bump.
+ *
+ * @returns the next Major Version string.
+ */
+export function nextMajorVersion(version: string): string {
+  const v = semver.parse(version);
+  if (!v) {
+    throw new Error(`Invalid semantic version identifier: ${version}`);
+  }
+  if (v.major !== 0) {
+    return v.inc('major').version;
+  }
+  if (v.minor !== 0) {
+    return v.inc('minor').version;
+  }
+  return v.inc('patch').version;
+}
diff --git a/packages/jsii-pacmak/test/diff-test.sh b/packages/jsii-pacmak/test/diff-test.sh
@@ -72,6 +72,7 @@ function assert-generator() {
     done
 }
 
+assert-generator jsii-calc-base-of-base
 assert-generator jsii-calc-base
 assert-generator jsii-calc-lib
 assert-generator jsii-calc

diff --git a/...-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii b/...-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii
@@ -0,0 +1,115 @@
+{
+  "author": {
+    "name": "Amazon Web Services",
+    "organization": true,
+    "roles": [
+      "author"
+    ],
+    "url": "https://aws.amazon.com"
+  },
+  "description": "An example transitive dependency for jsii-calc.",
+  "homepage": "https://github.com/aws/jsii",
+  "jsiiVersion": "0.20.0",
+  "license": "Apache-2.0",
+  "name": "@scope/jsii-calc-base-of-base",
+  "repository": {
+    "directory": "packages/jsii-calc-base-of-base",
+    "type": "git",
+    "url": "https://github.com/aws/jsii.git"
+  },
+  "schema": "jsii/0.10.0",
+  "targets": {
+    "dotnet": {
+      "namespace": "Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace",
+      "packageId": "Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId"
+    },
+    "java": {
+      "maven": {
+        "artifactId": "calculator-base-of-base",
+        "groupId": "software.amazon.jsii.tests"
+      },
+      "package": "software.amazon.jsii.tests.calculator.baseofbase"
+    },
+    "js": {
+      "npm": "@scope/jsii-calc-base-of-base"
+    },
+    "python": {
+      "distName": "scope.jsii-calc-base-of-base",
+      "module": "scope.jsii_calc_base_of_base"
+    }
+  },
+  "types": {
+    "@scope/jsii-calc-base-of-base.IVeryBaseInterface": {
+      "assembly": "@scope/jsii-calc-base-of-base",
+      "fqn": "@scope/jsii-calc-base-of-base.IVeryBaseInterface",
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/index.ts",
+        "line": 1
+      },
+      "methods": [
+        {
+          "abstract": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 2
+          },
+          "name": "foo"
+        }
+      ],
+      "name": "IVeryBaseInterface"
+    },
+    "@scope/jsii-calc-base-of-base.Very": {
+      "assembly": "@scope/jsii-calc-base-of-base",
+      "fqn": "@scope/jsii-calc-base-of-base.Very",
+      "initializer": {},
+      "kind": "class",
+      "locationInModule": {
+        "filename": "lib/index.ts",
+        "line": 9
+      },
+      "methods": [
+        {
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 10
+          },
+          "name": "hey",
+          "returns": {
+            "type": {
+              "primitive": "number"
+            }
+          }
+        }
+      ],
+      "name": "Very"
+    },
+    "@scope/jsii-calc-base-of-base.VeryBaseProps": {
+      "assembly": "@scope/jsii-calc-base-of-base",
+      "datatype": true,
+      "fqn": "@scope/jsii-calc-base-of-base.VeryBaseProps",
+      "kind": "interface",
+      "locationInModule": {
+        "filename": "lib/index.ts",
+        "line": 5
+      },
+      "name": "VeryBaseProps",
+      "properties": [
+        {
+          "abstract": true,
+          "immutable": true,
+          "locationInModule": {
+            "filename": "lib/index.ts",
+            "line": 6
+          },
+          "name": "foo",
+          "type": {
+            "fqn": "@scope/jsii-calc-base-of-base.Very"
+          }
+        }
+      ]
+    }
+  },
+  "version": "0.20.0",
+  "fingerprint": "4yJsyi5ch/E1bHSJMcEEBX/WvJK/zroW/a+Ta8Tc6lk="
+}
diff --git a/...geId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj b/...geId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj
@@ -0,0 +1,30 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <!-- Package Identification -->
+    <Description>An example transitive dependency for jsii-calc.</Description>
+    <PackageId>Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId</PackageId>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+    <PackageVersion>0.20.0</PackageVersion>
+    <!-- Additional Metadata -->
+    <Authors>Amazon Web Services</Authors>
+    <Company>Amazon Web Services</Company>
+    <Language>en-US</Language>
+    <ProjectUrl>https://github.com/aws/jsii</ProjectUrl>
+    <RepositoryUrl>https://github.com/aws/jsii.git</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+    <!-- Build Configuration -->
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <IncludeSymbols>true</IncludeSymbols>
+    <IncludeSource>true</IncludeSource>
+    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
+  </PropertyGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="scope-jsii-calc-base-of-base-0.20.0.tgz" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Amazon.JSII.Runtime" Version="[0.20.0,0.21.0)" />
+  </ItemGroup>
+</Project>
+
diff --git a/...PackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterface.cs b/...PackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterface.cs
@@ -0,0 +1,11 @@
+using Amazon.JSII.Runtime.Deputy;
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace
+{
+    [JsiiInterface(nativeType: typeof(IVeryBaseInterface), fullyQualifiedName: "@scope/jsii-calc-base-of-base.IVeryBaseInterface")]
+    public interface IVeryBaseInterface
+    {
+        [JsiiMethod(name: "foo")]
+        void Foo();
+    }
+}
diff --git a/...geId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterfaceProxy.cs b/...geId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseInterfaceProxy.cs
@@ -0,0 +1,18 @@
+using Amazon.JSII.Runtime.Deputy;
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace
+{
+    [JsiiTypeProxy(nativeType: typeof(IVeryBaseInterface), fullyQualifiedName: "@scope/jsii-calc-base-of-base.IVeryBaseInterface")]
+    internal sealed class IVeryBaseInterfaceProxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.IVeryBaseInterface
+    {
+        private IVeryBaseInterfaceProxy(ByRefValue reference): base(reference)
+        {
+        }
+
+        [JsiiMethod(name: "foo")]
+        public void Foo()
+        {
+            InvokeInstanceVoidMethod(new System.Type[]{}, new object[]{});
+        }
+    }
+}
diff --git a/...BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseProps.cs b/...BasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/IVeryBaseProps.cs
@@ -0,0 +1,14 @@
+using Amazon.JSII.Runtime.Deputy;
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace
+{
+    [JsiiInterface(nativeType: typeof(IVeryBaseProps), fullyQualifiedName: "@scope/jsii-calc-base-of-base.VeryBaseProps")]
+    public interface IVeryBaseProps
+    {
+        [JsiiProperty(name: "foo", typeJson: "{\"fqn\":\"@scope/jsii-calc-base-of-base.Very\"}")]
+        Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very Foo
+        {
+            get;
+        }
+    }
+}
diff --git a/...SII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Internal/DependencyResolution/Anchor.cs b/...SII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Internal/DependencyResolution/Anchor.cs
@@ -0,0 +1,9 @@
+namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Internal.DependencyResolution
+{
+    public class Anchor
+    {
+        public Anchor()
+        {
+        }
+    }
+}
diff --git a/...eId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Very.cs b/...eId.BaseOfBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/Very.cs
@@ -0,0 +1,26 @@
+using Amazon.JSII.Runtime.Deputy;
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace
+{
+    [JsiiClass(nativeType: typeof(Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very), fullyQualifiedName: "@scope/jsii-calc-base-of-base.Very")]
+    public class Very : DeputyBase
+    {
+        public Very(): base(new DeputyProps(new object[]{}))
+        {
+        }
+
+        protected Very(ByRefValue reference): base(reference)
+        {
+        }
+
+        protected Very(DeputyProps props): base(props)
+        {
+        }
+
+        [JsiiMethod(name: "hey", returnsJson: "{\"type\":{\"primitive\":\"number\"}}")]
+        public virtual double Hey()
+        {
+            return InvokeInstanceMethod<double>(new System.Type[]{}, new object[]{});
+        }
+    }
+}
diff --git a/...fBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBaseProps.cs b/...fBasePackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBaseProps.cs
@@ -0,0 +1,15 @@
+using Amazon.JSII.Runtime.Deputy;
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace
+{
+    [JsiiByValue(fqn: "@scope/jsii-calc-base-of-base.VeryBaseProps")]
+    public class VeryBaseProps : Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.IVeryBaseProps
+    {
+        [JsiiProperty(name: "foo", typeJson: "{\"fqn\":\"@scope/jsii-calc-base-of-base.Very\"}", isOverride: true)]
+        public Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very Foo
+        {
+            get;
+            set;
+        }
+    }
+}
diff --git a/...PackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBasePropsProxy.cs b/...PackageId/Amazon/JSII/Tests/CalculatorNamespace/BaseOfBaseNamespace/VeryBasePropsProxy.cs
@@ -0,0 +1,18 @@
+using Amazon.JSII.Runtime.Deputy;
+
+namespace Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace
+{
+    [JsiiTypeProxy(nativeType: typeof(IVeryBaseProps), fullyQualifiedName: "@scope/jsii-calc-base-of-base.VeryBaseProps")]
+    internal sealed class VeryBasePropsProxy : DeputyBase, Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.IVeryBaseProps
+    {
+        private VeryBasePropsProxy(ByRefValue reference): base(reference)
+        {
+        }
+
+        [JsiiProperty(name: "foo", typeJson: "{\"fqn\":\"@scope/jsii-calc-base-of-base.Very\"}")]
+        public Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very Foo
+        {
+            get => GetInstanceProperty<Amazon.JSII.Tests.CalculatorNamespace.BaseOfBaseNamespace.Very>();
+        }
+    }
+}
diff --git a/...-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs b/...-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using Amazon.JSII.Runtime.Deputy;
+
+[assembly: JsiiAssembly("@scope/jsii-calc-base-of-base", "0.20.0", "scope-jsii-calc-base-of-base-0.20.0.tgz")]
diff --git a/...SII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.20.0.tgz b/...SII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.20.0.tgz
@@ -0,0 +1,2 @@
+Placeholder for the expected module tarball
+The diff-test.sh harness will replace it with the real expected tarball