Upgraded to Akka v1.4.12

ismaelhamed · Nov 28, 2020 · 69c7d9f · 69c7d9f
1 parent 2806090
commit 69c7d9f
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 34 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+#### 0.7.3 November 28 2020 ####
+
+Upgraded to Akka v1.4.12
+
 #### 0.7.2 July 25 2020 ####
 
 NetStandard 2.0

diff --git a/src/Akka.Cluster.Management.Cli/Akka.Cluster.Management.Cli.csproj b/src/Akka.Cluster.Management.Cli/Akka.Cluster.Management.Cli.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.Net.Compilers.Toolset.3.6.0\build\Microsoft.Net.Compilers.Toolset.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.Toolset.3.6.0\build\Microsoft.Net.Compilers.Toolset.props')" />
-  <Import Project="..\packages\Costura.Fody.4.0.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.0.0\build\Costura.Fody.props')" />
+  <Import Project="..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" />
+  <Import Project="..\packages\Microsoft.Net.Compilers.Toolset.3.7.0\build\Microsoft.Net.Compilers.Toolset.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.Toolset.3.7.0\build\Microsoft.Net.Compilers.Toolset.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -55,11 +55,11 @@
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Colorful.Console, Version=1.2.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Colorful.Console.1.2.9\lib\net461\Colorful.Console.dll</HintPath>
+    <Reference Include="Colorful.Console, Version=1.2.11.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Colorful.Console.1.2.11\lib\net461\Colorful.Console.dll</HintPath>
     </Reference>
-    <Reference Include="Costura, Version=4.0.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
-      <HintPath>..\packages\Costura.Fody.4.0.0\lib\net40\Costura.dll</HintPath>
+    <Reference Include="Costura, Version=4.1.0.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
+      <HintPath>..\packages\Costura.Fody.4.1.0\lib\net40\Costura.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.CommandLineUtils, Version=1.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Extensions.CommandLineUtils.1.1.1\lib\net451\Microsoft.Extensions.CommandLineUtils.dll</HintPath>
@@ -68,7 +68,7 @@
       <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.2.8.0\lib\net46\Serilog.dll</HintPath>
+      <HintPath>..\packages\Serilog.2.10.0\lib\net46\Serilog.dll</HintPath>
     </Reference>
     <Reference Include="Serilog.Sinks.Console, Version=3.1.1.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Sinks.Console.3.1.1\lib\net45\Serilog.Sinks.Console.dll</HintPath>
@@ -138,15 +138,15 @@
     </BootstrapperPackage>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\Fody.5.0.6\build\Fody.targets" Condition="Exists('..\packages\Fody.5.0.6\build\Fody.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\Fody.5.0.6\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.5.0.6\build\Fody.targets'))" />
-    <Error Condition="!Exists('..\packages\Costura.Fody.4.0.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.0.0\build\Costura.Fody.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.Toolset.3.6.0\build\Microsoft.Net.Compilers.Toolset.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.Toolset.3.6.0\build\Microsoft.Net.Compilers.Toolset.props'))" />
+    <Error Condition="!Exists('..\packages\Microsoft.Net.Compilers.Toolset.3.7.0\build\Microsoft.Net.Compilers.Toolset.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Net.Compilers.Toolset.3.7.0\build\Microsoft.Net.Compilers.Toolset.props'))" />
+    <Error Condition="!Exists('..\packages\Fody.6.3.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.6.3.0\build\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.4.1.0\build\Costura.Fody.props'))" />
   </Target>
+  <Import Project="..\packages\Fody.6.3.0\build\Fody.targets" Condition="Exists('..\packages\Fody.6.3.0\build\Fody.targets')" />
   <!-- 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.
   <Target Name="BeforeBuild">

diff --git a/src/Akka.Cluster.Management.Cli/App.config b/src/Akka.Cluster.Management.Cli/App.config
@@ -1,17 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" />
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2"/>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0"/>
+        <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.Runtime" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/src/Akka.Cluster.Management.Cli/Properties/AssemblyInfo.cs b/src/Akka.Cluster.Management.Cli/Properties/AssemblyInfo.cs
@@ -30,5 +30,5 @@
 //
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.7.2")]
-[assembly: AssemblyFileVersion("0.7.2")]
+[assembly: AssemblyVersion("0.7.3")]
+[assembly: AssemblyFileVersion("0.7.3")]
diff --git a/src/Akka.Cluster.Management.Cli/packages.config b/src/Akka.Cluster.Management.Cli/packages.config
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Colorful.Console" version="1.2.9" targetFramework="net47" />
-  <package id="Costura.Fody" version="4.0.0" targetFramework="net47" />
-  <package id="Fody" version="5.0.6" targetFramework="net47" developmentDependency="true" />
+  <package id="Colorful.Console" version="1.2.11" targetFramework="net47" />
+  <package id="Costura.Fody" version="4.1.0" targetFramework="net47" />
+  <package id="Fody" version="6.3.0" targetFramework="net47" developmentDependency="true" />
   <package id="Microsoft.Extensions.CommandLineUtils" version="1.1.1" targetFramework="net47" />
