Skip to content

Commit

Permalink
Merge pull request #11 from richorama/master
Browse files Browse the repository at this point in the history
Master
  • Loading branch information
richorama authored Jan 17, 2017
2 parents e557705 + 5a3ea20 commit 557003d
Show file tree
Hide file tree
Showing 15 changed files with 228 additions and 293 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,34 +33,34 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.CodeAnalysis, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.0.0\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
<Reference Include="Microsoft.CodeAnalysis, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.3.2\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.0.0\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.3.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Orleans, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Orleans.Core.1.2.3\lib\net451\Orleans.dll</HintPath>
<Reference Include="Orleans, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Orleans.Core.1.3.1\lib\net451\Orleans.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="OrleansCodeGenerator, Version=1.2.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Orleans.OrleansCodeGenerator.1.2.3\lib\net451\OrleansCodeGenerator.dll</HintPath>
<Reference Include="OrleansCodeGenerator, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Orleans.OrleansCodeGenerator.1.3.1\lib\net451\OrleansCodeGenerator.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Collections.Immutable, Version=1.1.36.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.1.36\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Core" />
<Reference Include="System.Reflection.Metadata, Version=1.0.21.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.1.0.21\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
<Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System.Xml.Linq" />
Expand All @@ -81,19 +81,20 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<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')" />
<Import Project="..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.3.1\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets" Condition="Exists('..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.3.1\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
<Error Condition="!Exists('..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.3.1\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Orleans.OrleansCodeGenerator.Build.1.3.1\build\Microsoft.Orleans.OrleansCodeGenerator.Build.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,78 +0,0 @@
#if !EXCLUDE_CODEGEN
#pragma warning disable 162
#pragma warning disable 219
#pragma warning disable 414
#pragma warning disable 649
#pragma warning disable 693
#pragma warning disable 1591
#pragma warning disable 1998
[assembly: global::System.CodeDom.Compiler.GeneratedCodeAttribute("Orleans-CodeGenerator", "1.2.3.0")]
[assembly: global::Orleans.CodeGeneration.OrleansCodeGenerationTargetAttribute("Orleans.StorageProviders.RedisStorage.GrainClasses, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null")]
namespace Orleans.StorageProviders.RedisStorage.GrainClasses
{
using global::Orleans.Async;
using global::Orleans;

[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]
internal class OrleansCodeGenOrleans_StorageProviders_RedisStorage_GrainClasses_MyStateSerializer
{
[global::Orleans.CodeGeneration.CopierMethodAttribute]
public static global::System.Object DeepCopier(global::System.Object original)
{
global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState input = ((global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState)original);
global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState result = new global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState();
result.@DateTimeValue = input.@DateTimeValue;
result.@Etag = input.@Etag;
result.@GrainValue = (global::Orleans.StorageProviders.RedisStorage.GrainInterfaces.IGrain1)global::Orleans.Serialization.SerializationManager.@DeepCopyInner(input.@GrainValue);
result.@GuidValue = (global::System.Guid)global::Orleans.Serialization.SerializationManager.@DeepCopyInner(input.@GuidValue);
result.@IntValue = input.@IntValue;
result.@StringValue = input.@StringValue;
global::Orleans.@Serialization.@SerializationContext.@Current.@RecordObject(original, result);
return result;
}

[global::Orleans.CodeGeneration.SerializerMethodAttribute]
public static void Serializer(global::System.Object untypedInput, global::Orleans.Serialization.BinaryTokenStreamWriter stream, global::System.Type expected)
{
global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState input = (global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState)untypedInput;
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@DateTimeValue, stream, typeof (global::System.DateTime));
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@Etag, stream, typeof (global::System.String));
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@GrainValue, stream, typeof (global::Orleans.StorageProviders.RedisStorage.GrainInterfaces.IGrain1));
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@GuidValue, stream, typeof (global::System.Guid));
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@IntValue, stream, typeof (global::System.Int32));
global::Orleans.Serialization.SerializationManager.@SerializeInner(input.@StringValue, stream, typeof (global::System.String));
}

[global::Orleans.CodeGeneration.DeserializerMethodAttribute]
public static global::System.Object Deserializer(global::System.Type expected, global::Orleans.Serialization.BinaryTokenStreamReader stream)
{
global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState result = new global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState();
global::Orleans.@Serialization.@DeserializationContext.@Current.@RecordObject(result);
result.@DateTimeValue = (global::System.DateTime)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.DateTime), stream);
result.@Etag = (global::System.String)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.String), stream);
result.@GrainValue = (global::Orleans.StorageProviders.RedisStorage.GrainInterfaces.IGrain1)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::Orleans.StorageProviders.RedisStorage.GrainInterfaces.IGrain1), stream);
result.@GuidValue = (global::System.Guid)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.Guid), stream);
result.@IntValue = (global::System.Int32)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.Int32), stream);
result.@StringValue = (global::System.String)global::Orleans.Serialization.SerializationManager.@DeserializeInner(typeof (global::System.String), stream);
return (global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState)result;
}

public static void Register()
{
global::Orleans.Serialization.SerializationManager.@Register(typeof (global::Orleans.StorageProviders.RedisStorage.GrainClasses.MyState), DeepCopier, Serializer, Deserializer);
}

static OrleansCodeGenOrleans_StorageProviders_RedisStorage_GrainClasses_MyStateSerializer()
{
Register();
}
}
}
#pragma warning restore 162
#pragma warning restore 219
#pragma warning restore 414
#pragma warning restore 649
#pragma warning restore 693
#pragma warning restore 1591
#pragma warning restore 1998
#endif
19 changes: 19 additions & 0 deletions Orleans.StorageProviders.RedisStorage.GrainClasses/app.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.CodeAnalysis.Common" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.CodeAnalysis.CSharp" version="1.0.0" targetFramework="net452" />
<package id="Microsoft.Orleans.Core" version="1.2.3" targetFramework="net452" />
<package id="Microsoft.Orleans.OrleansCodeGenerator" version="1.2.3" targetFramework="net452" />
<package id="Microsoft.Orleans.OrleansCodeGenerator.Build" version="1.2.3" targetFramework="net452" />
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
<package id="System.Collections.Immutable" version="1.1.36" targetFramework="net452" />
<package id="System.Reflection.Metadata" version="1.0.21" targetFramework="net452" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net452" />
<package id="Microsoft.CodeAnalysis.Common" version="1.3.2" targetFramework="net452" />
<package id="Microsoft.CodeAnalysis.CSharp" version="1.3.2" targetFramework="net452" />
<package id="Microsoft.Orleans.Core" version="1.3.1" targetFramework="net452" />
<package id="Microsoft.Orleans.OrleansCodeGenerator" version="1.3.1" targetFramework="net452" />
<package id="Microsoft.Orleans.OrleansCodeGenerator.Build" version="1.3.1" targetFramework="net452" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net452" />
<package id="System.Collections.Immutable" version="1.3.1" targetFramework="net452" />
<package id="System.Reflection.Metadata" version="1.4.2" targetFramework="net452" />
</packages>
Loading

0 comments on commit 557003d

Please sign in to comment.