Skip to content

Commit 698b421

Browse files
ArkatufusArkatufus
committed
Modernize solution
1 parent 5898469 commit 698b421

File tree

11 files changed

+65
-34
lines changed

11 files changed

+65
-34
lines changed

‎Akka.Serialization.Compressed.sln

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1515
ProjectSection(SolutionItems) = preProject
1616
README.md = README.md
1717
RELEASE_NOTES.md = RELEASE_NOTES.md
18+
src\Directory.Build.props = src\Directory.Build.props
19+
src\Directory.Generated.props = src\Directory.Generated.props
20+
src\Directory.Packages.props = src\Directory.Packages.props
1821
EndProjectSection
1922
EndProject
2023
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "Json", "{25F8AE7C-D98B-41B1-A534-49E9603D8533}"

‎build/_build.csproj.DotSettings

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/PLACE_SIMPLE_ANONYMOUSMETHOD_ON_SINGLE_LINE/@EntryValue">False</s:Boolean>
1717
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateInstanceFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
1818
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/PredefinedNamingRules/=PrivateStaticFields/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
19+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=4a98fdf6_002D7d98_002D4f5a_002Dafeb_002Dea44ad98c70c/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;Kind Name="READONLY_FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
20+
<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/UserRules/=f9fce829_002De6f4_002D4cb2_002D80f1_002D5497c44f51df/@EntryIndexedValue">&lt;Policy&gt;&lt;Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static fields (private)"&gt;&lt;ElementKinds&gt;&lt;Kind Name="FIELD" /&gt;&lt;/ElementKinds&gt;&lt;/Descriptor&gt;&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;&lt;/Policy&gt;</s:String>
1921
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpAttributeForSingleLineMethodUpgrade/@EntryIndexedValue">True</s:Boolean>
2022
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
2123
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
@@ -24,4 +26,5 @@
2426
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
2527
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002ECSharpPlaceAttributeOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
2628
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
27-
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
29+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean>
30+
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EPredefinedNamingRulesToUserRulesUpgrade/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

‎src/Akka.Serialization.Compressed.Json.Tests.Performance/Akka.Serialization.Compressed.Json.Tests.Performance.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFrameworks>$(TestsNetCore);$(TestsNet)</TargetFrameworks>
5+
<TargetFrameworks>$(TestsNetFx);$(TestsNet)</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="BenchmarkDotNet" Version="$(BenchmarkDotNetVersion)" />
10+
<PackageReference Include="BenchmarkDotNet" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎src/Akka.Serialization.Compressed.Json.Tests/Akka.Serialization.Compressed.Json.Tests.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(TestsNetCore);$(TestsNet)</TargetFrameworks>
3+
<TargetFrameworks>$(TestsNetFx);$(TestsNet)</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
9-
<PackageReference Include="xunit" Version="$(XunitVersion)" />
10-
<PackageReference Include="xunit.runner.visualstudio" Version="$(XunitRunnerVisualstudio)">
8+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
9+
<PackageReference Include="xunit" />
10+
<PackageReference Include="xunit.runner.visualstudio" >
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>

‎src/Akka.Serialization.Compressed.Json/Akka.Serialization.Compressed.Json.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
<PackageReadmeFile>README.md</PackageReadmeFile>
66
<Description>Akka.NET serialization plugins with compression support</Description>
77
<PackageReadmeFile>README.md</PackageReadmeFile>
8+
<LangVersion>latest</LangVersion>
89
</PropertyGroup>
910

1011
<ItemGroup>
11-
<PackageReference Include="Akka" Version="$(AkkaVersion)" />
12-
<PackageReference Include="Akka.Hosting" Version="$(AkkaHostingVersion)" />
12+
<PackageReference Include="Akka" />
13+
<PackageReference Include="Akka.Hosting" />
1314
</ItemGroup>
1415

1516
<ItemGroup>

‎src/Akka.Serialization.Compressed.Json/AkkaHostingExtensions.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
// -----------------------------------------------------------------------
77

88
using System;
9+
using System.Collections.Immutable;
910
using System.Linq;
1011
using Akka.Hosting;
1112