-  <package id="Microsoft.Net.Compilers.Toolset" version="3.6.0" targetFramework="net47" developmentDependency="true" />
+  <package id="Microsoft.Net.Compilers.Toolset" version="3.7.0" targetFramework="net47" developmentDependency="true" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net47" />
-  <package id="Serilog" version="2.8.0" targetFramework="net47" />
+  <package id="Serilog" version="2.10.0" targetFramework="net47" />
   <package id="Serilog.Sinks.Console" version="3.1.1" targetFramework="net47" />
   <package id="System.IO" version="4.3.0" targetFramework="net47" />
   <package id="System.Net.Http" version="4.3.4" targetFramework="net47" />

diff --git a/src/Akka.Cluster.Management/Akka.Cluster.Management.csproj b/src/Akka.Cluster.Management/Akka.Cluster.Management.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>8</LangVersion>
-        <PackageVersion>0.7.2</PackageVersion>
+        <PackageVersion>0.7.3</PackageVersion>
         <Title>Akka.Cluster.Management</Title>
         <Authors>Ismael Hamed</Authors>
         <Description>Akka Cluster HTTP Management is a module that allows you interaction with an akka-cluster through an HTTP interface.</Description>
@@ -12,14 +12,16 @@
         <RepositoryUrl>https://github.com/ismaelhamed/akka-cluster-management</RepositoryUrl>
         <PackageTags>akka akka-cluster management operations ops microservices</PackageTags>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+        <Version>0.7.3</Version>
+        <Company />
     </PropertyGroup>
 
     <ItemGroup>
       <EmbeddedResource Include="reference.conf" />
     </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Akka.Cluster.Sharding" Version="1.4.10" />
+    <PackageReference Include="Akka.Cluster.Sharding" Version="1.4.12" />
     <PackageReference Include="Dynamitey" Version="2.0.10.189" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />

diff --git a/src/examples/Akka.Cluster.Management.Host/Akka.Cluster.Management.Host.csproj b/src/examples/Akka.Cluster.Management.Host/Akka.Cluster.Management.Host.csproj
@@ -67,14 +67,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Akka" Version="1.4.10" />
-    <PackageReference Include="Akka.Cluster" Version="1.4.10" />
-    <PackageReference Include="Akka.Cluster.Sharding" Version="1.4.10" />
-    <PackageReference Include="Akka.Cluster.Tools" Version="1.4.10" />
-    <PackageReference Include="Akka.DistributedData" Version="1.4.10" />
-    <PackageReference Include="Akka.Persistence" Version="1.4.10" />
-    <PackageReference Include="Akka.Remote" Version="1.4.10" />
-    <PackageReference Include="Akka.Serialization.Hyperion" Version="1.4.10" />
+    <PackageReference Include="Akka" Version="1.4.12" />
+    <PackageReference Include="Akka.Cluster" Version="1.4.12" />
+    <PackageReference Include="Akka.Cluster.Sharding" Version="1.4.12" />
+    <PackageReference Include="Akka.Cluster.Tools" Version="1.4.12" />
+    <PackageReference Include="Akka.DistributedData" Version="1.4.12" />
+    <PackageReference Include="Akka.Logger.Serilog">
+      <Version>1.4.11</Version>
+    </PackageReference>
+    <PackageReference Include="Akka.Persistence" Version="1.4.12" />
+    <PackageReference Include="Akka.Remote" Version="1.4.12" />
+    <PackageReference Include="Akka.Serialization.Hyperion" Version="1.4.12" />
     <PackageReference Include="Dynamitey" Version="2.0.10.189" />
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />

diff --git a/src/examples/Akka.Cluster.Management.Host/application.conf b/src/examples/Akka.Cluster.Management.Host/application.conf
@@ -4,7 +4,10 @@ cluster-management {
 }
 
 akka {
+    loggers = ["Akka.Logger.Serilog.SerilogLogger, Akka.Logger.Serilog"]
 	loglevel = INFO
+	log-config-on-start = off
+	log-dead-letters-during-shutdown = off
 
 	actor {
 		provider = cluster