From 45609f74e44d3d64c455f751ba618078acdfe41d Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Wed, 9 Oct 2024 19:15:15 +0200
Subject: [PATCH] Upgrade System.Text.RegularExpressions to 4.3.1 to solve CVE
 (#27)

---
 README.md                                             |  2 +-
 .../FieldOptions/FieldOptionsFactory.cs               |  4 ++--
 src/RandomDataGenerator/RandomDataGenerator.csproj    | 11 ++++++++---
 .../RandomDataGenerator.Tests/CityRandomizerTests.cs  |  2 +-
 .../RandomDataGenerator.Tests.csproj                  |  5 ++---
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index ce9c947..55d275e 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ This is a simple generator to create random data.
 
 ## NuGet
 
-[![NuGet Badge](https://buildstats.info/nuget/RandomDataGenerator.Net)](https://www.nuget.org/packages/RandomDataGenerator.Net)
+[![NuGet Badge](https://img.shields.io/nuget/v/RandomDataGenerator.Net)](https://www.nuget.org/packages/RandomDataGenerator.Net)
 
 ## Supported Random Data 
 
diff --git a/src/RandomDataGenerator/FieldOptions/FieldOptionsFactory.cs b/src/RandomDataGenerator/FieldOptions/FieldOptionsFactory.cs
index f38d710..09d1016 100644
--- a/src/RandomDataGenerator/FieldOptions/FieldOptionsFactory.cs
+++ b/src/RandomDataGenerator/FieldOptions/FieldOptionsFactory.cs
@@ -19,8 +19,8 @@ public static FieldOptionsAbstract GetFieldOptions(SubFieldType subFieldType)
 
     public static FieldOptionsAbstract GetFieldOptions(string name, Dictionary<string, object> properties)
     {
-        Guard.NotNullOrEmpty(name, nameof(name));
-        Guard.NotNull(properties, nameof(properties));
+        Guard.NotNullOrEmpty(name);
+        Guard.NotNull(properties);
 
         // Generate classname
         var className = !name.StartsWith("FieldOptions") ? $"FieldOptions{name}" : name;
diff --git a/src/RandomDataGenerator/RandomDataGenerator.csproj b/src/RandomDataGenerator/RandomDataGenerator.csproj
index f59708e..f6621e7 100644
--- a/src/RandomDataGenerator/RandomDataGenerator.csproj
+++ b/src/RandomDataGenerator/RandomDataGenerator.csproj
@@ -47,12 +47,17 @@
     <EmbeddedResource Include="Data\Text\MaleNames.txt" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' != 'net35' ">
+    <!-- CVE-2019-0820 -->
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0">
+    <PackageReference Include="JetBrains.Annotations" Version="2024.2.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Fare" Version="2.2.0" />
-    <PackageReference Include="Stef.Validation" Version="0.1.0" />
+    <PackageReference Include="Fare" Version="2.2.1" />
+    <PackageReference Include="Stef.Validation" Version="0.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
diff --git a/tests/RandomDataGenerator.Tests/CityRandomizerTests.cs b/tests/RandomDataGenerator.Tests/CityRandomizerTests.cs
index a47a50c..92af9a4 100644
--- a/tests/RandomDataGenerator.Tests/CityRandomizerTests.cs
+++ b/tests/RandomDataGenerator.Tests/CityRandomizerTests.cs
@@ -30,7 +30,7 @@ public void CityDistributionMustBeUniform(int degree)
         {
             Parallel.For(0, 1000, options, j =>
             {
-                var location = locationGenerator.Generate();
+                var location = locationGenerator.Generate() ?? string.Empty;
                 concurrentDictionary.AddOrUpdate(location, _ => 1, (k, v) => v + 1);
             });
         });
diff --git a/tests/RandomDataGenerator.Tests/RandomDataGenerator.Tests.csproj b/tests/RandomDataGenerator.Tests/RandomDataGenerator.Tests.csproj
index c4d4446..d74fba2 100644
--- a/tests/RandomDataGenerator.Tests/RandomDataGenerator.Tests.csproj
+++ b/tests/RandomDataGenerator.Tests/RandomDataGenerator.Tests.csproj
@@ -1,15 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>