Skip to content

Commit f342ef8

Browse files
richoramarichorama
committed
upgraded to orleans 1.2.3
1 parent 2d014c4 commit f342ef8

File tree

14 files changed

+138
-77
lines changed

14 files changed

+138
-77
lines changed

‎Orleans.StorageProviders.RedisStorage.GrainClasses/Orleans.StorageProviders.RedisStorage.GrainClasses.csproj‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.Orleans.Templates.Grains.1.1.2\build\Microsoft.Orleans.Templates.Grains.props" Condition="Exists('..\packages\Microsoft.Orleans.Templates.Grains.1.1.2\build\Microsoft.Orleans.Templates.Grains.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -42,16 +41,16 @@
4241
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
4342
<Private>True</Private>
4443
</Reference>
45-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
44+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4746
<Private>True</Private>
4847
</Reference>
49-
<Reference Include="Orleans, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Microsoft.Orleans.Core.1.1.2\lib\net451\Orleans.dll</HintPath>
48+
<Reference Include="Orleans, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Microsoft.Orleans.Core.1.2.3\lib\net451\Orleans.dll</HintPath>
5150
<Private>True</Private>
5251
</Reference>
53-
<Reference Include="OrleansCodeGenerator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Microsoft.Orleans.OrleansCodeGenerator.1.1.2\lib\net451\OrleansCodeGenerator.dll</HintPath>
52+
<Reference Include="OrleansCodeGenerator, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microsoft.Orleans.OrleansCodeGenerator.1.2.3\lib\net451\OrleansCodeGenerator.dll</HintPath>
5554
<Private>True</Private>
5655
</Reference>
5756
<Reference Include="System" />
@@ -74,7 +73,6 @@
7473
<ItemGroup>
7574
<Compile Include="Grain1.cs" />
7675
<Compile Include="Properties\AssemblyInfo.cs" />
77-
<Compile Include="Properties\orleans.codegen.cs" />
7876
</ItemGroup>
7977
<ItemGroup>
8078
<ProjectReference Include="..\Orleans.StorageProviders.RedisStorage.GrainInterfaces\Orleans.StorageProviders.RedisStorage.GrainInterfaces.csproj">
@@ -90,14 +88,13 @@
9088
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
9189
</ItemGroup>
9290
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
91+
<Import Project="..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.2.3\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets" Condition="Exists('..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.2.3\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets')" />
9392
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
9493
<PropertyGroup>
9594
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9695
</PropertyGroup>
97-
<Error Condition="!Exists('..\packages\Microsoft.Orleans.Templates.Grains.1.1.2\build\Microsoft.Orleans.Templates.Grains.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Orleans.Templates.Grains.1.1.2\build\Microsoft.Orleans.Templates.Grains.props'))" />
98-
<Error Condition="!Exists('..\packages\Microsoft.Orleans.Templates.Grains.1.1.2\build\Microsoft.Orleans.Templates.Grains.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Orleans.Templates.Grains.1.1.2\build\Microsoft.Orleans.Templates.Grains.targets'))" />
96+
<Error Condition="!Exists('..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.2.3\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.2.3\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets'))" />
9997
</Target>
100-
<Import Project="..\packages\Microsoft.Orleans.Templates.Grains.1.1.2\build\Microsoft.Orleans.Templates.Grains.targets" Condition="Exists('..\packages\Microsoft.Orleans.Templates.Grains.1.1.2\build\Microsoft.Orleans.Templates.Grains.targets')" />
10198
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
10299
Other similar extension points exist, see Microsoft.Common.targets.
103100
<Target Name="BeforeBuild">

‎Orleans.StorageProviders.RedisStorage.GrainClasses/Properties/orleans.codegen.cs‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,68 @@
66
#pragma warning disable 693
77
#pragma warning disable 1591
88
#pragma warning disable 1998
9+
[assembly: global::System.CodeDom.Compiler.GeneratedCodeAttribute("Orleans-CodeGenerator", "1.2.3.0")]
10+
[assembly: global::Orleans.CodeGeneration.OrleansCodeGenerationTargetAttribute("Orleans.StorageProviders.RedisStorage.GrainClasses, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null")]
11+
namespace Orleans.StorageProviders.RedisStorage.GrainClasses
12+
{
13+
using global::Orleans.Async;
14+
using global::Orleans;
915

16+
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Orleans-CodeGenerator", "1.2.3.0"), global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute, global::Orleans.CodeGeneration.SerializerAttribute(typeof (global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState)), global::Orleans.CodeGeneration.RegisterSerializerAttribute]
17+
internal class OrleansCodeGenOrleans_StorageProviders_RedisStorage_GrainClasses_MyStateSerializer
18+
{
19+
[global::Orleans.CodeGeneration.CopierMethodAttribute]
20+
public static global::System.Object DeepCopier(global::System.Object original)
21+
{
22+
global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState input = ((global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState)original);
23+
global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState result = new global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState();
24+
result.@DateTimeValue = input.@DateTimeValue;
25+
result.@Etag = input.@Etag;
26+
result.@GrainValue = (global::Orleans.StorageProviders.RedisStorage.GrainInterfaces.IGrain1)global::Orleans.Serialization.SerializationManager.@DeepCopyInner(input.@GrainValue);
27+
result.@GuidValue = (global::System.Guid)global::Orleans.Serialization.SerializationManager.@DeepCopyInner(input.@GuidValue);
28+
result.@IntValue = input.@IntValue;
29+
result.@StringValue = input.@StringValue;
30+
global::Orleans.@Serialization.@SerializationContext.@Current.@RecordObject(original, result);
31+
return result;
32+
}
33+
34+
[global::Orleans.CodeGeneration.SerializerMethodAttribute]
35+
public static void Serializer(global::System.Object untypedInput, global::Orleans.Serialization.BinaryTokenStreamWriter stream, global::System.Type expected)
36+
{
37+
global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState input = (global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState)untypedInput;
38+
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@DateTimeValue, stream, typeof (global::System.DateTime));
39+
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@Etag, stream, typeof (global::System.String));
40+
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@GrainValue, stream, typeof (global::Orleans.StorageProviders.RedisStorage.GrainInterfaces.IGrain1));
41+
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@GuidValue, stream, typeof (global::System.Guid));
42+
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@IntValue, stream, typeof (global::System.Int32));
43+
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@StringValue, stream, typeof (global::System.String));
44+
}
45+
46+
[global::Orleans.CodeGeneration.DeserializerMethodAttribute]
47+
public static global::System.Object Deserializer(global::System.Type expected, global::Orleans.Serialization.BinaryTokenStreamReader stream)
48+
{
49+
global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState result = new global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState();
50+
global::Orleans.@Serialization.@DeserializationContext.@Current.@RecordObject(result);
51+
result.@DateTimeValue = (global::System.DateTime)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.DateTime), stream);
52+
result.@Etag = (global::System.String)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.String), stream);
53+
result.@GrainValue = (global::Orleans.StorageProviders.RedisStorage.GrainInterfaces.IGrain1)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::Orleans.StorageProviders.RedisStorage.GrainInterfaces.IGrain1), stream);
54+
result.@GuidValue = (global::System.Guid)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.Guid), stream);
55+
result.@IntValue = (global::System.Int32)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.Int32), stream);
56+
result.@StringValue = (global::System.String)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.String), stream);
57+
return (global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState)result;
58+
}
59+
60+
public static void Register()
61+
{
62+
global::Orleans.Serialization.SerializationManager.@Register(typeof (global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState), DeepCopier, Serializer, Deserializer);
63+
}
64+
65+
static OrleansCodeGenOrleans_StorageProviders_RedisStorage_GrainClasses_MyStateSerializer()
66+
{
67+
Register();
68+
}
69+
}
70+
}
1071
#pragma warning restore 162
1172
#pragma warning restore 219
1273
#pragma warning restore 414

