fix(jsii-pacmak): invalid dotnet version suffixes (#1568)

Removes version suffix from version ranges in `.csproj` files generated by jsii-pacmak. Dotnet doesn't allow version suffixes that start with a number. Version ranges by default don't include prereleases so the resolved version is as intended without the suffix in this case. (cherry picked from commit c6f9a14)
aws · Apr 18, 2020 · 9ef8f17 · 9ef8f17
1 parent 7b69720
commit 9ef8f17
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/packages/jsii-pacmak/lib/targets/version-utils.ts b/packages/jsii-pacmak/lib/targets/version-utils.ts
@@ -20,7 +20,7 @@ export function toMavenVersionRange(semverRange: string, suffix?: string): strin
  * @see https://docs.microsoft.com/en-us/nuget/concepts/package-versioning#version-ranges-and-wildcards
  */
 export function toNuGetVersionRange(semverRange: string): string {
-  return toBracketNotation(semverRange);
+  return toBracketNotation(semverRange, undefined, { semver: false });
 }
 
 /**

diff --git a/...culatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj b/...culatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj
@@ -26,7 +26,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Amazon.JSII.Runtime" Version="[0.0.0,0.0.1)" />
-    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="[0.0.0,0.0.1-0)" />
+    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="[0.0.0,0.0.1)" />
   </ItemGroup>
   <PropertyGroup>
     <NoWarn>0612,0618</NoWarn>

diff --git a/...alculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/...alculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj
@@ -26,8 +26,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Amazon.JSII.Runtime" Version="[0.0.0,0.0.1)" />
-    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BasePackageId" Version="[0.0.0,0.0.1-0)" />
-    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="[0.0.0,0.0.1-0)" />
+    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BasePackageId" Version="[0.0.0,0.0.1)" />
+    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="[0.0.0,0.0.1)" />
   </ItemGroup>
   <PropertyGroup>
     <NoWarn>0612,0618</NoWarn>

diff --git a/...dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj b/...dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj
@@ -28,9 +28,9 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Amazon.JSII.Runtime" Version="[0.0.0,0.0.1)" />
-    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BasePackageId" Version="[0.0.0,0.0.1-0)" />
-    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="[0.0.0,0.0.1-0)" />
-    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.LibPackageId" Version="[0.0.0-devpreview,0.0.1-0)" />
+    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BasePackageId" Version="[0.0.0,0.0.1)" />
+    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId" Version="[0.0.0,0.0.1)" />
+    <PackageReference Include="Amazon.JSII.Tests.CalculatorPackageId.LibPackageId" Version="[0.0.0-devpreview,0.0.1)" />
   </ItemGroup>
   <PropertyGroup>
     <NoWarn>0612,0618</NoWarn>

diff --git a/packages/jsii-pacmak/test/targets/version-utils.test.ts b/packages/jsii-pacmak/test/targets/version-utils.test.ts
@@ -9,12 +9,12 @@ const examples: Record<string, { maven: string, nuget: string, python: string }>
   },
   '~1.2.3': {
     maven: '[1.2.3,1.3.0)',
-    nuget: '[1.2.3,1.3.0-0)',
+    nuget: '[1.2.3,1.3.0)',
     python: '>=1.2.3, <1.3.0',
   },
   '^1.2.3': {
     maven: '[1.2.3,2.0.0)',
-    nuget: '[1.2.3,2.0.0-0)',
+    nuget: '[1.2.3,2.0.0)',
     python: '>=1.2.3, <2.0.0',
   },
 
@@ -26,12 +26,12 @@ const examples: Record<string, { maven: string, nuget: string, python: string }>
   },
   '~0.1.2': {
     maven: '[0.1.2,0.2.0)',
-    nuget: '[0.1.2,0.2.0-0)',
+    nuget: '[0.1.2,0.2.0)',
     python: '>=0.1.2, <0.2.0',
   },
   '^0.1.2': {
     maven: '[0.1.2,0.2.0)',
-    nuget: '[0.1.2,0.2.0-0)',
+    nuget: '[0.1.2,0.2.0)',
     python: '>=0.1.2, <0.2.0',
   },