Skip to content

Commit

Permalink
updated serpent version to 1.29 so we get the signed one of that as well
Browse files Browse the repository at this point in the history
  • Loading branch information
irmen committed Apr 25, 2019
1 parent 3741606 commit 060bc3c
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion dotnet/Razorvine.Pyrolite/DebugHelper/DebugHelper.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<ProjectReference Include="..\Pyrolite\Pyrolite.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
<PackageReference Include="Razorvine.Serpent" Version="1.29.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion dotnet/Razorvine.Pyrolite/EchoExample/EchoExample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<ProjectReference Include="..\Pyrolite\Pyrolite.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
<PackageReference Include="Razorvine.Serpent" Version="1.29.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
<ProjectReference Include="..\Pyrolite\Pyrolite.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
<PackageReference Include="Razorvine.Serpent" Version="1.29.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion dotnet/Razorvine.Pyrolite/Pyrolite/Pyro/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public enum SerializerType {
public static bool METADATA = true;

public const int PROTOCOL_VERSION = 48; // Pyro 4.38+
public const string PYROLITE_VERSION="4.24";
public const string PYROLITE_VERSION="4.25";

public const string DAEMON_NAME = "Pyro.Daemon";
}
Expand Down
2 changes: 1 addition & 1 deletion dotnet/Razorvine.Pyrolite/Pyrolite/Pyro/Serializers.cs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ static SerpentSerializer()
{
Assembly serpentAssembly = Assembly.Load("Razorvine.Serpent");
Version serpentVersion = serpentAssembly.GetName().Version;
Version requiredSerpentVersion = new Version(1, 20);
Version requiredSerpentVersion = new Version(1, 29);
if(serpentVersion<requiredSerpentVersion)
throw new NotSupportedException("serpent version "+requiredSerpentVersion+" (or newer) is required");

Expand Down
12 changes: 6 additions & 6 deletions dotnet/Razorvine.Pyrolite/Pyrolite/Pyrolite.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
<Authors>Irmen de Jong</Authors>
<Product>Serpent Python literal expression serialization</Product>
<PackageId>Razorvine.Pyrolite</PackageId>
<Version>4.24.0</Version>
<AssemblyVersion>4.24.0.0</AssemblyVersion>
<FileVersion>4.24.0.0</FileVersion>
<Version>4.25.0</Version>
<AssemblyVersion>4.25.0.0</AssemblyVersion>
<FileVersion>4.25.0.0</FileVersion>
<SignAssembly>true</SignAssembly>
<DelaySign>false</DelaySign>
<AssemblyOriginatorKeyFile>Pyrolite.snk</AssemblyOriginatorKeyFile>
Expand All @@ -28,11 +28,11 @@ More info about Pyro: https://pyro4.readthedocs.io/</Description>
<RepositoryUrl>https://github.com/irmen/Pyrolite.git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>pyro python rpc remote-objects</PackageTags>
<PackageReleaseNotes>Moved to C# 7 language level
Pickle and Unpickle performance improvements by creating less intermedite objects</PackageReleaseNotes>
<PackageReleaseNotes>assembly is now strong-name signed (so other strong-named assemblies can reference it)
updated dependency to Razorvine.Serpent 1.29 to get the strong-name signed version of that as well</PackageReleaseNotes>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
<PackageReference Include="Razorvine.Serpent" Version="1.29.0" />
<PackageReference Include="System.Memory" Version="4.5.2" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion dotnet/Razorvine.Pyrolite/Tests/Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
<PackageReference Include="Razorvine.Serpent" Version="1.25.0" />
<PackageReference Include="Razorvine.Serpent" Version="1.29.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" />
Expand Down

0 comments on commit 060bc3c

Please sign in to comment.