Skip to content

Commit 92b0d61

Browse files
lmagyarlmagyar
authored
Merge pull request #106 from OrleansContrib/samples-master - Releasing v0.3.0
2 parents a589b17 + cd96e62 commit 92b0d61

39 files changed

+1179
-804
lines changed

‎Samples/src/GlobalAssemblyInfo.cs

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
using System.Reflection;
1+
using System.Reflection;
22

33
[assembly: AssemblyCompany("OrleansContrib")]
44
[assembly: AssemblyProduct("Orleans.Activities.Samples - https://github.com/OrleansContrib/Orleans.Activities")]
5-
[assembly: AssemblyCopyright("Copyright © OrleansContrib 2016")]
5+
[assembly: AssemblyCopyright("Copyright © 2016-2017 OrleansContrib")]
66
[assembly: AssemblyTrademark("")]
77
[assembly: AssemblyCulture("")]
88

9-
[assembly: AssemblyVersion("0.2.0")]
10-
[assembly: AssemblyFileVersion("0.2.0")]
11-
[assembly: AssemblyInformationalVersion("0.2.0")]
9+
[assembly: AssemblyVersion("0.3.0")]
10+
[assembly: AssemblyFileVersion("0.3.0")]
11+
[assembly: AssemblyInformationalVersion("0.3.0")]

‎Samples/src/Orleans.Activities.Samples.Arithmetical.GrainInterfaces/IMultiplier.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ public interface IMultiplier : IGrainWithGuidKey
99
{
1010
Task MultiplyAsync(int arg1, int arg2);
1111

12-
Task Subscribe(IMultiplierResultReceiver observer);
13-
Task Unsubscribe(IMultiplierResultReceiver observer);
12+
Task SubscribeAsync(IMultiplierResultReceiver observer);
13+
Task UnsubscribeAsync(IMultiplierResultReceiver observer);
1414
}
1515

1616
public interface IMultiplierResultReceiver : IGrainObserver

‎Samples/src/Orleans.Activities.Samples.Arithmetical.GrainInterfaces/Orleans.Activities.Samples.Arithmetical.GrainInterfaces.csproj

