Skip to content

Commit 2dc8822

Browse files
SimonCroppStefanOssendorfrockfordlhotka
authored
update polyfill and use char based string join (MarimerLLC#4845)
Co-authored-by: Stefan Ossendorf <StefanOssendorf@users.noreply.github.com> Co-authored-by: Rockford Lhotka <rocky@lhotka.net>
1 parent 4117b3a commit 2dc8822

17 files changed

Lines changed: 26 additions & 102 deletions

File tree

‎Source/Csla.Analyzers/Csla.Analyzers/Csla.Analyzers.csproj‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,14 @@
1515
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" />
1616
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.10.0" PrivateAssets="all" />
1717
<PackageReference Update="NETStandard.Library" PrivateAssets="all" />
18-
<PackageReference Include="Polyfill" Version="8.9.0">
19-
<PrivateAssets>all</PrivateAssets>
20-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
21-
</PackageReference>
22-
</ItemGroup>
23-
24-
<ItemGroup>
18+
<PackageReference Include="Polyfill" Version="9.22.0" PrivateAssets="all" />
2519
<None Update="tools\*.ps1" CopyToOutputDirectory="Always" Pack="true" PackagePath="" />
2620
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
27-
</ItemGroup>
28-
29-
<ItemGroup>
3021
<Compile Update="Properties\Resources.Designer.cs">
3122
<DesignTime>True</DesignTime>
3223
<AutoGen>True</AutoGen>
3324
<DependentUpon>Resources.resx</DependentUpon>
3425
</Compile>
35-
</ItemGroup>
36-
37-
<ItemGroup>
3826
<EmbeddedResource Update="Properties\Resources.resx">
3927
<Generator>ResXFileCodeGenerator</Generator>
4028
<LastGenOutput>Resources.Designer.cs</LastGenOutput>

‎Source/Csla.Channels.RabbitMq/Csla.Channels.RabbitMq.csproj‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,7 @@
1313

1414
<ItemGroup>
1515
<PackageReference Include="RabbitMQ.Client" Version="7.0.0" />
16-
</ItemGroup>
17-
18-
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.1'">
19-
<PackageReference Include="Polyfill" Version="8.9.0">
20-
<PrivateAssets>all</PrivateAssets>
21-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
22-
</PackageReference>
23-
</ItemGroup>
24-
25-
<ItemGroup>
16+
<PackageReference Include="Polyfill" Version="9.22.0" PrivateAssets="all" />
2617
<ProjectReference Include="..\Csla\Csla.csproj" />
2718
</ItemGroup>
2819

‎Source/Csla.Generators/cs/AutoImplementProperties/Csla.Generator.AutoImplementProperties.CSharp/AutoImplement/SerializationPartialBuilder.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private void AppendSerializeChildFragment(IndentedTextWriter textWriter, Extract
160160
textWriter.WriteLine($"[{attributeDefinition.AttributeName}({constructorArguments}{separator} {namedProperties})]");
161161
}
162162

163-
textWriter.WriteLine($"{string.Join(" ", propertyDefinition.Modifiers)} {propertyDefinition.TypeDefinition.FullyQualifiedType} {propertyDefinition.PropertyName}");
163+
textWriter.WriteLine($"{string.Join(' ', propertyDefinition.Modifiers)} {propertyDefinition.TypeDefinition.FullyQualifiedType} {propertyDefinition.PropertyName}");
164164
AppendBlockStart(textWriter);
165165
if (propertyDefinition.Getter)
166166
{
@@ -176,7 +176,7 @@ private void AppendSerializeChildFragment(IndentedTextWriter textWriter, Extract
176176
if (propertyDefinition.Setter)
177177
{
178178
var setterseparator = propertyDefinition.SetterModifiers.Any() ? " " : "";
179-
textWriter.WriteLine($"{string.Join(" ", propertyDefinition.SetterModifiers)}{setterseparator}set => {setter}({propertyDefinition.PropertyName}Property, value);");
179+
textWriter.WriteLine($"{string.Join(' ', propertyDefinition.SetterModifiers)}{setterseparator}set => {setter}({propertyDefinition.PropertyName}Property, value);");
180180
}
181181

182182
AppendBlockEnd(textWriter);

‎Source/Csla.Generators/cs/AutoImplementProperties/Csla.Generator.AutoImplementProperties.CSharp/Csla.Generator.AutoImplementProperties.CSharp.csproj‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,12 @@
3434
<None Include="$(PkgMicrosoft_Bcl_HashCode)\lib\netstandard2.0\Microsoft.Bcl.HashCode.dll" CopyToOutputDirectory="PreserveNewest" />
3535
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" PrivateAssets="all" />
3636
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
37-
</ItemGroup>
38-
<ItemGroup>
3937
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
4038
<None Include="$(OutputPath)\Csla.Generator.AutoImplementProperties.Attributes.CSharp.dll" Pack="true" PackagePath="lib\netstandard2.0" Visible="true" />
4139

4240
<!-- Include dependencies needed by the generator at compile time -->
4341
<None Include="$(OutputPath)\Microsoft.Bcl.HashCode.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
44-
</ItemGroup>
45-
<ItemGroup>
4642
<ProjectReference Include="..\Csla.Generator.AutoImplementProperties.Attributes.CSharp\Csla.Generator.AutoImplementProperties.Attributes.CSharp.csproj" PrivateAssets="All" />
47-
</ItemGroup>
48-
<ItemGroup>
49-
<PackageReference Include="Polyfill" Version="8.9.0">
50-
<PrivateAssets>all</PrivateAssets>
51-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
52-
</PackageReference>
43+
<PackageReference Include="Polyfill" Version="9.22.0" PrivateAssets="all" />
5344
</ItemGroup>
5445
</Project>

‎Source/Csla.Generators/cs/AutoSerialization/Csla.Generator.AutoSerialization.CSharp/Csla.Generator.AutoSerialization.CSharp.csproj‎

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,9 @@
3232
<ItemGroup>
3333
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" PrivateAssets="all" />
3434
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
35-
</ItemGroup>
36-
<ItemGroup>
3735
<None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
3836
<None Include="$(OutputPath)\Csla.Generator.AutoSerialization.Attributes.CSharp.dll" Pack="true" PackagePath="lib\netstandard2.0" Visible="true" />
39-
</ItemGroup>
40-
<ItemGroup>
4137
<ProjectReference Include="..\Csla.Generator.AutoSerialization.Attributes.CSharp\Csla.Generator.AutoSerialization.Attributes.CSharp.csproj" PrivateAssets="All" />
42-
</ItemGroup>
43-
44-
<ItemGroup>
45-
<PackageReference Include="Polyfill" Version="8.9.0">
46-
<PrivateAssets>all</PrivateAssets>
47-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
48-
</PackageReference>
38+
<PackageReference Include="Polyfill" Version="9.22.0" PrivateAssets="all" />
4939
</ItemGroup>
5040
</Project>

‎Source/Csla.Generators/cs/DataPortalInterfaces/Csla.Generator.DataPortalInterfaces.CSharp/Csla.Generator.DataPortalInterfaces.CSharp.csproj‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@
2626
<ItemGroup>
2727
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" PrivateAssets="all" />
2828
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" PrivateAssets="all" />
29-
</ItemGroup>
30-
<ItemGroup>
31-
<PackageReference Include="Polyfill" Version="8.9.0">
32-
<PrivateAssets>all</PrivateAssets>
33-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
34-
</PackageReference>
29+
<PackageReference Include="Polyfill" Version="9.22.0" PrivateAssets="all" />
3530
</ItemGroup>
3631
</Project>

‎Source/Csla.Generators/cs/DataPortalInterfaces/Csla.Generator.DataPortalInterfaces.CSharp/Discovery/ContainerDefinitionsExtractor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ private static string GetFullNamespace(BaseNamespaceDeclarationSyntax namespaceD
7171
current = current.Parent as BaseNamespaceDeclarationSyntax;
7272
}
7373

74-
return string.Join(".", parts);
74+
return string.Join('.', parts);
7575
}
7676

7777
private static ExtractedContainerDefinition BuildTypeContainer(TypeDeclarationSyntax typeDecl)

‎Source/Csla.Generators/cs/DataPortalInterfaces/Csla.Generator.DataPortalInterfaces.CSharp/Discovery/OperationMethodExtractor.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ internal static string GetOperationTypeKey(ITypeSymbol typeSymbol)
176176
if (typeSymbol is INamedTypeSymbol namedType && namedType.IsGenericType)
177177
{
178178
var baseName = namedType.MetadataName.Replace('`', '_');
179-
var typeArgs = string.Join("_", namedType.TypeArguments.Select(GetOperationTypeKey));
179+
var typeArgs = string.Join('_', namedType.TypeArguments.Select(GetOperationTypeKey));
180180
return baseName + "_" + typeArgs;
181181
}
182182

‎Source/Csla.Generators/cs/DataPortalInterfaces/Csla.Generator.DataPortalInterfaces.CSharp/Extractors/ExtractedOperationMethod.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public string GetOperationName(string attributeFullName)
5555
var baseName = OperationMethodExtractor.GetBaseOperationName(attributeFullName);
5656
if (CriteriaParameters.Count == 0)
5757
return baseName;
58-
var typeKeys = string.Join("_", CriteriaParameters.Select(p => p.TypeMetadataName));
58+
var typeKeys = string.Join('_', CriteriaParameters.Select(p => p.TypeMetadataName));
5959
return baseName + "__" + typeKeys;
6060
}
6161
}

‎Source/Csla.Windows/Csla.Windows.csproj‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,8 @@
1616
<PackageId>Csla.Windows.Forms</PackageId>
1717
</PropertyGroup>
1818

19-
<ItemGroup Condition="$(TargetFramework.StartsWith(&quot;net4&quot;))">
20-
<PackageReference Include="Polyfill" Version="8.9.0">
21-
<PrivateAssets>all</PrivateAssets>
22-
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
23-
</PackageReference>
24-
</ItemGroup>
25-
2619
<ItemGroup>
20+
<PackageReference Include="Polyfill" Version="9.22.0" PrivateAssets="all" />
2721
<ProjectReference Include="..\Csla\Csla.csproj" />
2822
</ItemGroup>
2923

0 commit comments

Comments
 (0)