From 9c031c32e7c8e061babba23ddf73458c2620f556 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=F0=9F=A7=91=F0=9F=8F=BB=E2=80=8D=F0=9F=92=BB=20Romain=20M?=
 =?UTF-8?q?arcadier?= <rmuller@amazon.com>
Date: Thu, 16 Mar 2023 15:12:32 +0100
Subject: [PATCH] fix(pacmak): runtime dependency should match pacmak release

The code generated by `jsii-pacmak` has a dependency on jsii runtime
versions that are expected to match that of `jsii-pacmak` itself.
This fixes the .NET and Python generators using the assembly's
`jsiiVersion` property, which is a metadata field supposed to only
indicate what version of the compiler was used to build the assembly.
---
 packages/jsii-pacmak/generate.sh                 |  4 ++--
 .../lib/targets/dotnet/filegenerator.ts          |  6 ++----
 packages/jsii-pacmak/lib/targets/python.ts       |  9 ++-------
 .../prerelease-identifiers.test.js.snap          | 16 ++++++++--------
 4 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/packages/jsii-pacmak/generate.sh b/packages/jsii-pacmak/generate.sh
index 35af21b858..1584183c43 100644
--- a/packages/jsii-pacmak/generate.sh
+++ b/packages/jsii-pacmak/generate.sh
@@ -14,10 +14,10 @@ VERSION=$(node -p "require('./package.json').version.replace(/\\+[0-9a-f]+\$/, '
 cat > lib/version.ts <<HERE
 // Generated at $(date -u +"%Y-%m-%dT%H:%M:%SZ") by generate.sh
 
-/** The short version number for this JSII compiler (e.g: \`X.Y.Z\`) */
+/** The short version number for this jsii-pacmak release (e.g: \`X.Y.Z\`) */
 // eslint-disable-next-line @typescript-eslint/no-inferrable-types
 export const VERSION: string = '${VERSION}';
 
-/** The qualified version number for this JSII compiler (e.g: \`X.Y.Z (build #######)\`) */
+/** The qualified version number for this jsii-pacmak release (e.g: \`X.Y.Z (build #######)\`) */
 export const VERSION_DESC = '${VERSION} (build ${commit:0:7}${suffix:-})';
 HERE
diff --git a/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts b/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts
index c51fcb5b70..66da0fa773 100644
--- a/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts
+++ b/packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts
@@ -5,6 +5,7 @@ import * as xmlbuilder from 'xmlbuilder';
 
 import { TargetName } from '..';
 import * as logging from '../../logging';
+import { VERSION } from '../../version';
 import { TARGET_FRAMEWORK } from '../dotnet';
 import { toNuGetVersionRange, toReleaseVersion } from '../version-utils';
 import { DotNetNameUtils } from './nameutils';
@@ -119,13 +120,10 @@ 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 itemGroup2 = rootNode.ele('ItemGroup');
     const packageReference = itemGroup2.ele('PackageReference');
     packageReference.att('Include', 'Amazon.JSII.Runtime');
-    packageReference.att('Version', toNuGetVersionRange(`^${jsiiVersion}`));
+    packageReference.att('Version', toNuGetVersionRange(`^${VERSION}`));
 
     dependencies.forEach((value: DotNetDependency) => {
       if (value.partOfCompilation) {
diff --git a/packages/jsii-pacmak/lib/targets/python.ts b/packages/jsii-pacmak/lib/targets/python.ts
index 0a7a010423..e5915a99a1 100644
--- a/packages/jsii-pacmak/lib/targets/python.ts
+++ b/packages/jsii-pacmak/lib/targets/python.ts
@@ -18,6 +18,7 @@ import { warn } from '../logging';
 import { md2rst } from '../markdown';
 import { Target, TargetOptions } from '../target';
 import { shell } from '../util';
+import { VERSION } from '../version';
 import { renderSummary, PropertyDefinition } from './_utils';
 import {
   NamingContext,
@@ -2080,12 +2081,6 @@ class Package {
     );
     code.closeFile('README.md');
 
-    // Strip " (build abcdef)" from the jsii version
-    const jsiiVersionSimple = toReleaseVersion(
-      this.metadata.jsiiVersion.replace(/ .*$/, ''),
-      TargetName.PYTHON,
-    );
-
     const setupKwargs = {
       name: this.name,
       version: this.version,
@@ -2109,7 +2104,7 @@ class Package {
       package_data: packageData,
       python_requires: '~=3.7',
       install_requires: [
-        `jsii${toPythonVersionRange(`^${jsiiVersionSimple}`)}`,
+        `jsii${toPythonVersionRange(`^${VERSION}`)}`,
         'publication>=0.0.3',
         'typeguard~=2.13.3',
       ]
diff --git a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
index fb35301af4..7323da788f 100644
--- a/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
+++ b/packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap
@@ -84,7 +84,7 @@ exports[`foo@1.2.3 depends on bar@^2.0.0-rc.42: <outDir>/dotnet/Com.Acme.Foo/Com
     <EmbeddedResource Include="foo-1.2.3.tgz" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.JSII.Runtime" Version="[1337.42.1337,1338.0.0)" />
+    <PackageReference Include="Amazon.JSII.Runtime" Version="[0.0.0,)" />
     <PackageReference Include="Com.Acme.Bar" Version="[2.0.0-rc.42,3.0.0)" />
   </ItemGroup>
   <PropertyGroup>
@@ -453,7 +453,7 @@ kwargs = json.loads(
     "python_requires": "~=3.7",
     "install_requires": [
         "bar>=2.0.0.rc42, <3.0.0",
-        "jsii>=1337.42.1337, <1338.0.0",
+        "jsii<0.0.1",
         "publication>=0.0.3",
         "typeguard~=2.13.3"
     ],
@@ -595,7 +595,7 @@ exports[`foo@1.2.3 depends on bar@^4.5.6-pre.1337: <outDir>/dotnet/Com.Acme.Foo/
     <EmbeddedResource Include="foo-1.2.3.tgz" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.JSII.Runtime" Version="[1337.42.1337,1338.0.0)" />
+    <PackageReference Include="Amazon.JSII.Runtime" Version="[0.0.0,)" />
     <PackageReference Include="Com.Acme.Bar" Version="[4.5.6-pre.1337,5.0.0)" />
   </ItemGroup>
   <PropertyGroup>
@@ -964,7 +964,7 @@ kwargs = json.loads(
     "python_requires": "~=3.7",
     "install_requires": [
         "bar>=4.5.6.dev1337, <5.0.0",
-        "jsii>=1337.42.1337, <1338.0.0",
+        "jsii<0.0.1",
         "publication>=0.0.3",
         "typeguard~=2.13.3"
     ],
@@ -1106,7 +1106,7 @@ exports[`foo@2.0.0-rc.42: <outDir>/dotnet/Com.Acme.Foo/Com.Acme.Foo.csproj 1`] =
     <EmbeddedResource Include="foo-2.0.0-rc.42.tgz" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.JSII.Runtime" Version="[1337.42.1337,1338.0.0)" />
+    <PackageReference Include="Amazon.JSII.Runtime" Version="[0.0.0,)" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Silence [Obsolete] warnings -->
@@ -1454,7 +1454,7 @@ kwargs = json.loads(
     },
     "python_requires": "~=3.7",
     "install_requires": [
-        "jsii>=1337.42.1337, <1338.0.0",
+        "jsii<0.0.1",
         "publication>=0.0.3",
         "typeguard~=2.13.3"
     ],
@@ -1594,7 +1594,7 @@ exports[`foo@4.5.6-pre.1337: <outDir>/dotnet/Com.Acme.Foo/Com.Acme.Foo.csproj 1`
     <EmbeddedResource Include="foo-4.5.6-pre.1337.tgz" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Amazon.JSII.Runtime" Version="[1337.42.1337,1338.0.0)" />
+    <PackageReference Include="Amazon.JSII.Runtime" Version="[0.0.0,)" />
   </ItemGroup>
   <PropertyGroup>
     <!-- Silence [Obsolete] warnings -->
@@ -1942,7 +1942,7 @@ kwargs = json.loads(
     },
     "python_requires": "~=3.7",
     "install_requires": [
-        "jsii>=1337.42.1337, <1338.0.0",
+        "jsii<0.0.1",
         "publication>=0.0.3",
         "typeguard~=2.13.3"
     ],