+67-42
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.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')" />
4-
<Import Project="$(SolutionDir)packages\Microsoft.Orleans.Templates.Interfaces.1.1.0\build\Microsoft.Orleans.Templates.Interfaces.props" Condition="Exists('$(SolutionDir)packages\Microsoft.Orleans.Templates.Interfaces.1.1.0\build\Microsoft.Orleans.Templates.Interfaces.props')" />
2+
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
53
<PropertyGroup>
64
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
75
<Platform>AnyCPU</Platform>
@@ -11,7 +9,7 @@
119
<AppDesignerFolder>Properties</AppDesignerFolder>
1210
<RootNamespace>Orleans.Activities.Samples.Arithmetical.GrainInterfaces</RootNamespace>
1311
<AssemblyName>Orleans.Activities.Samples.Arithmetical.GrainInterfaces</AssemblyName>
14-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1513
<FileAlignment>512</FileAlignment>
1614
<NuGetPackageImportStamp>
1715
</NuGetPackageImportStamp>
@@ -26,7 +24,6 @@
2624
<ErrorReport>prompt</ErrorReport>
2725
<WarningLevel>4</WarningLevel>
2826
<Prefer32Bit>false</Prefer32Bit>
29-
<NoWarn>CSE0001 CSE0003</NoWarn>
3027
</PropertyGroup>
3128
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3229
<DebugType>pdbonly</DebugType>
@@ -36,44 +33,86 @@
3633
<ErrorReport>prompt</ErrorReport>
3734
<WarningLevel>4</WarningLevel>
3835
<Prefer32Bit>false</Prefer32Bit>
39-
<NoWarn>CSE0001 CSE0003</NoWarn>
4036
</PropertyGroup>
4137
<ItemGroup>
42-
<Reference Include="Microsoft.CodeAnalysis, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
43-
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.1.1.1\lib\net45\Microsoft.CodeAnalysis.dll</HintPath>
44-
<Private>True</Private>
38+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.1.1.0\lib\netstandard1.1\Microsoft.Extensions.DependencyInjection.dll</HintPath>
4540
</Reference>
46-
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
47-
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.1.1.1\lib\net45\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
48-
<Private>True</Private>
41+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.1.1.0\lib\netstandard1.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
4943
</Reference>
50-
<Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
52-
<Private>True</Private>
44+
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
5346
</Reference>
54-
<Reference Include="Orleans, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
55-
<HintPath>..\packages\Microsoft.Orleans.Core.1.1.2\lib\net451\Orleans.dll</HintPath>
56-
<Private>True</Private>
47+
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5749
</Reference>
58-
<Reference Include="OrleansCodeGenerator, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\packages\Microsoft.Orleans.OrleansCodeGenerator.1.1.2\lib\net451\OrleansCodeGenerator.dll</HintPath>
60-
<Private>True</Private>
50+
<Reference Include="Orleans, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Microsoft.Orleans.Core.1.5.0-beta1\lib\net461\Orleans.dll</HintPath>
6152
</Reference>
6253
<Reference Include="System" />
6354
<Reference Include="Microsoft.CSharp" />
64-
<Reference Include="System.Collections.Immutable, Version=1.1.37.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
65-
<HintPath>..\packages\System.Collections.Immutable.1.1.37\lib\dotnet\System.Collections.Immutable.dll</HintPath>
55+
<Reference Include="System.AppContext, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
56+
<HintPath>..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll</HintPath>
57+
</Reference>
58+
<Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
59+
<HintPath>..\packages\System.Collections.Immutable.1.3.1\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
6660
<Private>True</Private>
6761
</Reference>
62+
<Reference Include="System.ComponentModel.Composition" />
63+
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
64+
<HintPath>..\packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
65+
</Reference>
6866
<Reference Include="System.Core" />
69-
<Reference Include="System.Data" />
70-
<Reference Include="System.Data.DataSetExtensions" />
71-
<Reference Include="System.Reflection.Metadata, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
72-
<HintPath>..\packages\System.Reflection.Metadata.1.1.0\lib\dotnet5.2\System.Reflection.Metadata.dll</HintPath>
73-
<Private>True</Private>
67+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
68+
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
69+
</Reference>
70+
<Reference Include="System.Globalization.Calendars, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
71+
<HintPath>..\packages\System.Globalization.Calendars.4.3.0\lib\net46\System.Globalization.Calendars.dll</HintPath>
72+
</Reference>
73+
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
74+
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
75+
</Reference>
76+
<Reference Include="System.IO.Compression.FileSystem" />
77+
<Reference Include="System.IO.Compression.ZipFile, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
78+
<HintPath>..\packages\System.IO.Compression.ZipFile.4.3.0\lib\net46\System.IO.Compression.ZipFile.dll</HintPath>
79+
</Reference>
80+
<Reference Include="System.IO.FileSystem, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
81+
<HintPath>..\packages\System.IO.FileSystem.4.3.0\lib\net46\System.IO.FileSystem.dll</HintPath>
82+
</Reference>
83+
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
84+
<HintPath>..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
85+
</Reference>
86+
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
87+
<HintPath>..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
88+
</Reference>
89+
<Reference Include="System.Net.Sockets, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
90+
<HintPath>..\packages\System.Net.Sockets.4.3.0\lib\net46\System.Net.Sockets.dll</HintPath>
91+
</Reference>
92+
<Reference Include="System.Numerics" />
93+
<Reference Include="System.Reflection.Metadata, Version=1.4.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
94+
<HintPath>..\packages\System.Reflection.Metadata.1.4.2\lib\portable-net45+win8\System.Reflection.Metadata.dll</HintPath>
95+
</Reference>
96+
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
97+
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
98+
</Reference>
99+
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
100+
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
101+
</Reference>
102+
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
103+
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
104+
</Reference>
105+
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
106+
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
107+
</Reference>
108+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
109+
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
74110
</Reference>
75111
<Reference Include="System.Xml" />
76112
<Reference Include="System.Xml.Linq" />
113+
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
114+
<HintPath>..\packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
115+
</Reference>
77116
</ItemGroup>
78117
<ItemGroup>
79118
<Compile Include="..\GlobalAssemblyInfo.cs">
@@ -82,26 +121,12 @@
82121
<Compile Include="IMultiplier.cs" />
83122
<Compile Include="IAdder.cs" />
84123
<Compile Include="Properties\AssemblyInfo.cs" />
85-
<Compile Include="Properties\orleans.codegen.cs" />
86124
</ItemGroup>
87125
<ItemGroup>
88126
<None Include="app.config" />
89127
<None Include="packages.config" />
90128
</ItemGroup>
91-
<ItemGroup>
92-
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.Analyzers.dll" />
93-
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.Analyzers.1.1.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.Analyzers.dll" />
94-
</ItemGroup>
95129
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
96-
<Import Project="$(SolutionDir)packages\Microsoft.Orleans.Templates.Interfaces.1.1.0\build\Microsoft.Orleans.Templates.Interfaces.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.Orleans.Templates.Interfaces.1.1.0\build\Microsoft.Orleans.Templates.Interfaces.targets')" />
97-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
98-
<PropertyGroup>
99-
<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>
100-
</PropertyGroup>
101-
<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'))" />
102-
<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'))" />
103-
</Target>
104-
<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')" />
105130
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
106131
Other similar extension points exist, see Microsoft.Common.targets.
107132
<Target Name="BeforeBuild">

‎Samples/src/Orleans.Activities.Samples.Arithmetical.GrainInterfaces/app.config

+10-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@
1616
</dependentAssembly>
1717
<dependentAssembly>
1818
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
19-
<bindingRedirect oldVersion="0.0.0.0-1.1.37.0" newVersion="1.1.37.0" />
19+
<bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
20+
</dependentAssembly>
21+
<dependentAssembly>
22+
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral" />
23+
<bindingRedirect oldVersion="0.0.0.0-4.1.2.0" newVersion="4.1.2.0" />
24+
</dependentAssembly>
25+
<dependentAssembly>
26+
<assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
27+
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
2028
</dependentAssembly>
2129
</assemblyBinding>
2230
</runtime>
23-
</configuration>
31+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>

0 commit comments

Comments
 (0)