From 98336837fa6fdb461dc30d1207e47e1220ce218f Mon Sep 17 00:00:00 2001
From: Andriy Svyryd <Andriy.Svyryd@microsoft.com>
Date: Thu, 16 Jun 2022 11:32:38 -0700
Subject: [PATCH] Simplify empty object initializers

---
 src/CSharpScriptSerializer/CSharpScriptSerializer.csproj    | 4 +++-
 src/CSharpScriptSerializer/PropertyCSScriptSerializer.cs    | 4 +++-
 .../CSharpScriptSerializer.Tests.csproj                     | 6 ++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/CSharpScriptSerializer/CSharpScriptSerializer.csproj b/src/CSharpScriptSerializer/CSharpScriptSerializer.csproj
index b3b7ce1..e2c1962 100644
--- a/src/CSharpScriptSerializer/CSharpScriptSerializer.csproj
+++ b/src/CSharpScriptSerializer/CSharpScriptSerializer.csproj
@@ -5,7 +5,7 @@
     <PackageId>CSharpScriptSerializer</PackageId>
     <AssemblyTitle>CSharpScriptSerializer</AssemblyTitle>
     <Title>CSharpScriptSerializer</Title>
-    <VersionPrefix>3.0.3</VersionPrefix>
+    <VersionPrefix>3.0.4</VersionPrefix>
     <TargetFrameworks>netstandard2.1</TargetFrameworks>
     <NetStandardImplicitPackageVersion>2.0.3</NetStandardImplicitPackageVersion>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
@@ -15,6 +15,8 @@
     <PackageTags>Roslyn;CSharp;C#;CSX;Script;Serialization</PackageTags>
     <PackageReleaseNotes>
       <![CDATA[
+Version 3.0.4
+* Simplify empty object initializers
 Version 3.0.3
 * Simplify empty collections
 Version 3.0.2
diff --git a/src/CSharpScriptSerializer/PropertyCSScriptSerializer.cs b/src/CSharpScriptSerializer/PropertyCSScriptSerializer.cs
index bc335b4..ba38b9f 100644
--- a/src/CSharpScriptSerializer/PropertyCSScriptSerializer.cs
+++ b/src/CSharpScriptSerializer/PropertyCSScriptSerializer.cs
@@ -189,7 +189,9 @@ protected override ObjectCreationExpressionSyntax GetObjectCreationExpression(T
                     IdentifierName(p.PropertyName),
                     GetCreationExpression(p.PropertyValueGetter(obj)))).ToList();
 
-            var expression = base.GetObjectCreationExpression(obj, generateEmptyArgumentList: properties.Count == 0)
+            var expression = properties.Count == 0
+                ? base.GetObjectCreationExpression(obj, generateEmptyArgumentList: true)
+                : base.GetObjectCreationExpression(obj)
                     .WithInitializer(AddNewLine(
                         InitializerExpression(
                             SyntaxKind.ObjectInitializerExpression,
diff --git a/test/CSharpScriptSerializer.Tests/CSharpScriptSerializer.Tests.csproj b/test/CSharpScriptSerializer.Tests/CSharpScriptSerializer.Tests.csproj
index 2c73f57..56c3a87 100644
--- a/test/CSharpScriptSerializer.Tests/CSharpScriptSerializer.Tests.csproj
+++ b/test/CSharpScriptSerializer.Tests/CSharpScriptSerializer.Tests.csproj
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <AssemblyName>CSharpScriptSerializer.Tests</AssemblyName>
     <PackageId>CSharpScriptSerializer.Tests</PackageId>
-    <VersionPrefix>2.0.0</VersionPrefix>
     <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -16,7 +15,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
   </ItemGroup>