‎Orleans.StorageProviders.RedisStorage.GrainClasses/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net452" />
44
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net452" />
55
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net452" />
6-
<package id="Microsoft.Orleans.Core" version="1.1.2" targetFramework="net452" />
7-
<package id="Microsoft.Orleans.OrleansCodeGenerator" version="1.1.2" targetFramework="net452" />
8-
<package id="Microsoft.Orleans.Templates.Grains" version="1.1.2" targetFramework="net452" />
9-
<package id="Newtonsoft.Json" version="6.0.8" targetFramework="net452" />
6+
<package id="Microsoft.Orleans.Core" version="1.2.3" targetFramework="net452" />
7+
<package id="Microsoft.Orleans.OrleansCodeGenerator" version="1.2.3" targetFramework="net452" />
8+
<package id="Microsoft.Orleans.OrleansCodeGenerator.Build" version="1.2.3" targetFramework="net452" />
9+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
1010
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net452" />
1111
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net452" />
1212
</packages>

‎Orleans.StorageProviders.RedisStorage.GrainInterfaces/Orleans.StorageProviders.RedisStorage.GrainInterfaces.csproj‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.Orleans.Templates.Interfaces.1.1.2\build\Microsoft.Orleans.Templates.Interfaces.props" Condition="Exists('..\packages\Microsoft.Orleans.Templates.Interfaces.1.1.2\build\Microsoft.Orleans.Templates.Interfaces.props')" />
43
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -42,16 +41,16 @@
4241
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
4342
<Private>True</Private>
4443
</Reference>
45-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
46-
<HintPath>..\packages\Newtonsoft.Json.6.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
44+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
4746
<Private>True</Private>
4847
</Reference>
49-
<Reference Include="Orleans, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<HintPath>..\packages\Microsoft.Orleans.Core.1.1.2\lib\net451\Orleans.dll</HintPath>
48+
<Reference Include="Orleans, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
49+
<HintPath>..\packages\Microsoft.Orleans.Core.1.2.3\lib\net451\Orleans.dll</HintPath>
5150
<Private>True</Private>
5251
</Reference>
53-
<Reference Include="OrleansCodeGenerator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Microsoft.Orleans.OrleansCodeGenerator.1.1.2\lib\net451\OrleansCodeGenerator.dll</HintPath>
52+
<Reference Include="OrleansCodeGenerator, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Microsoft.Orleans.OrleansCodeGenerator.1.2.3\lib\net451\OrleansCodeGenerator.dll</HintPath>
5554
<Private>True</Private>
5655
</Reference>
5756
<Reference Include="System" />
@@ -74,7 +73,6 @@
7473
<ItemGroup>
7574
<Compile Include="IGrain1.cs" />
7675
<Compile Include="Properties\AssemblyInfo.cs" />
77-
<Compile Include="Properties\orleans.codegen.cs" />
7876
</ItemGroup>
7977
<ItemGroup>
8078
<None Include="packages.config" />
@@ -84,14 +82,13 @@
8482
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
8583
</ItemGroup>
8684
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
85+
<Import Project="..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.2.3\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets" Condition="Exists('..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.2.3\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets')" />
8786
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
8887
<PropertyGroup>
8988
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9089
</PropertyGroup>
91-
<Error Condition="!Exists('..\packages\Microsoft.Orleans.Templates.Interfaces.1.1.2\build\Microsoft.Orleans.Templates.Interfaces.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Orleans.Templates.Interfaces.1.1.2\build\Microsoft.Orleans.Templates.Interfaces.props'))" />
92-
<Error Condition="!Exists('..\packages\Microsoft.Orleans.Templates.Interfaces.1.1.2\build\Microsoft.Orleans.Templates.Interfaces.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Orleans.Templates.Interfaces.1.1.2\build\Microsoft.Orleans.Templates.Interfaces.targets'))" />
90+
<Error Condition="!Exists('..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.2.3\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.2.3\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets'))" />
9391
</Target>
94-
<Import Project="..\packages\Microsoft.Orleans.Templates.Interfaces.1.1.2\build\Microsoft.Orleans.Templates.Interfaces.targets" Condition="Exists('..\packages\Microsoft.Orleans.Templates.Interfaces.1.1.2\build\Microsoft.Orleans.Templates.Interfaces.targets')" />
9592
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9693
Other similar extension points exist, see Microsoft.Common.targets.
9794
<Target Name="BeforeBuild">

0 commit comments

Comments
 (0)