@@ -23,8 +24,8 @@ public static AkkaConfigurationBuilder WithCompressedJsonSerializer(this AkkaCon
2324

2425
public static AkkaConfigurationBuilder WithCompressedJsonSerializer(this AkkaConfigurationBuilder builder, params Type[] boundTypes)
2526
{
26-
var typeHash = boundTypes.ToHashSet();
27-
typeHash.Add(typeof(IShouldCompress));
27+
var typeHash = boundTypes.ToImmutableHashSet();
28+
typeHash = typeHash.Add(typeof(IShouldCompress));
2829

2930
return builder.WithCustomSerializer(
3031
serializerIdentifier: "json-gzip",

‎src/Akka.Serialization.Compressed.Json/CompressedJsonSerializer.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ private static object GetValue(string? value)
371371
if(value is null)
372372
throw new NotSupportedException("Null is not supported");
373373

374-
var t = value[..1];
375-
var v = value[1..];
374+
var t = value.Substring(0, 1);
375+
var v = value.Substring(1);
376376
return t switch
377377
{
378378
"I" => int.Parse(v, NumberFormatInfo.InvariantInfo),

‎src/Akka.Serialization.TestKit/Akka.Serialization.TestKit.csproj

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>$(TestsNetCore);$(TestsNet)</TargetFrameworks>
3+
<TargetFrameworks>$(TestsNetFx);$(TestsNet)</TargetFrameworks>
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66

7-
<!--
8-
<ItemGroup>
9-
<ProjectReference Include="..\..\..\core\Akka.Tests.Shared.Internals\Akka.Tests.Shared.Internals.csproj" />
10-
</ItemGroup>
11-
-->
12-
137
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
148
<DefineConstants>$(DefineConstants);RELEASE</DefineConstants>
159
</PropertyGroup>
1610

1711
<ItemGroup>
18-
<PackageReference Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)" />
19-
<PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
12+
<PackageReference Include="Akka.TestKit.Xunit2" />
13+
<PackageReference Include="FluentAssertions" />
2014
</ItemGroup>
2115

2216
</Project>

‎src/Directory.Build.props

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<Project>
2+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Generated.props', '$(MSBuildThisFileDirectory)'))" />
3+
24
<PropertyGroup>
35
<Copyright>Copyright © 2013-2023 Akka.NET Team</Copyright>
46
<Authors>Akka.NET Team</Authors>
5-
<VersionPrefix>0.3.0</VersionPrefix>
6-
<PackageReleaseNotes>• Fixed bugs</PackageReleaseNotes>
77
<PackageIconUrl>akkalogo.png</PackageIconUrl>
88
<PackageProjectUrl>https://github.com/akkadotnet/Akka.Serialization.Compressed</PackageProjectUrl>
99
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -13,17 +13,9 @@
1313
</PropertyGroup>
1414

1515
<PropertyGroup>
16-
<LibraryFramework>netstandard2.1</LibraryFramework>
16+
<LibraryFramework>netstandard2.0</LibraryFramework>
1717
<TestsNet>net6.0</TestsNet>
18-
<TestsNetCore>netcoreapp3.1</TestsNetCore>
19-
<XunitVersion>2.5.1</XunitVersion>
20-
<XunitRunnerVisualstudio>2.5.1</XunitRunnerVisualstudio>
21-
<TestSdkVersion>17.8.0</TestSdkVersion>
22-
23-
<AkkaVersion>1.5.13</AkkaVersion>
24-
<AkkaHostingVersion>1.5.13</AkkaHostingVersion>
25-
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
26-
<BenchmarkDotNetVersion>0.13.8</BenchmarkDotNetVersion>
18+
<TestsNetFx>net48</TestsNetFx>
2719
</PropertyGroup>
2820

2921
<!-- SourceLink support for all Akka.NET projects -->

‎src/Directory.Generated.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup>
3+
<VersionPrefix/>
4+
<PackageReleaseNotes/>
5+
</PropertyGroup>
6+
</Project>

0 commit comments

Comments
 (0)