Skip to content

Commit 9833683

Browse files
committed
Simplify empty object initializers
1 parent f9d834b commit 9833683

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

src/CSharpScriptSerializer/CSharpScriptSerializer.csproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<PackageId>CSharpScriptSerializer</PackageId>
66
<AssemblyTitle>CSharpScriptSerializer</AssemblyTitle>
77
<Title>CSharpScriptSerializer</Title>
8-
<VersionPrefix>3.0.3</VersionPrefix>
8+
<VersionPrefix>3.0.4</VersionPrefix>
99
<TargetFrameworks>netstandard2.1</TargetFrameworks>
1010
<NetStandardImplicitPackageVersion>2.0.3</NetStandardImplicitPackageVersion>
1111
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
@@ -15,6 +15,8 @@
1515
<PackageTags>Roslyn;CSharp;C#;CSX;Script;Serialization</PackageTags>
1616
<PackageReleaseNotes>
1717
<![CDATA[
18+
Version 3.0.4
19+
* Simplify empty object initializers
1820
Version 3.0.3
1921
* Simplify empty collections
2022
Version 3.0.2

src/CSharpScriptSerializer/PropertyCSScriptSerializer.cs

+3-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,9 @@ protected override ObjectCreationExpressionSyntax GetObjectCreationExpression(T
189189
IdentifierName(p.PropertyName),
190190
GetCreationExpression(p.PropertyValueGetter(obj)))).ToList();
191191

192-
var expression = base.GetObjectCreationExpression(obj, generateEmptyArgumentList: properties.Count == 0)
192+
var expression = properties.Count == 0
193+
? base.GetObjectCreationExpression(obj, generateEmptyArgumentList: true)
194+
: base.GetObjectCreationExpression(obj)
193195
.WithInitializer(AddNewLine(
194196
InitializerExpression(
195197
SyntaxKind.ObjectInitializerExpression,

test/CSharpScriptSerializer.Tests/CSharpScriptSerializer.Tests.csproj

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<PropertyGroup>
44
<AssemblyName>CSharpScriptSerializer.Tests</AssemblyName>
55
<PackageId>CSharpScriptSerializer.Tests</PackageId>
6-
<VersionPrefix>2.0.0</VersionPrefix>
76
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
87
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
98
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -16,7 +15,10 @@
1615

1716
<ItemGroup>
1817
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
19-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" />
18+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
2022
<PackageReference Include="xunit" Version="2.4.1" />
2123
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
2224
</ItemGroup>

0 commit comments

Comments
 (0)