feat(csharp): Update main dependencies + misc changes (#5279)

feat(csharp): Update dependencies and patch vulnerable transitive dependencies by promoting them
fern-api · Nov 26, 2024 · 56f4491 · 56f4491
1 parent 2d64e0a
commit 56f4491
Show file tree

Hide file tree

Showing 1,307 changed files with 6,829 additions and 47,469 deletions.
diff --git a/fern/pages/changelogs/csharp-sdk/2024-11-25.mdx b/fern/pages/changelogs/csharp-sdk/2024-11-25.mdx
@@ -0,0 +1,11 @@
+## 1.9.11
+**`(feat):`** Add two dependencies who previously were transitive dependencies to ensure the generated SDKs use the patched versions without vulnerabilities.
+- `System.Net.Http` >= `4.3.4`
+- `System.Text.RegularExpressions` >= `4.3.1`
+Update other dependencies to the latest version:
+- `Portable.System.DateTimeOnly` = `8.0.2` (on net462 & netstandard2.0)
+- `PolySharp` = `1.15.0`
+- `OneOf` = `3.0.271`
+- `OneOf.Extended` = `3.0.271`
+
+
diff --git a/generators/csharp/codegen/src/asIs/test/EnumSerializerTests.Template.cs b/generators/csharp/codegen/src/asIs/test/EnumSerializerTests.Template.cs
@@ -38,7 +38,7 @@ public void ShouldSerializeKnownEnumValue2()
     {
         var json = JsonSerializer.SerializeToElement(new DummyObject { EnumProperty = KnownEnumValue2 },
             JsonOptions);
-        TestContext.WriteLine("Serialized JSON: \n" + json);
+        TestContext.Out.WriteLine("Serialized JSON: \n" + json);
         var enumString = json.GetProperty("enum_property").GetString();
         Assert.That(enumString, Is.Not.Null);
         Assert.That(enumString, Is.EqualTo(KnownEnumValue2String));

diff --git a/generators/csharp/codegen/src/asIs/test/StringEnumSerializerTests.Template.cs b/generators/csharp/codegen/src/asIs/test/StringEnumSerializerTests.Template.cs
@@ -53,7 +53,7 @@ public void ShouldSerializeKnownEnumValue2()
     {
         var json = JsonSerializer.SerializeToElement(new DummyObject { EnumProperty = KnownEnumValue2 },
             JsonOptions);
-        TestContext.WriteLine("Serialized JSON: \n" + json);
+        TestContext.Out.WriteLine("Serialized JSON: \n" + json);
         var enumString = json.GetProperty("enum_property").GetString();
         Assert.That(enumString, Is.Not.Null);
         Assert.That(enumString, Is.EqualTo(KnownEnumValue2));
@@ -64,7 +64,7 @@ public void ShouldSerializeUnknownEnum()
     {
         var json = JsonSerializer.SerializeToElement(new DummyObject { EnumProperty = UnknownEnumValue },
             JsonOptions);
-        TestContext.WriteLine("Serialized JSON: \n" + json);
+        TestContext.Out.WriteLine("Serialized JSON: \n" + json);
         var enumString = json.GetProperty("enum_property").GetString();
         Assert.That(enumString, Is.Not.Null);
         Assert.That(enumString, Is.EqualTo(UnknownEnumValue));

diff --git a/generators/csharp/codegen/src/asIs/test/Template.Test.csproj b/generators/csharp/codegen/src/asIs/test/Template.Test.csproj
@@ -10,12 +10,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0"/>
-        <PackageReference Include="NUnit" Version="3.13.3"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.4.2"/>
-        <PackageReference Include="NUnit.Analyzers" Version="3.6.1"/>
-        <PackageReference Include="coverlet.collector" Version="3.2.0"/>
-        <PackageReference Include="WireMock.Net" Version="1.5.60" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+        <PackageReference Include="NUnit" Version="4.2.2"/>
+        <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"/>
+        <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="coverlet.collector" Version="6.0.2">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="WireMock.Net" Version="1.6.8" />
         <PackageReference Include="FluentAssertions.Json" Version="6.1.0" />
     </ItemGroup>
 

diff --git a/generators/csharp/codegen/src/project/CsharpProject.ts b/generators/csharp/codegen/src/project/CsharpProject.ts
@@ -504,23 +504,8 @@ class CsProj {
 
 ${projectGroup.join("\n")}
 
-    <PropertyGroup Condition="'$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
-        <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
-    </PropertyGroup>
-
     <ItemGroup Condition="'$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="Portable.System.DateTimeOnly" Version="8.0.1" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-        <Reference Include="System.Net.Http" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0' Or '$(TargetFramework)' == 'net6.0' Or '$(TargetFramework)' == 'net462' Or '$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="PolySharp" Version="1.14.1">
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-            <PrivateAssets>all</PrivateAssets>
-        </PackageReference>
+        <PackageReference Include="Portable.System.DateTimeOnly" Version="8.0.2" />
     </ItemGroup>
 
     <ItemGroup>
@@ -544,9 +529,17 @@ ${this.getAdditionalItemGroups().join(`\n${FOUR_SPACES}`)}
 
     private getDependencies(): string[] {
         const result: string[] = [];
-        result.push('<PackageReference Include="OneOf" Version="3.0.263" />');
-        result.push('<PackageReference Include="OneOf.Extended" Version="3.0.263" />');
+        result.push('<PackageReference Include="PolySharp" Version="1.15.0">');
+        result.push(
+            `${FOUR_SPACES}<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>`
+        );
+        result.push(`${FOUR_SPACES}<PrivateAssets>all</PrivateAssets>`);
+        result.push("</PackageReference>");
+        result.push('<PackageReference Include="OneOf" Version="3.0.271" />');
+        result.push('<PackageReference Include="OneOf.Extended" Version="3.0.271" />');
         result.push('<PackageReference Include="System.Text.Json" Version="8.0.5" />');
+        result.push('<PackageReference Include="System.Net.Http" Version="[4.3.4,)" />');
+        result.push('<PackageReference Include="System.Text.RegularExpressions" Version="[4.3.1,)" />');
         for (const [name, version] of Object.entries(this.context.getExtraDependencies())) {
             result.push(`<PackageReference Include="${name}" Version="${version}" />`);
         }
@@ -599,7 +592,6 @@ ${this.getAdditionalItemGroups().join(`\n${FOUR_SPACES}`)}
             `${FOUR_SPACES}${FOUR_SPACES}<TargetFrameworks>net462;net8.0;net7.0;net6.0;netstandard2.0</TargetFrameworks>`
         );
         result.push(`${FOUR_SPACES}${FOUR_SPACES}<ImplicitUsings>enable</ImplicitUsings>`);
-        result.push(`${FOUR_SPACES}${FOUR_SPACES}<NuGetAudit>false</NuGetAudit>`);
         result.push(`${FOUR_SPACES}${FOUR_SPACES}<LangVersion>12</LangVersion>`);
         result.push(`${FOUR_SPACES}${FOUR_SPACES}<Nullable>enable</Nullable>`);
 
@@ -638,6 +630,7 @@ ${this.getAdditionalItemGroups().join(`\n${FOUR_SPACES}`)}
         if (this.githubUrl != null) {
             result.push(`<PackageProjectUrl>${this.githubUrl}</PackageProjectUrl>`);
         }
+        result.push("<PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>");
         return result;
     }
 

diff --git a/generators/csharp/playground/.gitignore b/generators/csharp/playground/.gitignore
diff --git a/generators/csharp/playground/Playground.Test/GlobalUsings.cs b/generators/csharp/playground/Playground.Test/GlobalUsings.cs
diff --git a/generators/csharp/playground/Playground.Test/Playground.Test.csproj b/generators/csharp/playground/Playground.Test/Playground.Test.csproj
diff --git a/generators/csharp/playground/Playground.Test/UnitTest1.cs b/generators/csharp/playground/Playground.Test/UnitTest1.cs
diff --git a/generators/csharp/playground/Playground/Playground.csproj b/generators/csharp/playground/Playground/Playground.csproj
diff --git a/generators/csharp/playground/Playground/Program.cs b/generators/csharp/playground/Playground/Program.cs
diff --git a/generators/csharp/sdk/src/test-generation/mock-server/BaseMockServerTestGenerator.ts b/generators/csharp/sdk/src/test-generation/mock-server/BaseMockServerTestGenerator.ts
@@ -149,6 +149,7 @@ export class BaseMockServerTestGenerator extends FileGenerator<CSharpFile, SdkCu
                 access: csharp.Access.Public,
                 body: csharp.codeblock((writer) => {
                     writer.writeLine("Server.Stop();");
+                    writer.writeLine("Server.Dispose();");
                 }),
                 isAsync: false,
                 parameters: [],

diff --git a/generators/csharp/sdk/versions.yml b/generators/csharp/sdk/versions.yml
@@ -6,6 +6,20 @@
 #         The C# SDK now uses forward-compatible enums which are not compatible with the previously generated enums.
 #         Set `enable-forward-compatible-enums` to `false` in the configuration to generate the old enums.
 #   irVersion: 53
+- version: 1.9.11
+  createdAt: "2024-11-25"
+  changelogEntry:
+    - type: feat
+      summary: |
+        Add two dependencies who previously were transitive dependencies to ensure the generated SDKs use the patched versions without vulnerabilities.
+        - `System.Net.Http` >= `4.3.4`
+        - `System.Text.RegularExpressions` >= `4.3.1`
+        Update other dependencies to the latest version:
+        - `Portable.System.DateTimeOnly` = `8.0.2` (on net462 & netstandard2.0)
+        - `PolySharp` = `1.15.0`
+        - `OneOf` = `3.0.271`
+        - `OneOf.Extended` = `3.0.271`
+  irVersion: 53
 - version: 1.9.10
   createdAt: "2024-11-20"
   changelogEntry:

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/seed/csharp-model/.gitignore b/seed/csharp-model/.gitignore
diff --git a/seed/csharp-model/alias-extends/src/SeedAliasExtends.Test/Core/EnumSerializerTests.cs b/seed/csharp-model/alias-extends/src/SeedAliasExtends.Test/Core/EnumSerializerTests.cs
diff --git a/seed/csharp-model/alias-extends/src/SeedAliasExtends.Test/SeedAliasExtends.Test.csproj b/seed/csharp-model/alias-extends/src/SeedAliasExtends.Test/SeedAliasExtends.Test.csproj
diff --git a/seed/csharp-model/alias-extends/src/SeedAliasExtends.sln b/seed/csharp-model/alias-extends/src/SeedAliasExtends.sln
diff --git a/seed/csharp-model/alias-extends/src/SeedAliasExtends/SeedAliasExtends.csproj b/seed/csharp-model/alias-extends/src/SeedAliasExtends/SeedAliasExtends.csproj
diff --git a/seed/csharp-model/alias/src/SeedAlias.Test/Core/EnumSerializerTests.cs b/seed/csharp-model/alias/src/SeedAlias.Test/Core/EnumSerializerTests.cs
diff --git a/seed/csharp-model/alias/src/SeedAlias.Test/SeedAlias.Test.csproj b/seed/csharp-model/alias/src/SeedAlias.Test/SeedAlias.Test.csproj