chore: add multi targets for jsonchan

ParaParty · Nov 18, 2024 · 3d76879 · 3d76879
1 parent fa813e0
commit 3d76879
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 24 deletions.
diff --git a/ChiseledQuartz/ChiseledQuartz.csproj b/ChiseledQuartz/ChiseledQuartz.csproj
@@ -19,9 +19,9 @@
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageId>Paraparty.ChiseledQuartz</PackageId>
-        <Version>3.0.0</Version>
-        <AssemblyVersion>3.0.0.0</AssemblyVersion>
-        <FileVersion>3.0.0.0</FileVersion>
+        <Version>3.1.0</Version>
+        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <FileVersion>3.1.0.0</FileVersion>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Colors/Colors.csproj b/Colors/Colors.csproj
@@ -18,9 +18,9 @@
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageId>Paraparty.Colors</PackageId>
-        <Version>3.0.0</Version>
-        <AssemblyVersion>3.0.0.0</AssemblyVersion>
-        <FileVersion>3.0.0.0</FileVersion>
+        <Version>3.1.0</Version>
+        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <FileVersion>3.1.0.0</FileVersion>
     </PropertyGroup>
 
 </Project>
diff --git a/JsonChan/JsonChan.csproj b/JsonChan/JsonChan.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard1.2</TargetFramework>
+        <TargetFrameworks>netstandard1.2;netstandard2.0;net5.0;</TargetFrameworks>
         <LangVersion>7.2</LangVersion>
         <Nullable>disable</Nullable>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
@@ -18,12 +18,12 @@
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageId>Paraparty.JsonChan</PackageId>
-        <Version>3.0.0</Version>
-        <AssemblyVersion>3.0.0.0</AssemblyVersion>
-        <FileVersion>3.0.0.0</FileVersion>
+        <Version>3.1.0</Version>
+        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <FileVersion>3.1.0.0</FileVersion>
     </PropertyGroup>
 
-    <ItemGroup>
+    <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
         <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
     </ItemGroup>
 </Project>
diff --git a/Kotlinize/Kotlinize.csproj b/Kotlinize/Kotlinize.csproj
@@ -18,9 +18,9 @@
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageId>Paraparty.Kotlinize</PackageId>
-        <Version>3.0.0</Version>
-        <AssemblyVersion>3.0.0.0</AssemblyVersion>
-        <FileVersion>3.0.0.0</FileVersion>
+        <Version>3.1.0</Version>
+        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <FileVersion>3.1.0.0</FileVersion>
     </PropertyGroup>
 
 </Project>
diff --git a/ParaPartyUtil.sln.DotSettings.user b/ParaPartyUtil.sln.DotSettings.user
@@ -1,10 +1,14 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AAssert_002EAreEqual_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F5540b3eff5e6d9e4322b02a80dc2c202f95e1e8e53784fe63333ed8cf2e927_003FAssert_002EAreEqual_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AList_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fadd1762a78524da5bad4ae5aeed85859a250a0_003Fcf_003F00f9587f_003FList_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AObject_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fadd1762a78524da5bad4ae5aeed85859a250a0_003F85_003Feeef413f_003FObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/Environment/UnitTesting/UnitTestSessionStore/Sessions/=46bc3af4_002Dd0ae_002D42bf_002Db5af_002D5a24a008628b/@EntryIndexedValue">&lt;SessionState ContinuousTestingMode="0" IsActive="True" Name="IsPrime_InputIs1_ReturnFalse" xmlns="urn:schemas-jetbrains-com:jetbrains-ut-session"&gt;&#xD;
   &lt;TestAncestor&gt;&#xD;
     &lt;TestId&gt;MSTest::16D26EE2-4A65-4189-AD77-38E73A038454::net8.0::Paraparty.Tests.Kotlinize.CollectionExtension&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;MSTest::16D26EE2-4A65-4189-AD77-38E73A038454::net8.0::Paraparty.Tests.Kotlinize.TestScopedFunction&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;MSTest::16D26EE2-4A65-4189-AD77-38E73A038454::net8.0::Paraparty.Tests.UnityNative.TestStringExtension&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;MSTest::16D26EE2-4A65-4189-AD77-38E73A038454::net8.0::Paraparty.Tests.Colors.TestColors&lt;/TestId&gt;&#xD;
     &lt;TestId&gt;MSTest::16D26EE2-4A65-4189-AD77-38E73A038454::net8.0::Paraparty.Tests.Strings.NamingStrategyUtilTest&lt;/TestId&gt;&#xD;
+    &lt;TestId&gt;MSTest::16D26EE2-4A65-4189-AD77-38E73A038454::net8.0::Paraparty.Tests.JsonChan.TestJson&lt;/TestId&gt;&#xD;
   &lt;/TestAncestor&gt;&#xD;
 &lt;/SessionState&gt;</s:String></wpf:ResourceDictionary>
diff --git a/Strings/Strings.csproj b/Strings/Strings.csproj
@@ -18,9 +18,9 @@
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageId>Paraparty.Strings</PackageId>
-        <Version>3.0.0</Version>
-        <AssemblyVersion>3.0.0.0</AssemblyVersion>
-        <FileVersion>3.0.0.0</FileVersion>
+        <Version>3.1.0</Version>
+        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <FileVersion>3.1.0.0</FileVersion>
     </PropertyGroup>
 
 </Project>
diff --git a/Tests/JsonChan/TestJson.cs b/Tests/JsonChan/TestJson.cs
@@ -19,9 +19,9 @@ public void TestJson1()
 ");
 
         // Asserts
-        Assert.AreEqual(json.apple, 1);
-        Assert.AreEqual(json.banana, 2);
-        Assert.AreEqual(json.coco, 3);
+        Assert.AreEqual<ulong>(json.apple, 1);
+        Assert.AreEqual<ulong>(json.banana, 2);
+        Assert.AreEqual<ulong>(json.coco, 3);
     }
 
     [TestMethod]
@@ -68,7 +68,7 @@ public void TestJson3()
         Assert.AreEqual(json.number, 3.1415926);
         Assert.AreEqual(json.boolean, true);
         Assert.AreEqual(json.j_obj.str, "string \\in object");
-        Assert.AreEqual(json.j_obj.number, 1000000000);
+        Assert.AreEqual<ulong>(json.j_obj.number, 1000000000);
         Assert.AreEqual(json.j_obj.boolean, false);
         Assert.AreEqual(json.j_array[0], "apple");
         Assert.AreEqual(json.j_array[1], "banana");

diff --git a/UnityNative/UnityNative.csproj b/UnityNative/UnityNative.csproj
@@ -17,9 +17,9 @@
         <AssemblyName>Paraparty.UnityNative</AssemblyName>
 
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <Version>3.0.0</Version>
-        <AssemblyVersion>3.0.0.0</AssemblyVersion>
-        <FileVersion>3.0.0.0</FileVersion>
+        <Version>3.1.0</Version>
+        <AssemblyVersion>3.1.0.0</AssemblyVersion>
+        <FileVersion>3.1.0.0</FileVersion>
     </PropertyGroup>
 
 </Project>