version bump and serpent 1.25 dependency

irmen · Jul 8, 2018 · 5a7b616 · 5a7b616
1 parent 0d66cd5
commit 5a7b616
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 12 deletions.
diff --git a/dotnet/Razorvine.Pyrolite/DebugHelper/DebugHelper.csproj b/dotnet/Razorvine.Pyrolite/DebugHelper/DebugHelper.csproj
@@ -8,6 +8,6 @@
     <ProjectReference Include="..\Pyrolite\Pyrolite.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Razorvine.Serpent" Version="1.20.0" />
+    <PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
   </ItemGroup>
 </Project>
diff --git a/dotnet/Razorvine.Pyrolite/EchoExample/EchoExample.csproj b/dotnet/Razorvine.Pyrolite/EchoExample/EchoExample.csproj
@@ -8,6 +8,6 @@
     <ProjectReference Include="..\Pyrolite\Pyrolite.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Razorvine.Serpent" Version="1.20.0" />
+    <PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
   </ItemGroup>
 </Project>
diff --git a/dotnet/Razorvine.Pyrolite/NamingExample/NamingExample.csproj b/dotnet/Razorvine.Pyrolite/NamingExample/NamingExample.csproj
@@ -8,6 +8,6 @@
     <ProjectReference Include="..\Pyrolite\Pyrolite.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Razorvine.Serpent" Version="1.20.0" />
+    <PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
   </ItemGroup>
 </Project>
diff --git a/dotnet/Razorvine.Pyrolite/Pyrolite/Pyro/Config.cs b/dotnet/Razorvine.Pyrolite/Pyrolite/Pyro/Config.cs
@@ -22,7 +22,7 @@ public enum SerializerType {
 	public static bool METADATA = true;
 
 	public const int PROTOCOL_VERSION = 48;		// Pyro 4.38+ 
-	public const string PYROLITE_VERSION="4.20";
+	public const string PYROLITE_VERSION="4.21";
 
 	public const string DAEMON_NAME = "Pyro.Daemon";
 }

diff --git a/dotnet/Razorvine.Pyrolite/Pyrolite/Pyrolite.csproj b/dotnet/Razorvine.Pyrolite/Pyrolite/Pyrolite.csproj
@@ -7,9 +7,9 @@
     <Authors>Irmen de Jong</Authors>
     <Product>Serpent Python literal expression serialization</Product>
     <PackageId>Razorvine.Pyrolite</PackageId>
-    <Version>4.20.0</Version>
-    <AssemblyVersion>4.20.0.0</AssemblyVersion>
-    <FileVersion>4.20.0.0</FileVersion>
+    <Version>4.21.0</Version>
+    <AssemblyVersion>4.21.0.0</AssemblyVersion>
+    <FileVersion>4.21.0.0</FileVersion>
     <Summary>Pyro (Python Remote Objects) client library</Summary>
     <Description>Thin client-side communication library to connect to Python applications, using the Pyro protocol.
 Also includes Pickle/Unpickle.
@@ -20,9 +20,9 @@ More info about Pyro: http://pythonhosted.org/Pyro4/</Description>
     <RepositoryUrl>https://github.com/irmen/Pyrolite.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>pyro python rpc remote-objects</PackageTags>
-    <PackageReleaseNotes>Migrated to dotnet core and NetStandard 2.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Code style and C# language level cleanups, serpent 1.25 dependency, Compatible with dotnet core and NetStandard 2.0</PackageReleaseNotes>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Razorvine.Serpent" Version="1.20.0" />
+    <PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
   </ItemGroup>
 </Project>
diff --git a/dotnet/Razorvine.Pyrolite/Tests/Tests.csproj b/dotnet/Razorvine.Pyrolite/Tests/Tests.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="Razorvine.Serpent" Version="1.20.0" />
+    <PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />

diff --git a/java/.idea/Pyrolite.iml b/java/.idea/Pyrolite.iml
diff --git a/java/.idea/compiler.xml b/java/.idea/compiler.xml
diff --git a/java/.idea/misc.xml b/java/.idea/misc.xml