Merge pull request #105 from lmagyar/samples-master

Update NuGet packages to v0.3.0
OrleansContrib · May 29, 2017 · cd96e62 · cd96e62
2 parents c595357 + f98787e
commit cd96e62
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 23 deletions.
diff --git a/...ithmetical.GrainInterfaces/Orleans.Activities.Samples.Arithmetical.GrainInterfaces.csproj b/...ithmetical.GrainInterfaces/Orleans.Activities.Samples.Arithmetical.GrainInterfaces.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform>AnyCPU</Platform>
@@ -24,7 +24,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <NoWarn>CSE0001 CSE0003</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,7 +33,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <NoWarn>CSE0001 CSE0003</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">

diff --git a/Samples/src/Orleans.Activities.Samples.Arithmetical.Grains/AdderGrain.cs b/Samples/src/Orleans.Activities.Samples.Arithmetical.Grains/AdderGrain.cs
@@ -40,7 +40,7 @@ protected override Task OnUnhandledExceptionAsync(Exception exception, Activity
         // it is propagated back to the caller. If the workflow persist itself but due to a failure it aborts later and propagates the exception back to the caller,
         // it will be reloaded when the caller repeats the request or by a reactivation reminder. If the caller repeats the call only after the workflow is reloaded and completed,
         // this not a problem, it will get the same output arguments or OperationCanceledException or the exception that caused the workflow to terminate.
-        public async Task<int> AddAsync(int arg1, int arg2)
+        async Task<int> IAdder.AddAsync(int arg1, int arg2)
         {
             // IMPORTANT: Do not copy values from the grain's state into the input arguments, because input arguments will be persisted by the workflow also.
             // Closure directly the necessary values from the incoming public grain method call's parameters into the delegate.

diff --git a/Samples/src/Orleans.Activities.Samples.Arithmetical.Grains/MultiplierGrain.cs b/Samples/src/Orleans.Activities.Samples.Arithmetical.Grains/MultiplierGrain.cs
@@ -48,7 +48,7 @@ protected override Task OnUnhandledExceptionAsync(Exception exception, Activity
         }
 
         // MultiplierGrain only executes the workflow until it gets idle, from that moment the workflow executes in the "background" and calls the Completed event when it completes.
-        public async Task MultiplyAsync(int arg1, int arg2)
+        async Task IMultiplier.MultiplyAsync(int arg1, int arg2)
         {
             // IMPORTANT: Do not copy values from the grain's state into the input arguments, because input arguments will be persisted by the workflow also.
             // Closure directly the necessary values from the incoming public grain method call's parameters into the delegate.
@@ -71,13 +71,13 @@ public override async Task OnActivateAsync()
             subsManager = new ObserverSubscriptionManager<IMultiplierResultReceiver>();
         }
 
-        public Task SubscribeAsync(IMultiplierResultReceiver observer)
+        Task IMultiplier.SubscribeAsync(IMultiplierResultReceiver observer)
         {
             subsManager.Subscribe(observer);
             return Task.CompletedTask;
         }
 
-        public Task UnsubscribeAsync(IMultiplierResultReceiver observer)
+        Task IMultiplier.UnsubscribeAsync(IMultiplierResultReceiver observer)
         {
             subsManager.Unsubscribe(observer);
             return Task.CompletedTask;

diff --git a/...ivities.Samples.Arithmetical.Grains/Orleans.Activities.Samples.Arithmetical.Grains.csproj b/...ivities.Samples.Arithmetical.Grains/Orleans.Activities.Samples.Arithmetical.Grains.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform>AnyCPU</Platform>
@@ -51,7 +51,7 @@
       <HintPath>..\packages\Microsoft.Orleans.Core.1.5.0-beta1\lib\net461\Orleans.dll</HintPath>
     </Reference>
     <Reference Include="Orleans.Activities, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Orleans.Activities.0.3.0-master-10099\lib\net461\Orleans.Activities.dll</HintPath>
+      <HintPath>..\packages\Orleans.Activities.0.3.0\lib\net461\Orleans.Activities.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />

diff --git a/Samples/src/Orleans.Activities.Samples.Arithmetical.Grains/packages.config b/Samples/src/Orleans.Activities.Samples.Arithmetical.Grains/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="Orleans.Activities" version="0.3.0-master-10099" targetFramework="net461" />
+  <package id="Orleans.Activities" version="0.3.0" targetFramework="net461" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />

diff --git a/...ies.Samples.Arithmetical.SiloHost/Orleans.Activities.Samples.Arithmetical.SiloHost.csproj b/...ies.Samples.Arithmetical.SiloHost/Orleans.Activities.Samples.Arithmetical.SiloHost.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform>AnyCPU</Platform>

diff --git a/...s.HelloWorld.GrainInterfaces/Orleans.Activities.Samples.HelloWorld.GrainInterfaces.csproj b/...s.HelloWorld.GrainInterfaces/Orleans.Activities.Samples.HelloWorld.GrainInterfaces.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform>AnyCPU</Platform>
@@ -24,7 +24,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <NoWarn>CSE0001 CSE0003</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -34,7 +33,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
-    <NoWarn>CSE0001 CSE0003</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Extensions.DependencyInjection, Version=1.1.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">

diff --git a/Samples/src/Orleans.Activities.Samples.HelloWorld.Grains/HelloGrain.cs b/Samples/src/Orleans.Activities.Samples.HelloWorld.Grains/HelloGrain.cs
@@ -55,7 +55,7 @@ protected override Task OnUnhandledExceptionAsync(Exception exception, Activity
 
         // The parameter delegate executed when the workflow accepts the incoming call,
         // it can modify the grain's State or do nearly anything a normal grain method can (command pattern).
-        public async Task<string> SayHelloAsync(string greeting)
+        async Task<string> IHello.SayHelloAsync(string greeting)
         {
             Task<string> ProcessRequestAsync(string _request) => Task.FromResult(_request);
             Task<string> CreateResponseAsync(string _responseParameter) => Task.FromResult(_responseParameter);
@@ -74,7 +74,7 @@ await WorkflowInterface.GreetClientAsync(
 
         // The parameter delegate executed when the workflow accepts the incoming call,
         // it can modify the grain's State or do nearly anything a normal grain method can (command pattern).
-        public async Task<string> SayByeAsync()
+        async Task<string> IHello.SayByeAsync()
         {
             Task ProcessRequestAsync() => Task.CompletedTask;
             Task<string> CreateResponseAsync(string _responseParameter) => Task.FromResult(_responseParameter);
@@ -103,8 +103,9 @@ async Task<Func<Task<string>>> IHelloWorkflowCallbackInterface.WhatShouldISayAsy
             Task<string> SomeExternalStuffAsync(string _request) => Task.FromResult(string.IsNullOrEmpty(_request) ? "Who are you?" : "Hello!");
             Task<string> ProcessResponseAsync(string _response) => Task.FromResult(_response);
 
-            Task<string> someExternalStuffTask = SomeExternalStuffAsync(await CreateRequestAsync(clientSaid));
-            return async () => await ProcessResponseAsync(await someExternalStuffTask);
+            string request = await CreateRequestAsync(clientSaid);
+            string response = await SomeExternalStuffAsync(request);
+            return async () => await ProcessResponseAsync(response);
         }
     }
 }
diff --git a/....Activities.Samples.HelloWorld.Grains/Orleans.Activities.Samples.HelloWorld.Grains.csproj b/....Activities.Samples.HelloWorld.Grains/Orleans.Activities.Samples.HelloWorld.Grains.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform>AnyCPU</Platform>
@@ -51,7 +51,7 @@
       <HintPath>..\packages\Microsoft.Orleans.Core.1.5.0-beta1\lib\net461\Orleans.dll</HintPath>
     </Reference>
     <Reference Include="Orleans.Activities, Version=0.3.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Orleans.Activities.0.3.0-master-10099\lib\net461\Orleans.Activities.dll</HintPath>
+      <HintPath>..\packages\Orleans.Activities.0.3.0\lib\net461\Orleans.Activities.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />

diff --git a/Samples/src/Orleans.Activities.Samples.HelloWorld.Grains/packages.config b/Samples/src/Orleans.Activities.Samples.HelloWorld.Grains/packages.config
@@ -7,7 +7,7 @@
   <package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="NETStandard.Library" version="1.6.1" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
-  <package id="Orleans.Activities" version="0.3.0-master-10099" targetFramework="net461" />
+  <package id="Orleans.Activities" version="0.3.0" targetFramework="net461" />
   <package id="System.AppContext" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections" version="4.3.0" targetFramework="net461" />
   <package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />

diff --git a/...ivities.Samples.HelloWorld.SiloHost/Orleans.Activities.Samples.HelloWorld.SiloHost.csproj b/...ivities.Samples.HelloWorld.SiloHost/Orleans.Activities.Samples.HelloWorld.SiloHost.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform>AnyCPU</Platform>

diff --git a/appveyor.yml b/appveyor.yml
@@ -28,7 +28,7 @@
   install:
     - ps: Update-AppveyorBuild -Version "$([regex]::match([IO.File]::ReadAllText("$env:APPVEYOR_BUILD_FOLDER\Samples\src\GlobalAssemblyInfo.cs"), 'AssemblyInformationalVersion\(\"(\d+\.\d+\.\d+)\"\)').Groups[1].Value)$env:APPVEYOR_BUILD_VERSION"
     - ps: Set-AppveyorBuildVariable -Name productversion -Value "$([regex]::match([IO.File]::ReadAllText("$env:APPVEYOR_BUILD_FOLDER\Samples\src\GlobalAssemblyInfo.cs"), 'AssemblyInformationalVersion\(\"(\d+\.\d+\.\d+)\"\)').Groups[1].Value)"
-  os: Visual Studio 2015
+  os: Visual Studio 2017
   configuration: Release
   assembly_info:
     patch: true