Roll Orleans Version to 3.3.0 (#55)

* roll Orleans version to 3.3.0 * add tests for docker-build; fixed Makefile * use tr for lowercasing strings instead of powershell as powershell isn't available on GHA
johnazariah · Oct 13, 2020 · 449f4b4 · 449f4b4
1 parent b7d056f
commit 449f4b4
Show file tree

Hide file tree

Showing 27 changed files with 215 additions and 212 deletions.
diff --git a/Makefile b/Makefile
@@ -82,13 +82,22 @@ clean : clean-packages clean-template-pack
 	@echo Done cleaning
 	@echo
 
-build :
-	dotnet restore            orleans-template-dev.sln
-	dotnet build --no-restore orleans-template-dev.sln
-	dotnet test  --no-build   orleans-template-dev.sln
+build : dn-clean-project dn-restore-project dn-build-project dn-test-project
 	@echo Done Building Projects
 	@echo
 
+dn-clean-project :
+	- dotnet clean orleans-template-dev.sln
+
+dn-restore-project :
+	dotnet restore --force    orleans-template-dev.sln
+
+dn-build-project :
+	dotnet build --no-restore orleans-template-dev.sln
+
+dn-test-project :
+	dotnet test  --no-build   orleans-template-dev.sln
+
 setup-templates : clean-template-pack copy-template-pack pack-template-pack install-template-pack
 	@echo Done Setting Up Templates
 	@echo
@@ -136,8 +145,10 @@ copy-single-template.silo-and-client : copy-single-template.% : copy-common.%
 	$(MAKE) source=$(proto_root)-$(lang)/standalone-client target=$(copy_target_root)/$*-$(lang)/Template.Client copy
 	$(MAKE) src_project_file=standalone-silo/standalone-silo.$(projsuffix)     dest_project_file=$*-$(lang)/Template.Silo/Template.Silo.$(projsuffix)     replace-project-reference-with-nuget-reference
 	$(MAKE) src_project_file=standalone-client/standalone-client.$(projsuffix) dest_project_file=$*-$(lang)/Template.Client/Template.Client.$(projsuffix) replace-project-reference-with-nuget-reference
-	$(MAKE) replace_pattern=_PROJ_SUFFIX_ replacement_pattern=$(projsuffix) replace_in_file=Template.Silo.Makefile    template=$* replace-pattern
-	$(MAKE) replace_pattern=_PROJ_SUFFIX_ replacement_pattern=$(projsuffix) replace_in_file=Template.Client.Makefile  template=$* replace-pattern
+	$(MAKE) replace_pattern=_PROJ_SUFFIX_ replacement_pattern=$(projsuffix) replace_in_file=Template.Silo.Makefile      template=$* replace-pattern
+	$(MAKE) replace_pattern=_PROJ_SUFFIX_ replacement_pattern=$(projsuffix) replace_in_file=Template.Client.Makefile    template=$* replace-pattern
+	$(MAKE) replace_pattern=_PROJ_SUFFIX_ replacement_pattern=$(projsuffix) replace_in_file=Template.Silo.Dockerfile    template=$* replace-pattern
+	$(MAKE) replace_pattern=_PROJ_SUFFIX_ replacement_pattern=$(projsuffix) replace_in_file=Template.Client.Dockerfile  template=$* replace-pattern
 
 copy-common.% : copy-grains.% copy-grain-tests.% copy-templates.% copy-ignores.%
 	@echo Copied Common Components For $* [$(lang)]
@@ -207,7 +218,12 @@ test-template.% : template=$(basename $*)
 test-template.% :
 	$(MAKE) lang=$(lang) template=$(template) test-scratch-project
 
-test-scratch-project : create-scratch-project
+test-scratch-project : create-scratch-project test-dotnet-flow test-docker-flow
+
+test-docker-flow :
+	$(MAKE) -C $(test_install_root)/$(lang)/$(template)/ docker-build
+
+test-dotnet-flow :
 	$(MAKE) -C $(test_install_root)/$(lang)/$(template)/ dotnet-secrets-init dotnet-build dotnet-test
 
 create-scratch-project :

diff --git a/proto-csharp/grain-controllers/grain-controllers.csproj b/proto-csharp/grain-controllers/grain-controllers.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.6" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/proto-csharp/grain-tests/grain-tests.csproj b/proto-csharp/grain-tests/grain-tests.csproj
@@ -10,37 +10,37 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FsCheck.Xunit" Version="2.14.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="FsCheck.Xunit" Version="2.14.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.1.6" />
+    <PackageReference Include="Microsoft.Orleans.TestingHost" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.4.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.6.3" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="1.2.1">
+    <PackageReference Include="coverlet.collector" Version="1.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/proto-csharp/grains/grains.csproj b/proto-csharp/grains/grains.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.6">
+    <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/proto-csharp/standalone-client/standalone-client.csproj b/proto-csharp/standalone-client/standalone-client.csproj
@@ -6,16 +6,16 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Client" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Clustering.AzureStorage" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.6" />
+    <PackageReference Include="Microsoft.Orleans.Client" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Clustering.AzureStorage" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/proto-csharp/standalone-silo/standalone-silo.csproj b/proto-csharp/standalone-silo/standalone-silo.csproj
@@ -20,32 +20,32 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Clustering.AzureStorage" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.OrleansTelemetryConsumers.AI" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Persistence.AzureStorage" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Reminders.AzureStorage" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="3.1.6" />
+    <PackageReference Include="Microsoft.Orleans.Clustering.AzureStorage" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansTelemetryConsumers.AI" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Persistence.AzureStorage" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Reminders.AzureStorage" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Orleans.Clustering.Kubernetes" Version="1.2.2" />
+    <PackageReference Include="Orleans.Clustering.Kubernetes" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/proto-csharp/webapi-directclient/webapi-directclient.csproj b/proto-csharp/webapi-directclient/webapi-directclient.csproj
@@ -20,41 +20,41 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.8" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.14.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.15.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.4.1" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.4.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="5.6.3" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.6.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Client" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Clustering.AzureStorage" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.OrleansTelemetryConsumers.AI" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Persistence.AzureStorage" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Reminders.AzureStorage" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Server" Version="3.1.6" />
+    <PackageReference Include="Microsoft.Orleans.Client" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Clustering.AzureStorage" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansProviders" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansTelemetryConsumers.AI" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Persistence.AzureStorage" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Reminders.AzureStorage" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Runtime.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Server" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Orleans.Clustering.Kubernetes" Version="1.2.2" />
+    <PackageReference Include="Orleans.Clustering.Kubernetes" Version="2.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/proto-fsharp/grain-controllers/grain-controllers.fsproj b/proto-fsharp/grain-controllers/grain-controllers.fsproj
@@ -11,13 +11,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="4.7.1" />
+    <PackageReference Update="FSharp.Core" Version="4.7.2" />
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.6" />
-    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator" Version="3.1.6" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.3.0" />
+    <PackageReference Include="Microsoft.Orleans.OrleansCodeGenerator" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>