diff --git a/build.fsx b/build.fsx index 2108c000062..14c3be2c270 100644 --- a/build.fsx +++ b/build.fsx @@ -29,6 +29,7 @@ let outputBinariesNet45 = outputBinaries @@ "net45" let outputBinariesNetStandard = outputBinaries @@ "netstandard1.6" let buildNumber = environVarOrDefault "BUILD_NUMBER" "0" +let hasTeamCity = (not (buildNumber = "0")) // check if we have the TeamCity environment variable for build # set let preReleaseVersionSuffix = "beta" + (if (not (buildNumber = "0")) then (buildNumber) else DateTime.UtcNow.Ticks.ToString()) let versionSuffix = match (getBuildParam "nugetprerelease") with @@ -61,17 +62,6 @@ Target "AssemblyInfo" (fun _ -> XmlPokeInnerText "./src/common.props" "//Project/PropertyGroup/PackageReleaseNotes" (releaseNotes.Notes |> String.concat "\n") ) -Target "RestorePackages" (fun _ -> - let additionalArgs = if versionSuffix.Length > 0 then [sprintf "/p:VersionSuffix=%s" versionSuffix] else [] - - DotNetCli.Restore - (fun p -> - { p with - Project = solution - NoCache = false - AdditionalArgs = additionalArgs }) -) - Target "Build" (fun _ -> let additionalArgs = if versionSuffix.Length > 0 then [sprintf "/p:VersionSuffix=%s" versionSuffix] else [] @@ -120,18 +110,18 @@ Target "RunTests" (fun _ -> getUnitTestProjects Net let runSingleProject project = + let arguments = + match (hasTeamCity) with + | true -> (sprintf "test -c Release --no-build --logger:trx --logger:\"console;verbosity=normal\" --framework net461 --results-directory %s -- -parallel none -teamcity" (outputTests)) + | false -> (sprintf "test -c Release --no-build --logger:trx --logger:\"console;verbosity=normal\" --framework net461 --results-directory %s -- -parallel none" (outputTests)) + let result = ExecProcess(fun info -> info.FileName <- "dotnet" info.WorkingDirectory <- (Directory.GetParent project).FullName - info.Arguments <- (sprintf "xunit -f net452 -c Release -nobuild -parallel none -teamcity -xml %s_xunit.xml" (outputTests @@ fileNameWithoutExt project))) (TimeSpan.FromMinutes 30.) + info.Arguments <- arguments) (TimeSpan.FromMinutes 30.0) ResultHandling.failBuildIfXUnitReportedError TestRunnerErrorLevel.DontFailBuild result - // dotnet process will be killed by ExecProcess (or throw if can't) ' - // but per https://github.com/xunit/xunit/issues/1338 xunit.console may not - killProcess "xunit.console" - killProcess "dotnet" - CreateDir outputTests projects |> Seq.iter (runSingleProject) ) @@ -149,25 +139,25 @@ Target "RunTestsNetCore" (fun _ -> getUnitTestProjects NetCore let runSingleProject project = + let arguments = + match (hasTeamCity) with + | true -> (sprintf "test -c Release --no-build --logger:trx --logger:\"console;verbosity=normal\" --framework netcoreapp2.1 --results-directory %s -- -parallel none -teamcity" (outputTests)) + | false -> (sprintf "test -c Release --no-build --logger:trx --logger:\"console;verbosity=normal\" --framework netcoreapp2.1 --results-directory %s -- -parallel none" (outputTests)) + let result = ExecProcess(fun info -> info.FileName <- "dotnet" info.WorkingDirectory <- (Directory.GetParent project).FullName - info.Arguments <- (sprintf "xunit -f netcoreapp1.1 -c Release -parallel none -teamcity -xml %s_xunit_netcore.xml" (outputTests @@ fileNameWithoutExt project))) (TimeSpan.FromMinutes 30.) + info.Arguments <- arguments) (TimeSpan.FromMinutes 30.0) ResultHandling.failBuildIfXUnitReportedError TestRunnerErrorLevel.DontFailBuild result - // dotnet process will be killed by FAKE.ExecProcess (or throw if can't) - // but per https://github.com/xunit/xunit/issues/1338 xunit.console may not be killed - killProcess "xunit.console" - killProcess "dotnet" - CreateDir outputTests projects |> Seq.iter (runSingleProject) ) Target "MultiNodeTests" (fun _ -> ActivateFinalTarget "KillCreatedProcesses" - let multiNodeTestPath = findToolInSubPath "Akka.MultiNodeTestRunner.exe" (currentDirectory @@ "src" @@ "core" @@ "Akka.MultiNodeTestRunner" @@ "bin" @@ "Release" @@ "net452") + let multiNodeTestPath = findToolInSubPath "Akka.MultiNodeTestRunner.exe" (currentDirectory @@ "src" @@ "core" @@ "Akka.MultiNodeTestRunner" @@ "bin" @@ "Release" @@ "net461") let multiNodeTestAssemblies = match getBuildParamOrDefault "incremental" "" with @@ -203,7 +193,7 @@ Target "MultiNodeTests" (fun _ -> Target "MultiNodeTestsNetCore" (fun _ -> ActivateFinalTarget "KillCreatedProcesses" - let multiNodeTestPath = findToolInSubPath "Akka.MultiNodeTestRunner.dll" (currentDirectory @@ "src" @@ "core" @@ "Akka.MultiNodeTestRunner" @@ "bin" @@ "Release" @@ "netcoreapp1.1" @@ "win7-x64" @@ "publish") + let multiNodeTestPath = findToolInSubPath "Akka.MultiNodeTestRunner.dll" (currentDirectory @@ "src" @@ "core" @@ "Akka.MultiNodeTestRunner" @@ "bin" @@ "Release" @@ "netcoreapp2.1" @@ "win7-x64" @@ "publish") let multiNodeTestAssemblies = match getBuildParamOrDefault "incremental" "" with @@ -340,7 +330,7 @@ Target "PublishMntr" (fun _ -> Project = project Configuration = configuration Runtime = "win7-x64" - Framework = "net452" + Framework = "net461" VersionSuffix = versionSuffix })) // Windows .NET Core @@ -351,7 +341,7 @@ Target "PublishMntr" (fun _ -> Project = project Configuration = configuration Runtime = "win7-x64" - Framework = "netcoreapp1.1" + Framework = "netcoreapp2.1" VersionSuffix = versionSuffix })) ) @@ -490,14 +480,12 @@ Target "DocFx" (fun _ -> ) FinalTarget "KillCreatedProcesses" (fun _ -> - log "Killing processes started by FAKE:" - startedProcesses |> Seq.iter (fun (pid, _) -> logfn "%i" pid) - killAllCreatedProcesses() - log "Killing any remaining dotnet and xunit.console.exe processes:" - getProcessesByName "dotnet" |> Seq.iter (fun p -> logfn "pid: %i; name: %s" p.Id p.ProcessName) - killProcess "dotnet" - getProcessesByName "xunit.console" |> Seq.iter (fun p -> logfn "pid: %i; name: %s" p.Id p.ProcessName) - killProcess "xunit.console" + log "Shutting down dotnet build-server" + let result = ExecProcess(fun info -> + info.FileName <- "dotnet" + info.WorkingDirectory <- __SOURCE_DIRECTORY__ + info.Arguments <- "build-server shutdown") (System.TimeSpan.FromMinutes 2.0) + if result <> 0 then failwithf "dotnet build-server shutdown failed" ) //-------------------------------------------------------------------------------- @@ -556,13 +544,16 @@ Target "HelpNuget" <| fun _ -> Target "BuildRelease" DoNothing Target "All" DoNothing Target "Nuget" DoNothing +Target "RunTestsFull" DoNothing +Target "RunTestsNetCoreFull" DoNothing // build dependencies -"Clean" ==> "RestorePackages" ==> "AssemblyInfo" ==> "Build" ==> "PublishMntr" ==> "BuildRelease" +"Clean" ==> "AssemblyInfo" ==> "Build" ==> "PublishMntr" ==> "BuildRelease" // tests dependencies -// "RunTests" step doesn't require Clean ==> "RestorePackages" step -"Clean" ==> "RestorePackages" ==> "RunTestsNetCore" +// "RunTests" and "RunTestsNetCore" don't use clean / build so they can be run multiple times, successively, without rebuilding +"Build" ==> "RunTests" ==> "RunTestsFull" +"Build" ==> "RunTestsNetCore" ==> "RunTestsNetCoreFull" // nuget dependencies "BuildRelease" ==> "CreateMntrNuget" ==> "CreateNuget" ==> "PublishNuget" ==> "Nuget" diff --git a/build.ps1 b/build.ps1 index d1c6d528e8b..6a09676c40a 100644 --- a/build.ps1 +++ b/build.ps1 @@ -31,13 +31,13 @@ Param( $FakeVersion = "4.63.0" $NBenchVersion = "1.0.1" -$DotNetChannel = "preview"; -$DotNetVersion = "2.0.0"; +$DotNetChannel = "LTS"; +$DotNetVersion = "2.1.500"; $DotNetInstallerUri = "https://raw.githubusercontent.com/dotnet/cli/v$DotNetVersion/scripts/obtain/dotnet-install.ps1"; $NugetVersion = "4.3.0"; $NugetUrl = "https://dist.nuget.org/win-x86-commandline/v$NugetVersion/nuget.exe" $ProtobufVersion = "3.4.0" -$DocfxVersion = "2.21.1" +$DocfxVersion = "2.40.5" # Make sure tools folder exists $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent diff --git a/build.sh b/build.sh index e413226493b..8062cd2daaa 100755 --- a/build.sh +++ b/build.sh @@ -11,8 +11,9 @@ NUGET_URL=https://dist.nuget.org/win-x86-commandline/v4.3.0/nuget.exe FAKE_VERSION=4.63.0 FAKE_EXE=$TOOLS_DIR/FAKE/tools/FAKE.exe DOTNET_EXE=$SCRIPT_DIR/.dotnet/dotnet -DOTNET_VERSION=1.1.0 +DOTNET_VERSION=2.1.500 DOTNET_INSTALLER_URL=https://raw.githubusercontent.com/dotnet/cli/v$DOTNET_VERSION/scripts/obtain/dotnet-install.sh +DOTNET_CHANNEL=LTS PROTOBUF_VERSION=3.4.0 # Define default arguments. @@ -44,15 +45,12 @@ fi # INSTALL .NET CORE CLI ########################################################################### -if [ ! -f "$DOTNET_EXE" ]; then - echo "Installing .NET CLI..." - if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then - mkdir "$SCRIPT_DIR/.dotnet" - fi - curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" $DOTNET_INSTALLER_URL - bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --install-dir .dotnet --no-path +echo "Installing .NET CLI..." +if [ ! -d "$SCRIPT_DIR/.dotnet" ]; then + mkdir "$SCRIPT_DIR/.dotnet" fi - +curl -Lsfo "$SCRIPT_DIR/.dotnet/dotnet-install.sh" $DOTNET_INSTALLER_URL +bash "$SCRIPT_DIR/.dotnet/dotnet-install.sh" --version $DOTNET_VERSION --channel $DOTNET_CHANNEL --install-dir .dotnet --no-path export PATH="$SCRIPT_DIR/.dotnet":$PATH export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 export DOTNET_CLI_TELEMETRY_OPTOUT=1 diff --git a/buildIncremental.fsx b/buildIncremental.fsx index c28db9b3d15..9742ae09704 100644 --- a/buildIncremental.fsx +++ b/buildIncremental.fsx @@ -23,6 +23,7 @@ module IncrementalTests = let SkippedTest name runtime = match (name, runtime) with | (EndsWith "Sqlite.Tests.csproj", NetCore) -> false + | (EndsWith "API.Tests.csproj", NetCore) -> false | _ -> true @@ -124,7 +125,7 @@ module IncrementalTests = let getAssemblyForProject project = try - !! ("src" @@ "**" @@ "bin" @@ "Release" @@ "net452" @@ fileNameWithoutExt project + ".dll") + !! ("src" @@ "**" @@ "bin" @@ "Release" @@ "net461" @@ fileNameWithoutExt project + ".dll") |> Seq.head with | :? System.ArgumentException as ex -> @@ -133,7 +134,7 @@ module IncrementalTests = let getNetCoreAssemblyForProject project = try - !! ("src" @@ "**" @@ "bin" @@ "Release" @@ "netcoreapp1.1" @@ fileNameWithoutExt project + ".dll") + !! ("src" @@ "**" @@ "bin" @@ "Release" @@ "netcoreapp2.1" @@ fileNameWithoutExt project + ".dll") |> Seq.head with | :? System.ArgumentException as ex -> diff --git a/src/Akka.sln b/src/Akka.sln index 1df2814800f..7c34c20b4d8 100644 --- a/src/Akka.sln +++ b/src/Akka.sln @@ -186,9 +186,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Cluster.Simple", "e EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples.Cluster.Transformation", "examples\Cluster\Roles\Samples.Cluster.Transformation\Samples.Cluster.Transformation.csproj", "{01B074DB-67C8-4600-8CE2-DAAAFC052261}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Akka.FSharp", "core\Akka.FSharp\Akka.FSharp.fsproj", "{483B4579-2665-49FC-A7E4-42C67FEC7531}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Akka.FSharp", "core/Akka.FSharp/Akka.FSharp.fsproj", "{483B4579-2665-49FC-A7E4-42C67FEC7531}" EndProject -Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Akka.FSharp.Tests", "core\Akka.FSharp.Tests\Akka.FSharp.Tests.fsproj", "{FA2E30CC-9F2D-4BFC-9899-347B32DF7181}" +Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Akka.FSharp.Tests", "core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj", "{FA2E30CC-9F2D-4BFC-9899-347B32DF7181}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Akka.Benchmarks", "benchmark\Akka.Benchmarks\Akka.Benchmarks.csproj", "{A1D57384-A933-480A-9DF4-FA5E60AB1A67}" EndProject diff --git a/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj b/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj index 916589fdc84..446ad253d0e 100644 --- a/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj +++ b/src/benchmark/Akka.Benchmarks/Akka.Benchmarks.csproj @@ -1,13 +1,14 @@ - + + Exe - netcoreapp2.0 + $(NetCoreTestVersion) - + diff --git a/src/benchmark/PersistenceBenchmark/PersistenceBenchmark.csproj b/src/benchmark/PersistenceBenchmark/PersistenceBenchmark.csproj index 637e860d578..e0fb6df0799 100644 --- a/src/benchmark/PersistenceBenchmark/PersistenceBenchmark.csproj +++ b/src/benchmark/PersistenceBenchmark/PersistenceBenchmark.csproj @@ -1,8 +1,9 @@  + Exe - net452 + $(NetFrameworkTestVersion) true win7-x64 @@ -16,7 +17,7 @@ - + $(DefineConstants);THREADS diff --git a/src/benchmark/PingPong/PingPong.csproj b/src/benchmark/PingPong/PingPong.csproj index ac990b1fb79..b4a2ae78e77 100644 --- a/src/benchmark/PingPong/PingPong.csproj +++ b/src/benchmark/PingPong/PingPong.csproj @@ -1,8 +1,8 @@  - + Exe - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) true @@ -14,11 +14,11 @@ - + - + $(DefineConstants);THREADS diff --git a/src/benchmark/RemotePingPong/RemotePingPong.csproj b/src/benchmark/RemotePingPong/RemotePingPong.csproj index a82a339500c..1d92044ce8f 100644 --- a/src/benchmark/RemotePingPong/RemotePingPong.csproj +++ b/src/benchmark/RemotePingPong/RemotePingPong.csproj @@ -1,13 +1,12 @@  - + Akka.Remote x-plat performance benchmark Copyright (c) Akka.NET Team RemotePingPong RemotePingPong - 1.3.0 Akka.NET Team - net461;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) Exe diff --git a/src/benchmark/SpawnBenchmark/SpawnBenchmark.csproj b/src/benchmark/SpawnBenchmark/SpawnBenchmark.csproj index 0f28f9e2a98..ca6728de21f 100644 --- a/src/benchmark/SpawnBenchmark/SpawnBenchmark.csproj +++ b/src/benchmark/SpawnBenchmark/SpawnBenchmark.csproj @@ -1,8 +1,8 @@  - + Exe - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) true diff --git a/src/common.props b/src/common.props index c604b1bc4ec..42c40094196 100644 --- a/src/common.props +++ b/src/common.props @@ -1,6 +1,6 @@ - Copyright © 2013-2018 Akka.NET Team + Copyright © 2013-2019 Akka.NET Team Akka.NET Team 1.4.0 http://getakka.net/images/akkalogo.png @@ -10,8 +10,15 @@ 2.3.1 - 15.7.2 + 15.9.0 0.9.8 + 9.0.1 + netcoreapp2.1 + net461 + netstandard2.0 + net452 + 4.14.0 + 2.9.0 akka;actors;actor model;Akka;concurrency diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/Akka.Cluster.Sharding.Tests.MultiNode.csproj b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/Akka.Cluster.Sharding.Tests.MultiNode.csproj index ffbf5974448..128bd5e638e 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/Akka.Cluster.Sharding.Tests.MultiNode.csproj +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests.MultiNode/Akka.Cluster.Sharding.Tests.MultiNode.csproj @@ -3,7 +3,7 @@ Akka.Cluster.Sharding - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -18,19 +18,18 @@ - - + - + $(DefineConstants); - + $(DefineConstants);CORECLR diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/Akka.Cluster.Sharding.Tests.csproj b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/Akka.Cluster.Sharding.Tests.csproj index d8a393b1669..c6f9cec26fd 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/Akka.Cluster.Sharding.Tests.csproj +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/Akka.Cluster.Sharding.Tests.csproj @@ -3,7 +3,7 @@ Akka.Cluster.Sharding.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -17,24 +17,19 @@ - - + - + - - - - - + $(DefineConstants);SERIALIZABLE - + $(DefineConstants);CORECLR diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingConfigSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingConfigSpec.cs index 18152aa79cc..ab00d9f6c8a 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingConfigSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingConfigSpec.cs @@ -19,7 +19,8 @@ public ClusterShardingConfigSpec() : base(GetConfig()) public static Config GetConfig() { - return ConfigurationFactory.ParseString("akka.actor.provider = \"Akka.Cluster.ClusterActorRefProvider, Akka.Cluster\""); + return ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0"); } [Fact] diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingInternalsSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingInternalsSpec.cs index bee6a932e0d..9755c33db97 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingInternalsSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ClusterShardingInternalsSpec.cs @@ -47,7 +47,8 @@ private string ExtractShardId(object message) public static Config GetConfig() { - return ConfigurationFactory.ParseString("akka.actor.provider = cluster") + return ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0") .WithFallback(Sharding.ClusterSharding.DefaultConfig()) .WithFallback(DistributedData.DistributedData.DefaultConfig()) diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/DDataClusterShardingConfigSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/DDataClusterShardingConfigSpec.cs index 1be6e6defa7..ca061981245 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/DDataClusterShardingConfigSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/DDataClusterShardingConfigSpec.cs @@ -28,6 +28,7 @@ public static Config GetConfig() { return ConfigurationFactory.ParseString(@"akka.actor.provider = ""Akka.Cluster.ClusterActorRefProvider, Akka.Cluster"" akka.cluster.sharding.state-store-mode = ddata + akka.remote.dot-netty.tcp.port = 0 "); } diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/GetShardTypeNamesSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/GetShardTypeNamesSpec.cs index d86e7f5eb1f..698f4853eb9 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/GetShardTypeNamesSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/GetShardTypeNamesSpec.cs @@ -22,7 +22,8 @@ public GetShardTypeNamesSpec() : base(GetConfig()) public static Config GetConfig() { - return ConfigurationFactory.ParseString("akka.actor.provider = cluster") + return ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0") .WithFallback(Sharding.ClusterSharding.DefaultConfig()) .WithFallback(DistributedData.DistributedData.DefaultConfig()) diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/InactiveEntityPassivationSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/InactiveEntityPassivationSpec.cs index a365de35051..ed115848bba 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/InactiveEntityPassivationSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/InactiveEntityPassivationSpec.cs @@ -89,7 +89,8 @@ public static Config GetConfig() return ConfigurationFactory.ParseString(@" akka.loglevel = INFO akka.actor.provider = cluster - akka.cluster.sharding.passivate-idle-entity-after = 3s") + akka.cluster.sharding.passivate-idle-entity-after = 3s + akka.remote.dot-netty.tcp.port = 0") .WithFallback(ClusterSharding.DefaultConfig()) .WithFallback(ClusterSingletonManager.DefaultConfig()); } diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ProxyShardingSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ProxyShardingSpec.cs index c4c7c971458..31868e7675c 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ProxyShardingSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/ProxyShardingSpec.cs @@ -64,7 +64,8 @@ private string ShardResolver(object message) public static Config GetConfig() { - return ConfigurationFactory.ParseString("akka.actor.provider = cluster") + return ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0") .WithFallback(Sharding.ClusterSharding.DefaultConfig()) .WithFallback(DistributedData.DistributedData.DefaultConfig()) diff --git a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/SupervisionSpec.cs b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/SupervisionSpec.cs index 18e505fd087..f2fb8ca2b4e 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding.Tests/SupervisionSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Sharding.Tests/SupervisionSpec.cs @@ -98,7 +98,9 @@ public SupervisionSpec() : base(GetConfig()) public static Config GetConfig() { - return ConfigurationFactory.ParseString("akka.actor.provider = cluster \r\n akka.loglevel = INFO") + return ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.loglevel = INFO + akka.remote.dot-netty.tcp.port = 0") .WithFallback(ClusterSharding.DefaultConfig()); } diff --git a/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj b/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj index 1d834cc35aa..625318a2204 100644 --- a/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj +++ b/src/contrib/cluster/Akka.Cluster.Sharding/Akka.Cluster.Sharding.csproj @@ -5,10 +5,9 @@ Akka.Cluster.Sharding Sharded actors with managed lifecycle for Akka.NET cluster beta - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);network;cluster;sharding true - 1.6.1 @@ -18,17 +17,17 @@ - + - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Akka.Cluster.Tools.Tests.MultiNode.csproj b/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Akka.Cluster.Tools.Tests.MultiNode.csproj index d3e2724444a..8278c8d290d 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Akka.Cluster.Tools.Tests.MultiNode.csproj +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests.MultiNode/Akka.Cluster.Tools.Tests.MultiNode.csproj @@ -3,7 +3,7 @@ Akka.Cluster.Tools.Tests.MultiNode - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -16,15 +16,14 @@ - - + - + $(DefineConstants);CORECLR diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Akka.Cluster.Tools.Tests.csproj b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Akka.Cluster.Tools.Tests.csproj index e3accb2e180..20048c0e0a5 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Akka.Cluster.Tools.Tests.csproj +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Akka.Cluster.Tools.Tests.csproj @@ -3,7 +3,7 @@ Akka.Cluster.Tools.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,19 +15,14 @@ - - + - - - - - + $(DefineConstants);SERIALIZABLE - + $(DefineConstants);CORECLR diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/ClusterClient/ClusterClientConfigSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/ClusterClient/ClusterClientConfigSpec.cs index 92da28ebefb..6c0993541aa 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/ClusterClient/ClusterClientConfigSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/ClusterClient/ClusterClientConfigSpec.cs @@ -25,7 +25,8 @@ public ClusterClientConfigSpec() : base(GetConfig()) public static Config GetConfig() { - return ConfigurationFactory.ParseString("akka.actor.provider = \"Akka.Cluster.ClusterActorRefProvider, Akka.Cluster\""); + return ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0"); } [Fact] diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/ClusterClient/ClusterClientMessageSerializerSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/ClusterClient/ClusterClientMessageSerializerSpec.cs index 9f81fb74545..4af424407ba 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/ClusterClient/ClusterClientMessageSerializerSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/ClusterClient/ClusterClientMessageSerializerSpec.cs @@ -18,7 +18,9 @@ namespace Akka.Cluster.Tools.Tests.ClusterClient public class ClusterClientMessageSerializerSpec : AkkaSpec { public ClusterClientMessageSerializerSpec() - : base(ConfigurationFactory.ParseString(@"akka.actor.provider = cluster").WithFallback(ClusterClientReceptionist.DefaultConfig())) + : base(ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0") + .WithFallback(ClusterClientReceptionist.DefaultConfig())) { } diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubConfigSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubConfigSpec.cs index 341aa823f79..5fc229dc3c6 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubConfigSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubConfigSpec.cs @@ -24,7 +24,8 @@ public DistributedPubSubConfigSpec() : base(GetConfig()) public static Config GetConfig() { return ConfigurationFactory.ParseString(@"akka.actor.provider = cluster - akka.extensions = [""Akka.Cluster.Tools.PublishSubscribe.DistributedPubSubExtensionProvider,Akka.Cluster.Tools""]"); + akka.extensions = [""Akka.Cluster.Tools.PublishSubscribe.DistributedPubSubExtensionProvider,Akka.Cluster.Tools""] + akka.remote.dot-netty.tcp.port = 0"); } [Fact] diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubMediatorRouterSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubMediatorRouterSpec.cs index 49b71fa34d6..04b4f034291 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubMediatorRouterSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/PublishSubscribe/DistributedPubSubMediatorRouterSpec.cs @@ -211,8 +211,8 @@ public static Config GetConfig(string routingLogic) { return ConfigurationFactory.ParseString($@" akka.loglevel = INFO - akka.actor.provider = ""Akka.Cluster.ClusterActorRefProvider, Akka.Cluster"" - akka.remote.netty.tcp.port = 0 + akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0 akka.remote.log-remote-lifecycle-events = off akka.cluster.pub-sub.routing-logic = {routingLogic} "); diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonConfigSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonConfigSpec.cs index 8f111b975b9..fdc89aba3e8 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonConfigSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonConfigSpec.cs @@ -21,7 +21,8 @@ public ClusterSingletonConfigSpec() : base(GetConfig()) public static Config GetConfig() { - return ConfigurationFactory.ParseString("akka.actor.provider = \"Akka.Cluster.ClusterActorRefProvider, Akka.Cluster\""); + return ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0"); } [Fact] diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonMessageSerializerSpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonMessageSerializerSpec.cs index 174a04d1b6d..6388be5aebf 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonMessageSerializerSpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonMessageSerializerSpec.cs @@ -16,7 +16,8 @@ namespace Akka.Cluster.Tools.Tests.Singleton public class ClusterSingletonMessageSerializerSpec : AkkaSpec { public ClusterSingletonMessageSerializerSpec() - : base(ConfigurationFactory.ParseString(@"akka.actor.provider = cluster").WithFallback(ClusterSingletonManager.DefaultConfig())) + : base(ConfigurationFactory.ParseString(@"akka.actor.provider = cluster + akka.remote.dot-netty.tcp.port = 0").WithFallback(ClusterSingletonManager.DefaultConfig())) { } diff --git a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonProxySpec.cs b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonProxySpec.cs index 529dccf4b79..0b1ad73d5fe 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonProxySpec.cs +++ b/src/contrib/cluster/Akka.Cluster.Tools.Tests/Singleton/ClusterSingletonProxySpec.cs @@ -91,8 +91,8 @@ public void TestProxy(string msg) dot-netty.tcp { hostname = ""127.0.0.1"" - port = 0 - } + port = 0 + } } }"; } diff --git a/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj b/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj index 58f0a829e92..5586e6802ff 100644 --- a/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj +++ b/src/contrib/cluster/Akka.Cluster.Tools/Akka.Cluster.Tools.csproj @@ -4,10 +4,9 @@ Akka.Cluster.Tools Distributed publish/subscribe, client and singleton support for Akka.NET cluster - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);network;cluster true - 1.6.1 @@ -15,11 +14,11 @@ - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj b/src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj index ab5b75aafda..a8686f8d5ff 100644 --- a/src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj +++ b/src/contrib/cluster/Akka.DistributedData.LightningDB/Akka.DistributedData.LightningDB.csproj @@ -5,7 +5,7 @@ Akka.DistributedData.LightningDB Replicated data using CRDT structures beta - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);network;cluster;crdt;replication;lightningdb;lmdb true 1.6.1 diff --git a/src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Akka.DistributedData.Tests.MultiNode.csproj b/src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Akka.DistributedData.Tests.MultiNode.csproj index f5141f0f942..fbf15e8714f 100644 --- a/src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Akka.DistributedData.Tests.MultiNode.csproj +++ b/src/contrib/cluster/Akka.DistributedData.Tests.MultiNode/Akka.DistributedData.Tests.MultiNode.csproj @@ -3,7 +3,7 @@ Akka.DistributedData.Tests.MultiNode - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -16,15 +16,14 @@ - - + - + $(DefineConstants);CORECLR diff --git a/src/contrib/cluster/Akka.DistributedData.Tests/Akka.DistributedData.Tests.csproj b/src/contrib/cluster/Akka.DistributedData.Tests/Akka.DistributedData.Tests.csproj index 963601f1b08..06984b8331c 100644 --- a/src/contrib/cluster/Akka.DistributedData.Tests/Akka.DistributedData.Tests.csproj +++ b/src/contrib/cluster/Akka.DistributedData.Tests/Akka.DistributedData.Tests.csproj @@ -3,7 +3,7 @@ Akka.DistributedData.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -16,15 +16,14 @@ - - + - + $(DefineConstants);SERIALIZABLE diff --git a/src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj b/src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj index 078bab4bcca..fc127771050 100644 --- a/src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj +++ b/src/contrib/cluster/Akka.DistributedData/Akka.DistributedData.csproj @@ -5,7 +5,7 @@ Akka.DistributedData Replicated data using CRDT structures beta - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);network;cluster;crdt;replication true 1.6.1 @@ -20,11 +20,11 @@ - + $(DefineConstants);SERIALIZATION;CLONABLE - + $(DefineConstants);CORECLR diff --git a/src/contrib/dependencyinjection/Akka.DI.Core/Akka.DI.Core.csproj b/src/contrib/dependencyinjection/Akka.DI.Core/Akka.DI.Core.csproj index a621657c779..3bc3ed189b9 100644 --- a/src/contrib/dependencyinjection/Akka.DI.Core/Akka.DI.Core.csproj +++ b/src/contrib/dependencyinjection/Akka.DI.Core/Akka.DI.Core.csproj @@ -4,7 +4,7 @@ Akka.DI.Core Dependency injection support for Akka.NET - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);dependency injection true 1.6.1 @@ -14,11 +14,11 @@ - + $(DefineConstants);APPDOMAIN - + $(DefineConstants);CORECLR @@ -26,7 +26,7 @@ $(DefineConstants);RELEASE - + diff --git a/src/contrib/dependencyinjection/Akka.DI.TestKit/Akka.DI.TestKit.csproj b/src/contrib/dependencyinjection/Akka.DI.TestKit/Akka.DI.TestKit.csproj index 8854150f544..0313b37950a 100644 --- a/src/contrib/dependencyinjection/Akka.DI.TestKit/Akka.DI.TestKit.csproj +++ b/src/contrib/dependencyinjection/Akka.DI.TestKit/Akka.DI.TestKit.csproj @@ -4,7 +4,7 @@ Akka.DI.TestKit Dependency Injection (DI) TestKit support for Akka.NET - net452;netstandard1.6 + net452;$(NetStandardLibVersion) $(AkkaPackageTags);dependency injection;testkit true 1.6.1 @@ -19,7 +19,7 @@ $(DefineConstants);APPDOMAIN - + $(DefineConstants);CORECLR @@ -27,7 +27,7 @@ $(DefineConstants);RELEASE - + diff --git a/src/contrib/persistence/Akka.Persistence.Query.Sql/Akka.Persistence.Query.Sql.csproj b/src/contrib/persistence/Akka.Persistence.Query.Sql/Akka.Persistence.Query.Sql.csproj index 653f9eeb5bc..993a74ecd6a 100644 --- a/src/contrib/persistence/Akka.Persistence.Query.Sql/Akka.Persistence.Query.Sql.csproj +++ b/src/contrib/persistence/Akka.Persistence.Query.Sql/Akka.Persistence.Query.Sql.csproj @@ -4,7 +4,7 @@ Akka.Persistence.Query.Sql Akka.NET streams support for ADO.NET Persistence middleware. - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);persistence;eventsource;sql;reactive;streams true 1.6.1 @@ -17,16 +17,16 @@ - + - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/contrib/persistence/Akka.Persistence.Sql.Common/Akka.Persistence.Sql.Common.csproj b/src/contrib/persistence/Akka.Persistence.Sql.Common/Akka.Persistence.Sql.Common.csproj index 06071c4acdc..ba0b5f1b957 100644 --- a/src/contrib/persistence/Akka.Persistence.Sql.Common/Akka.Persistence.Sql.Common.csproj +++ b/src/contrib/persistence/Akka.Persistence.Sql.Common/Akka.Persistence.Sql.Common.csproj @@ -4,30 +4,29 @@ Akka.Persistence.Sql.Common Akka.NET Persistence ADO.NET middleware - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);persistence;eventsource;sql true - 1.6.1 - + - + - + $(DefineConstants);SERIALIZATION;CONFIGURATION - + $(DefineConstants);CORECLR diff --git a/src/contrib/persistence/Akka.Persistence.Sql.TestKit/Akka.Persistence.Sql.TestKit.csproj b/src/contrib/persistence/Akka.Persistence.Sql.TestKit/Akka.Persistence.Sql.TestKit.csproj index 28865a6ba09..d772d3538ac 100644 --- a/src/contrib/persistence/Akka.Persistence.Sql.TestKit/Akka.Persistence.Sql.TestKit.csproj +++ b/src/contrib/persistence/Akka.Persistence.Sql.TestKit/Akka.Persistence.Sql.TestKit.csproj @@ -4,28 +4,23 @@ Akka.Persistence.Sql.TestKit Akka.NET TestKit for SQL-based ADO.NET Persistence middleware - net452;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);persistence;testkit;eventsource;sql;reactive;streams true - 1.6.1 - + - - - - - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Akka.Persistence.Sqlite.Tests.csproj b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Akka.Persistence.Sqlite.Tests.csproj index 7c58f6f0012..3f8afe91d6c 100644 --- a/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Akka.Persistence.Sqlite.Tests.csproj +++ b/src/contrib/persistence/Akka.Persistence.Sqlite.Tests/Akka.Persistence.Sqlite.Tests.csproj @@ -3,9 +3,8 @@ Akka.Persistence.Sqlite.Tests - net452;netcoreapp1.1 - win7-x64 - $(PackageTargetFallback);portable-net45+win8 + $(NetCoreTestVersion) + win7-x64 @@ -23,15 +22,10 @@ - - + - - - - - + $(DefineConstants);SERIALIZABLE diff --git a/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj b/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj index 2f14615a662..3a72b8017f8 100644 --- a/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj +++ b/src/contrib/persistence/Akka.Persistence.Sqlite/Akka.Persistence.Sqlite.csproj @@ -4,7 +4,7 @@ Akka.Persistence.Sqlite Akka.NET Persistence journal and snapshot store backed by SQLite. - net451;netstandard1.6 + $(NetStandardLibVersion) $(AkkaPackageTags);persistence;eventsource;sql;sqlite true @@ -16,7 +16,7 @@ - + diff --git a/src/contrib/serializers/Akka.Serialization.Hyperion.Tests/Akka.Serialization.Hyperion.Tests.csproj b/src/contrib/serializers/Akka.Serialization.Hyperion.Tests/Akka.Serialization.Hyperion.Tests.csproj index c7314d90acb..3c5a50b5785 100644 --- a/src/contrib/serializers/Akka.Serialization.Hyperion.Tests/Akka.Serialization.Hyperion.Tests.csproj +++ b/src/contrib/serializers/Akka.Serialization.Hyperion.Tests/Akka.Serialization.Hyperion.Tests.csproj @@ -2,7 +2,7 @@ Akka.Serialization.Hyperion.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,11 +15,10 @@ - - + - + diff --git a/src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj b/src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj index c8c99e51230..a0917c8f475 100644 --- a/src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj +++ b/src/contrib/serializers/Akka.Serialization.Hyperion/Akka.Serialization.Hyperion.csproj @@ -4,7 +4,7 @@ Akka.Serialization.Hyperion Hyperion serializer for Akka.NET beta - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);hyperion;serializer;serialize true @@ -13,15 +13,15 @@ - + - + - + $(DefineConstants);SERIALIZATION diff --git a/src/contrib/serializers/Akka.Serialization.TestKit/Akka.Serialization.TestKit.csproj b/src/contrib/serializers/Akka.Serialization.TestKit/Akka.Serialization.TestKit.csproj index 6ae6fb761db..7e406ff7f92 100644 --- a/src/contrib/serializers/Akka.Serialization.TestKit/Akka.Serialization.TestKit.csproj +++ b/src/contrib/serializers/Akka.Serialization.TestKit/Akka.Serialization.TestKit.csproj @@ -5,7 +5,7 @@ Akka.Serialization.TestKit Serialization TestKit for Akka.NET beta - net452;netstandard1.6 + net452;$(NetCoreTestVersion) $(AkkaPackageTags);hyperion;serializer;serialize;testkit true diff --git a/src/contrib/testkits/Akka.TestKit.Xunit/Akka.TestKit.Xunit.csproj b/src/contrib/testkits/Akka.TestKit.Xunit/Akka.TestKit.Xunit.csproj index a7bd02a4db8..c594b160fad 100644 --- a/src/contrib/testkits/Akka.TestKit.Xunit/Akka.TestKit.Xunit.csproj +++ b/src/contrib/testkits/Akka.TestKit.Xunit/Akka.TestKit.Xunit.csproj @@ -4,7 +4,7 @@ Akka.TestKit.Xunit TestKit for writing tests for Akka.NET using xUnit. - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);testkit;xunit true 1.6.1 diff --git a/src/contrib/testkits/Akka.TestKit.Xunit2/Akka.TestKit.Xunit2.csproj b/src/contrib/testkits/Akka.TestKit.Xunit2/Akka.TestKit.Xunit2.csproj index 360da43c7be..dec2335eea0 100644 --- a/src/contrib/testkits/Akka.TestKit.Xunit2/Akka.TestKit.Xunit2.csproj +++ b/src/contrib/testkits/Akka.TestKit.Xunit2/Akka.TestKit.Xunit2.csproj @@ -4,7 +4,7 @@ Akka.TestKit.Xunit2 TestKit for writing tests for Akka.NET using xUnit. - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);testkit;xunit true 1.6.1 diff --git a/src/contrib/transports/Akka.Remote.Transport.Helios/Akka.Remote.Transport.Helios.csproj b/src/contrib/transports/Akka.Remote.Transport.Helios/Akka.Remote.Transport.Helios.csproj index c71be12442e..37c6a89624f 100644 --- a/src/contrib/transports/Akka.Remote.Transport.Helios/Akka.Remote.Transport.Helios.csproj +++ b/src/contrib/transports/Akka.Remote.Transport.Helios/Akka.Remote.Transport.Helios.csproj @@ -4,7 +4,7 @@ Akka.Remote.Transport.Helios (Legacy) Akka.NET remote transport layer based on Helios. - net45 + $(NetFrameworkLibVersion) $(AkkaPackageTags);transport;helios true diff --git a/src/core/Akka.API.Tests/Akka.API.Tests.csproj b/src/core/Akka.API.Tests/Akka.API.Tests.csproj index cf2293f76f0..40b1ec0dcfa 100644 --- a/src/core/Akka.API.Tests/Akka.API.Tests.csproj +++ b/src/core/Akka.API.Tests/Akka.API.Tests.csproj @@ -3,19 +3,9 @@ Akka.API.Tests - net452 + $(NetFrameworkTestVersion) - - - - - - - - - - - + Always @@ -54,17 +44,12 @@ - - - - - $(DefineConstants);RELEASE diff --git a/src/core/Akka.API.Tests/CoreAPISpec.ApproveCluster.approved.txt b/src/core/Akka.API.Tests/CoreAPISpec.ApproveCluster.approved.txt index 96ac4d2ebe0..d438cb5f2a0 100644 --- a/src/core/Akka.API.Tests/CoreAPISpec.ApproveCluster.approved.txt +++ b/src/core/Akka.API.Tests/CoreAPISpec.ApproveCluster.approved.txt @@ -9,7 +9,7 @@ [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("Akka.Cluster.Tools.Tests.MultiNode")] [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly: System.Runtime.InteropServices.GuidAttribute("0e3e691b-0c31-4718-9b1a-d749b93208c9")] -[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")] +[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")] namespace Akka.Cluster { public sealed class AutoDowning : Akka.Cluster.IDowningProvider diff --git a/src/core/Akka.API.Tests/CoreAPISpec.ApproveClusterTools.approved.txt b/src/core/Akka.API.Tests/CoreAPISpec.ApproveClusterTools.approved.txt index 799b5d96766..6a2ba0b221c 100644 --- a/src/core/Akka.API.Tests/CoreAPISpec.ApproveClusterTools.approved.txt +++ b/src/core/Akka.API.Tests/CoreAPISpec.ApproveClusterTools.approved.txt @@ -2,7 +2,7 @@ [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("Akka.Cluster.Tools.Tests.MultiNode")] [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly: System.Runtime.InteropServices.GuidAttribute("5cf8a8be-b634-473f-bb01-eba878746bd4")] -[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")] +[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")] namespace Akka.Cluster.Tools.Client { public sealed class ClusterClient : Akka.Actor.ActorBase diff --git a/src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt b/src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt index 7ea96c9703e..b5569de9eb1 100644 --- a/src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt +++ b/src/core/Akka.API.Tests/CoreAPISpec.ApproveCore.approved.txt @@ -16,7 +16,7 @@ [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("Akka.Tests.Performance")] [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly: System.Runtime.InteropServices.GuidAttribute("1a5cab08-b032-49ca-8db3-9428c5a9db14")] -[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")] +[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")] namespace Akka.Actor { public abstract class ActorBase : Akka.Actor.IInternalActor diff --git a/src/core/Akka.API.Tests/CoreAPISpec.ApprovePersistence.approved.txt b/src/core/Akka.API.Tests/CoreAPISpec.ApprovePersistence.approved.txt index 2389db69aa1..4297c90f1bd 100644 --- a/src/core/Akka.API.Tests/CoreAPISpec.ApprovePersistence.approved.txt +++ b/src/core/Akka.API.Tests/CoreAPISpec.ApprovePersistence.approved.txt @@ -2,7 +2,7 @@ [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("Akka.Persistence.Tests")] [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly: System.Runtime.InteropServices.GuidAttribute("e3bcba88-003c-4cda-8a60-f0c2553fe3c8")] -[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")] +[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")] namespace Akka.Persistence { public sealed class AsyncHandlerInvocation : Akka.Persistence.IPendingHandlerInvocation diff --git a/src/core/Akka.API.Tests/CoreAPISpec.ApprovePersistenceQuery.approved.txt b/src/core/Akka.API.Tests/CoreAPISpec.ApprovePersistenceQuery.approved.txt index 9575a952984..1ea863c7d43 100644 --- a/src/core/Akka.API.Tests/CoreAPISpec.ApprovePersistenceQuery.approved.txt +++ b/src/core/Akka.API.Tests/CoreAPISpec.ApprovePersistenceQuery.approved.txt @@ -1,6 +1,6 @@ [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly: System.Runtime.InteropServices.GuidAttribute("92ab2788-e008-40d0-8b54-0c95b3cf3404")] -[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")] +[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")] namespace Akka.Persistence.Query { public sealed class EventEnvelope : System.IEquatable diff --git a/src/core/Akka.API.Tests/CoreAPISpec.ApproveRemote.approved.txt b/src/core/Akka.API.Tests/CoreAPISpec.ApproveRemote.approved.txt index 22408b0fc21..91d958afdb1 100644 --- a/src/core/Akka.API.Tests/CoreAPISpec.ApproveRemote.approved.txt +++ b/src/core/Akka.API.Tests/CoreAPISpec.ApproveRemote.approved.txt @@ -11,7 +11,7 @@ [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("Akka.Remote.Tests.Performance")] [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly: System.Runtime.InteropServices.GuidAttribute("78986bdb-73f7-4532-8e03-1c9ccbe8148e")] -[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")] +[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")] namespace Akka.Remote { public class AddressUid : Akka.Actor.IExtension diff --git a/src/core/Akka.API.Tests/CoreAPISpec.ApproveStreams.approved.txt b/src/core/Akka.API.Tests/CoreAPISpec.ApproveStreams.approved.txt index cec22f517d3..7d7f25cb668 100644 --- a/src/core/Akka.API.Tests/CoreAPISpec.ApproveStreams.approved.txt +++ b/src/core/Akka.API.Tests/CoreAPISpec.ApproveStreams.approved.txt @@ -3,7 +3,7 @@ [assembly: System.Runtime.CompilerServices.InternalsVisibleToAttribute("Akka.Streams.Tests")] [assembly: System.Runtime.InteropServices.ComVisibleAttribute(false)] [assembly: System.Runtime.InteropServices.GuidAttribute("123b83e9-21f8-49a8-888a-3b1212ff21dc")] -[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5", FrameworkDisplayName=".NET Framework 4.5")] +[assembly: System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.5.2", FrameworkDisplayName=".NET Framework 4.5.2")] namespace Akka.Streams { public sealed class AbruptStageTerminationException : System.Exception diff --git a/src/core/Akka.Cluster.TestKit/Akka.Cluster.TestKit.csproj b/src/core/Akka.Cluster.TestKit/Akka.Cluster.TestKit.csproj index baa26118480..39bc74e86e6 100644 --- a/src/core/Akka.Cluster.TestKit/Akka.Cluster.TestKit.csproj +++ b/src/core/Akka.Cluster.TestKit/Akka.Cluster.TestKit.csproj @@ -4,7 +4,7 @@ Akka.Cluster.TestKit Helper classes for combining the Akka.Remote.TestKit with Akka.Cluster - net452;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);network;cluster;testkit true @@ -14,13 +14,12 @@ - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR - 1.6.1 diff --git a/src/core/Akka.Cluster.Tests.MultiNode/Akka.Cluster.Tests.MultiNode.csproj b/src/core/Akka.Cluster.Tests.MultiNode/Akka.Cluster.Tests.MultiNode.csproj index 7ddad7e751d..f0639b66f99 100644 --- a/src/core/Akka.Cluster.Tests.MultiNode/Akka.Cluster.Tests.MultiNode.csproj +++ b/src/core/Akka.Cluster.Tests.MultiNode/Akka.Cluster.Tests.MultiNode.csproj @@ -3,7 +3,7 @@ Akka.Cluster.Tests.MultiNode - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,15 +15,14 @@ - - + - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Cluster.Tests.Performance/Akka.Cluster.Tests.Performance.csproj b/src/core/Akka.Cluster.Tests.Performance/Akka.Cluster.Tests.Performance.csproj index 98007f97e73..51695aa2216 100644 --- a/src/core/Akka.Cluster.Tests.Performance/Akka.Cluster.Tests.Performance.csproj +++ b/src/core/Akka.Cluster.Tests.Performance/Akka.Cluster.Tests.Performance.csproj @@ -1,8 +1,8 @@  - + Akka.Cluster.Tests.Performance - net452 + $(NetFrameworkTestVersion) true diff --git a/src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj b/src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj index 05688e77e22..d79c5fd4dcf 100644 --- a/src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj +++ b/src/core/Akka.Cluster.Tests/Akka.Cluster.Tests.csproj @@ -3,7 +3,7 @@ Akka.Cluster.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,21 +15,19 @@ - - - - + + - - $(DefineConstants);SERIALIZABLE;FSCHECK; + + $(DefineConstants);SERIALIZABLE; - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Cluster/Akka.Cluster.csproj b/src/core/Akka.Cluster/Akka.Cluster.csproj index 1fedaf07e3f..468ee344778 100644 --- a/src/core/Akka.Cluster/Akka.Cluster.csproj +++ b/src/core/Akka.Cluster/Akka.Cluster.csproj @@ -4,10 +4,9 @@ Akka.Cluster Cluster support for Akka.NET - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);network;cluster true - 1.6.1 @@ -15,11 +14,11 @@ - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj b/src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj index 81b56ea1460..b50b02e2f3e 100644 --- a/src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj +++ b/src/core/Akka.FSharp.Tests/Akka.FSharp.Tests.fsproj @@ -3,7 +3,7 @@ Akka.FSharp.Tests - net452;netstandard2.0 + $(NetFrameworkTestVersion);netstandard2.0 false @@ -29,7 +29,6 @@ - diff --git a/src/core/Akka.FSharp/Akka.FSharp.fsproj b/src/core/Akka.FSharp/Akka.FSharp.fsproj index 4e9d654a93d..8d0d3efee5a 100644 --- a/src/core/Akka.FSharp/Akka.FSharp.fsproj +++ b/src/core/Akka.FSharp/Akka.FSharp.fsproj @@ -4,7 +4,7 @@ Akka.FSharp F# API support for Akka.NET - net45;netstandard2.0 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);F#;fsharp true diff --git a/src/core/Akka.MultiNodeTestRunner.Shared.Tests/Akka.MultiNodeTestRunner.Shared.Tests.csproj b/src/core/Akka.MultiNodeTestRunner.Shared.Tests/Akka.MultiNodeTestRunner.Shared.Tests.csproj index a2c44e6c7f2..21d4ff5b624 100644 --- a/src/core/Akka.MultiNodeTestRunner.Shared.Tests/Akka.MultiNodeTestRunner.Shared.Tests.csproj +++ b/src/core/Akka.MultiNodeTestRunner.Shared.Tests/Akka.MultiNodeTestRunner.Shared.Tests.csproj @@ -3,7 +3,7 @@ Akka.MultiNodeTestRunner.Shared.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) false @@ -18,16 +18,15 @@ - - + - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.MultiNodeTestRunner.Shared/Akka.MultiNodeTestRunner.Shared.csproj b/src/core/Akka.MultiNodeTestRunner.Shared/Akka.MultiNodeTestRunner.Shared.csproj index 303bc6f602e..a7c3154f8c9 100644 --- a/src/core/Akka.MultiNodeTestRunner.Shared/Akka.MultiNodeTestRunner.Shared.csproj +++ b/src/core/Akka.MultiNodeTestRunner.Shared/Akka.MultiNodeTestRunner.Shared.csproj @@ -1,11 +1,10 @@  - + Akka.MultiNodeTestRunner.Shared - net452;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) false false - 1.6.1 @@ -31,7 +30,7 @@ - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.csproj b/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.csproj index 7214384e27d..68bd9db3af0 100644 --- a/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.csproj +++ b/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.csproj @@ -4,7 +4,7 @@ Akka.MultiNodeTestRunner Akka.NET Multi-node Test Runner; used for executing tests written with Akka.Remote.TestKit - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) Exe win7-x64 $(AkkaPackageTags) @@ -26,15 +26,11 @@ - + - - $(DefineConstants); - - - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec.template b/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec.template index 9802d6397f4..ab0f6ab9354 100644 --- a/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec.template +++ b/src/core/Akka.MultiNodeTestRunner/Akka.MultiNodeTestRunner.nuspec.template @@ -11,11 +11,11 @@ https://github.com/akkadotnet/akka.net http://getakka.net/images/AkkaNetLogo.Normal.png Akka.NET Multi-node Test Runner; used for executing tests written with Akka.Remote.TestKit - Copyright � 2013-2017 Akka.NET Team + Copyright � 2013-2019 .NET Foundation akka actors actor model Akka concurrency - - + + \ No newline at end of file diff --git a/src/core/Akka.NodeTestRunner/Akka.NodeTestRunner.csproj b/src/core/Akka.NodeTestRunner/Akka.NodeTestRunner.csproj index 718fa29d0ea..1707d2afcf1 100644 --- a/src/core/Akka.NodeTestRunner/Akka.NodeTestRunner.csproj +++ b/src/core/Akka.NodeTestRunner/Akka.NodeTestRunner.csproj @@ -1,8 +1,8 @@  - + Akka.NodeTestRunner - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) Exe win7-x86 @@ -20,16 +20,12 @@ - + - - $(DefineConstants); - - - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Persistence.FSharp/Akka.Persistence.FSharp.fsproj b/src/core/Akka.Persistence.FSharp/Akka.Persistence.FSharp.fsproj index 93c77474a61..1ea0f4ffc63 100644 --- a/src/core/Akka.Persistence.FSharp/Akka.Persistence.FSharp.fsproj +++ b/src/core/Akka.Persistence.FSharp/Akka.Persistence.FSharp.fsproj @@ -4,7 +4,7 @@ Akka.Persistence.FSharp F# API for persistence actors in Akka.NET - net45 + $(NetFrameworkLibVersion) akka;actors;actor model;Akka;concurrency;F#;Fsharp;persistence;eventsource true diff --git a/src/core/Akka.Persistence.Query.Tests/Akka.Persistence.Query.Tests.csproj b/src/core/Akka.Persistence.Query.Tests/Akka.Persistence.Query.Tests.csproj index 8c3638e3700..6d77e0a5f25 100644 --- a/src/core/Akka.Persistence.Query.Tests/Akka.Persistence.Query.Tests.csproj +++ b/src/core/Akka.Persistence.Query.Tests/Akka.Persistence.Query.Tests.csproj @@ -3,7 +3,7 @@ Akka.Persistence.Query.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,19 +15,18 @@ - - + - + $(DefineConstants);SERIALIZABLE - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Persistence.Query/Akka.Persistence.Query.csproj b/src/core/Akka.Persistence.Query/Akka.Persistence.Query.csproj index 57b41e70df7..34a25046720 100644 --- a/src/core/Akka.Persistence.Query/Akka.Persistence.Query.csproj +++ b/src/core/Akka.Persistence.Query/Akka.Persistence.Query.csproj @@ -4,7 +4,7 @@ Akka.Persistence.Query Stream based query interface for persistence journal plugins for Akka.NET - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);persistence;eventsource;query;stream true 1.6.1 @@ -15,11 +15,11 @@ - + $(DefineConstants);SERIALIZATION - + $(DefineConstants) diff --git a/src/core/Akka.Persistence.TCK.Tests/Akka.Persistence.TCK.Tests.csproj b/src/core/Akka.Persistence.TCK.Tests/Akka.Persistence.TCK.Tests.csproj index c6ba6143a1d..56a85fd2f26 100644 --- a/src/core/Akka.Persistence.TCK.Tests/Akka.Persistence.TCK.Tests.csproj +++ b/src/core/Akka.Persistence.TCK.Tests/Akka.Persistence.TCK.Tests.csproj @@ -3,7 +3,7 @@ Akka.Persistence.TCK.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,18 +15,18 @@ - + - + $(DefineConstants);SERIALIZABLE - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Persistence.TCK/Akka.Persistence.TCK.csproj b/src/core/Akka.Persistence.TCK/Akka.Persistence.TCK.csproj index 3b4d86b7219..a05cdb233af 100644 --- a/src/core/Akka.Persistence.TCK/Akka.Persistence.TCK.csproj +++ b/src/core/Akka.Persistence.TCK/Akka.Persistence.TCK.csproj @@ -4,7 +4,7 @@ Akka.Persistence.TCK Testkit for Persistence actor support for Akka.NET - net452;netstandard1.6 + net452;$(NetStandardLibVersion) $(AkkaPackageTags);persistence;eventsource;tck true 1.6.1 @@ -21,7 +21,7 @@ $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Persistence.Tests/Akka.Persistence.Tests.csproj b/src/core/Akka.Persistence.Tests/Akka.Persistence.Tests.csproj index 9f9fc9ca932..79c19197e88 100644 --- a/src/core/Akka.Persistence.Tests/Akka.Persistence.Tests.csproj +++ b/src/core/Akka.Persistence.Tests/Akka.Persistence.Tests.csproj @@ -3,7 +3,7 @@ Akka.Persistence.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -17,19 +17,18 @@ - - + - + $(DefineConstants);SERIALIZABLE - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Persistence.Tests/Journal/SteppingMemoryJournal.cs b/src/core/Akka.Persistence.Tests/Journal/SteppingMemoryJournal.cs index c00cbe2e159..12ee33e193b 100644 --- a/src/core/Akka.Persistence.Tests/Journal/SteppingMemoryJournal.cs +++ b/src/core/Akka.Persistence.Tests/Journal/SteppingMemoryJournal.cs @@ -66,6 +66,7 @@ public static Config Config(string instanceId) return ConfigurationFactory.ParseString(@" akka.persistence.journal.stepping-inmem.class="""+ typeof(SteppingMemoryJournal).FullName + @", Akka.Persistence.Tests"" akka.persistence.journal.plugin = ""akka.persistence.journal.stepping-inmem"" +akka.persistence.journal.stepping-inmem.plugin-dispatcher = ""akka.actor.default-dispatcher"" akka.persistence.journal.stepping-inmem.instance-id = """ + instanceId + @""""); } diff --git a/src/core/Akka.Persistence.Tests/PersistenceSpec.cs b/src/core/Akka.Persistence.Tests/PersistenceSpec.cs index 7500f7e6e29..dfce369b75c 100644 --- a/src/core/Akka.Persistence.Tests/PersistenceSpec.cs +++ b/src/core/Akka.Persistence.Tests/PersistenceSpec.cs @@ -21,9 +21,6 @@ public abstract class PersistenceSpec : AkkaSpec public static Config Configuration(string test, string serialization = null, string extraConfig = null) { - var c = extraConfig == null - ? ConfigurationFactory.Empty - : ConfigurationFactory.ParseString(extraConfig); var configString = string.Format(@" akka.actor.serialize-creators = {0} akka.actor.serialize-messages = {0} @@ -31,7 +28,9 @@ public static Config Configuration(string test, string serialization = null, akka.persistence.snapshot-store.local.dir = ""target/snapshots-{1}/"" akka.test.single-expect-default = 10s", serialization ?? "on", test); - return c.WithFallback(ConfigurationFactory.ParseString(configString)); + if(extraConfig == null) + return ConfigurationFactory.ParseString(configString); + return ConfigurationFactory.ParseString(extraConfig).WithFallback(ConfigurationFactory.ParseString(configString)); } internal readonly Cleanup Clean; diff --git a/src/core/Akka.Persistence/Akka.Persistence.csproj b/src/core/Akka.Persistence/Akka.Persistence.csproj index 7742ec4f6f8..6fe17a89b4e 100644 --- a/src/core/Akka.Persistence/Akka.Persistence.csproj +++ b/src/core/Akka.Persistence/Akka.Persistence.csproj @@ -3,10 +3,9 @@ Akka.Persistence Persistence actor support for Akka.NET - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);persistence;eventsource true - 1.6.1 @@ -15,10 +14,10 @@ - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Remote.TestKit.Tests/Akka.Remote.TestKit.Tests.csproj b/src/core/Akka.Remote.TestKit.Tests/Akka.Remote.TestKit.Tests.csproj index 884a21e17a6..5bbd576a7ef 100644 --- a/src/core/Akka.Remote.TestKit.Tests/Akka.Remote.TestKit.Tests.csproj +++ b/src/core/Akka.Remote.TestKit.Tests/Akka.Remote.TestKit.Tests.csproj @@ -3,7 +3,7 @@ Akka.Remote.TestKit.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,19 +15,18 @@ - - + - + $(DefineConstants);SERIALIZABLE - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Remote.TestKit/Akka.Remote.TestKit.csproj b/src/core/Akka.Remote.TestKit/Akka.Remote.TestKit.csproj index 7b37a900d3f..8d1fffd0b63 100644 --- a/src/core/Akka.Remote.TestKit/Akka.Remote.TestKit.csproj +++ b/src/core/Akka.Remote.TestKit/Akka.Remote.TestKit.csproj @@ -4,7 +4,7 @@ Akka.Remote.TestKit TestKit for Testing Distributed Akka.NET Applications - net452;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);network;testkit true @@ -19,18 +19,17 @@ - + - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR - 1.6.1 diff --git a/src/core/Akka.Remote.Tests.MultiNode/Akka.Remote.Tests.MultiNode.csproj b/src/core/Akka.Remote.Tests.MultiNode/Akka.Remote.Tests.MultiNode.csproj index 20e93094e07..1db20a3641f 100644 --- a/src/core/Akka.Remote.Tests.MultiNode/Akka.Remote.Tests.MultiNode.csproj +++ b/src/core/Akka.Remote.Tests.MultiNode/Akka.Remote.Tests.MultiNode.csproj @@ -3,7 +3,7 @@ Akka.Remote.Tests.MultiNode - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,24 +15,19 @@ - - + - + - - - - - + $(DefineConstants); - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Remote.Tests.Performance/Akka.Remote.Tests.Performance.csproj b/src/core/Akka.Remote.Tests.Performance/Akka.Remote.Tests.Performance.csproj index c437413cd5a..c14ac242da3 100644 --- a/src/core/Akka.Remote.Tests.Performance/Akka.Remote.Tests.Performance.csproj +++ b/src/core/Akka.Remote.Tests.Performance/Akka.Remote.Tests.Performance.csproj @@ -1,8 +1,8 @@  - + Akka.Remote.Tests.Performance - net452 + $(NetFrameworkTestVersion) true diff --git a/src/core/Akka.Remote.Tests/Akka.Remote.Tests.csproj b/src/core/Akka.Remote.Tests/Akka.Remote.Tests.csproj index 8ea4046cd0f..97e351b82e0 100644 --- a/src/core/Akka.Remote.Tests/Akka.Remote.Tests.csproj +++ b/src/core/Akka.Remote.Tests/Akka.Remote.Tests.csproj @@ -3,7 +3,7 @@ Akka.Remote.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -19,11 +19,10 @@ - - + - + @@ -34,8 +33,8 @@ - - $(DefineConstants);FSCHECK;HELIOS + + $(DefineConstants);HELIOS diff --git a/src/core/Akka.Remote/Akka.Remote.csproj b/src/core/Akka.Remote/Akka.Remote.csproj index 4a56a415164..3aeca588a04 100644 --- a/src/core/Akka.Remote/Akka.Remote.csproj +++ b/src/core/Akka.Remote/Akka.Remote.csproj @@ -3,7 +3,7 @@ Akka.Remote Remote actor support for Akka.NET - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);network true 1.6.1 @@ -16,10 +16,10 @@ - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Streams.TestKit.Tests/Akka.Streams.TestKit.Tests.csproj b/src/core/Akka.Streams.TestKit.Tests/Akka.Streams.TestKit.Tests.csproj index d892cf7b7ff..5e3f6ceaf13 100644 --- a/src/core/Akka.Streams.TestKit.Tests/Akka.Streams.TestKit.Tests.csproj +++ b/src/core/Akka.Streams.TestKit.Tests/Akka.Streams.TestKit.Tests.csproj @@ -3,7 +3,7 @@ Akka.Streams.TestKit.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -16,24 +16,19 @@ - - + - + - - - - - + $(DefineConstants);SERIALIZATION;AKKAIO - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Streams.TestKit.Tests/ScriptedTest.cs b/src/core/Akka.Streams.TestKit.Tests/ScriptedTest.cs index d5be79e3253..d61e4cc454d 100644 --- a/src/core/Akka.Streams.TestKit.Tests/ScriptedTest.cs +++ b/src/core/Akka.Streams.TestKit.Tests/ScriptedTest.cs @@ -200,17 +200,17 @@ public void Request(int demand) public bool ShakeIt() { - var oneMilli = TimeSpan.FromMilliseconds(1); + var oneMilli = TimeSpan.FromMilliseconds(10); var marker = new object(); var u = Upstream.ReceiveWhile(oneMilli, filter: msg => { - if (msg is TestPublisher.RequestMore) + if (msg is TestPublisher.RequestMore more) { - var more = (TestPublisher.RequestMore)msg; DebugLog($"Operation requests {more.NrOfElements}"); _pendingRequests += more.NrOfElements; return marker; } + DebugLog($"Operation received {msg}"); return null; }); var d = Downstream.ReceiveWhile(oneMilli, filter: msg => msg.Match() @@ -223,6 +223,7 @@ public bool ShakeIt() }) .With(complete => { + DebugLog("Operation complete."); _currentScript = _currentScript.Complete(); }) .With(error => @@ -246,6 +247,7 @@ public void Run() var idleRounds = 0; while (true) { + if (idleRounds > 250) throw new Exception("Too many idle rounds"); if (_currentScript.Completed) break; @@ -274,6 +276,7 @@ public void Run() DebugLog("Test environment completes"); UpstreamSubscription.SendComplete(); _completed = true; + return; // don't execute again if completed } } } diff --git a/src/core/Akka.Streams.TestKit/Akka.Streams.TestKit.csproj b/src/core/Akka.Streams.TestKit/Akka.Streams.TestKit.csproj index fee43993a17..a303c458731 100644 --- a/src/core/Akka.Streams.TestKit/Akka.Streams.TestKit.csproj +++ b/src/core/Akka.Streams.TestKit/Akka.Streams.TestKit.csproj @@ -4,10 +4,9 @@ Akka.Streams.TestKit Testkit for Reactive stream support for Akka.NET - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);reactive;stream;testkit true - 1.6.1 @@ -15,11 +14,11 @@ - + $(DefineConstants); - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Streams.Tests.Performance/Akka.Streams.Tests.Performance.csproj b/src/core/Akka.Streams.Tests.Performance/Akka.Streams.Tests.Performance.csproj index 7f1e80e5bac..5d3c95cc674 100644 --- a/src/core/Akka.Streams.Tests.Performance/Akka.Streams.Tests.Performance.csproj +++ b/src/core/Akka.Streams.Tests.Performance/Akka.Streams.Tests.Performance.csproj @@ -1,8 +1,8 @@  - + Akka.Streams.Tests.Performance - net452 + $(NetFrameworkTestVersion) true @@ -18,7 +18,7 @@ - + diff --git a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj index eba5ce929ed..f3e6adbee95 100644 --- a/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj +++ b/src/core/Akka.Streams.Tests.TCK/Akka.Streams.Tests.TCK.csproj @@ -2,7 +2,7 @@ Akka.Streams.Tests - net452 + $(NetFrameworkTestVersion) @@ -21,7 +21,7 @@ - + $(DefineConstants) diff --git a/src/core/Akka.Streams.Tests/Akka.Streams.Tests.csproj b/src/core/Akka.Streams.Tests/Akka.Streams.Tests.csproj index 60a7b72c1cf..ecc5c2148f3 100644 --- a/src/core/Akka.Streams.Tests/Akka.Streams.Tests.csproj +++ b/src/core/Akka.Streams.Tests/Akka.Streams.Tests.csproj @@ -3,10 +3,13 @@ Akka.Streams.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) + @@ -18,32 +21,27 @@ - - + - + - + - - - - - - TRACE;DEBUG;SERIALIZATION;CONFIGURATION;UNSAFE_THREADING;NET452;NET452 + + $(DefineConstants);SERIALIZATION;CONFIGURATION;UNSAFE_THREADING;AKKAIO - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Streams/Akka.Streams.csproj b/src/core/Akka.Streams/Akka.Streams.csproj index 6c5fab2efe6..6182adba964 100644 --- a/src/core/Akka.Streams/Akka.Streams.csproj +++ b/src/core/Akka.Streams/Akka.Streams.csproj @@ -3,21 +3,17 @@ Akka.Streams Reactive stream support for Akka.NET - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags);reactive;stream true - 1.6.1 - + - - - TextTemplatingFileGenerator @@ -68,10 +64,10 @@ - + $(DefineConstants);SERIALIZATION;CLONEABLE;AKKAIO - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.TestKit.Tests/Akka.TestKit.Tests.csproj b/src/core/Akka.TestKit.Tests/Akka.TestKit.Tests.csproj index a11f6d29bb3..967ddd44975 100644 --- a/src/core/Akka.TestKit.Tests/Akka.TestKit.Tests.csproj +++ b/src/core/Akka.TestKit.Tests/Akka.TestKit.Tests.csproj @@ -2,7 +2,7 @@ Akka.TestKit.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -14,16 +14,15 @@ - - + - + $(DefineConstants);SERIALIZATION - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.TestKit/Akka.TestKit.csproj b/src/core/Akka.TestKit/Akka.TestKit.csproj index cdcbc49c376..8c3455a6e46 100644 --- a/src/core/Akka.TestKit/Akka.TestKit.csproj +++ b/src/core/Akka.TestKit/Akka.TestKit.csproj @@ -4,7 +4,7 @@ Akka.TestKit You need a Akka.TestKit.* package! Add the one appropriate for the test framework you use instead. For example: Akka.TestKit.Xunit or Akka.TestKit.VsTest. This package only contains base functionality for writing tests for the Akka.NET framework. - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags) true 1.6.1 @@ -15,10 +15,6 @@ - - - - TextTemplatingFileGenerator @@ -31,11 +27,11 @@ - + $(DefineConstants);UNSAFE_THREADING - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Tests.Performance/Akka.Tests.Performance.csproj b/src/core/Akka.Tests.Performance/Akka.Tests.Performance.csproj index 8c2ef8a0f44..a391a2a55eb 100644 --- a/src/core/Akka.Tests.Performance/Akka.Tests.Performance.csproj +++ b/src/core/Akka.Tests.Performance/Akka.Tests.Performance.csproj @@ -1,8 +1,8 @@  - + Akka.Tests.Performance - net452 + $(NetFrameworkTestVersion) true @@ -16,7 +16,7 @@ - + diff --git a/src/core/Akka.Tests.Shared.Internals/Akka.Tests.Shared.Internals.csproj b/src/core/Akka.Tests.Shared.Internals/Akka.Tests.Shared.Internals.csproj index 12ad0345035..c6e59e8c791 100644 --- a/src/core/Akka.Tests.Shared.Internals/Akka.Tests.Shared.Internals.csproj +++ b/src/core/Akka.Tests.Shared.Internals/Akka.Tests.Shared.Internals.csproj @@ -1,29 +1,26 @@  - + - net452;netstandard1.6 - 1.6.1 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) - + - - - - + + - + $(DefineConstants);CORECLR - + $(DefineConstants);FSCHECK; diff --git a/src/core/Akka.Tests/Actor/Dispatch/Bug2640Spec.cs b/src/core/Akka.Tests/Actor/Dispatch/Bug2640Spec.cs index 40ad5f959ed..7d4863acc2b 100644 --- a/src/core/Akka.Tests/Actor/Dispatch/Bug2640Spec.cs +++ b/src/core/Akka.Tests/Actor/Dispatch/Bug2640Spec.cs @@ -76,7 +76,6 @@ public async Task ForkJoinExecutorShouldShutdownUponActorSystemTermination() threads = ReceiveN(100).Cast().GroupBy(x => x.ManagedThreadId) .ToDictionary(x => x.Key, grouping => grouping.First()); - threads.Count.Should().Be(4, "Expected 4 distinct threads in this example"); await Sys.Terminate(); AwaitAssert(() => @@ -91,12 +90,12 @@ public void ForkJoinExecutorShouldShutdownUponAllActorsTerminating() Dictionary threads = null; Watch(actor); - for (var i = 0; i < 100; i++) + var msgCount = 100; + for (var i = 0; i < msgCount; i++) actor.Tell(GetThread.Instance); - threads = ReceiveN(100).Cast().GroupBy(x => x.ManagedThreadId) + threads = ReceiveN(msgCount).Cast().GroupBy(x => x.ManagedThreadId) .ToDictionary(x => x.Key, grouping => grouping.First()); - threads.Count.Should().Be(4, "Expected 4 distinct threads in this example"); Sys.Stop(actor); ExpectTerminated(actor); diff --git a/src/core/Akka.Tests/Actor/RemotePathParsingSpec.cs b/src/core/Akka.Tests/Actor/RemotePathParsingSpec.cs index 5ed56d880d8..221f87300fa 100644 --- a/src/core/Akka.Tests/Actor/RemotePathParsingSpec.cs +++ b/src/core/Akka.Tests/Actor/RemotePathParsingSpec.cs @@ -4,6 +4,7 @@ // Copyright (C) 2013-2018 .NET Foundation // //----------------------------------------------------------------------- +#if FSCHECK using System.Net; using System.Net.Sockets; @@ -101,3 +102,4 @@ public Property ActorPath_Should_parse_from_any_valid_EndPoint(EndPoint ep) } } } +#endif \ No newline at end of file diff --git a/src/core/Akka.Tests/Akka.Tests.csproj b/src/core/Akka.Tests/Akka.Tests.csproj index bd521e79bbf..2ab15c9a4fc 100644 --- a/src/core/Akka.Tests/Akka.Tests.csproj +++ b/src/core/Akka.Tests/Akka.Tests.csproj @@ -3,7 +3,7 @@ Akka.Tests - net452;netcoreapp1.1 + $(NetFrameworkTestVersion);$(NetCoreTestVersion) @@ -15,31 +15,25 @@ - - - - + + - + - + - - - - - + $(DefineConstants);SERIALIZATION;CONFIGURATION;UNSAFE_THREADING - + $(DefineConstants);CORECLR diff --git a/src/core/Akka.Tests/Dispatch/MailboxesSpec.cs b/src/core/Akka.Tests/Dispatch/MailboxesSpec.cs index a887887e362..d385efccfc9 100644 --- a/src/core/Akka.Tests/Dispatch/MailboxesSpec.cs +++ b/src/core/Akka.Tests/Dispatch/MailboxesSpec.cs @@ -165,6 +165,7 @@ private static string GetConfig() "; } +#if FSCHECK [Property] public Property UnboundedPriorityQueue_should_sort_items_in_expected_order(int[] integers, PositiveInt capacity) { @@ -191,6 +192,7 @@ public Property UnboundedPriorityQueue_should_sort_items_in_expected_order(int[] expectedOrder.SequenceEqual(actualOrder) .Label($"Expected [{string.Join(";", expectedOrder)}], but was [{string.Join(";", actualOrder)}]"); } +#endif [Fact] public void Can_use_unbounded_priority_mailbox() diff --git a/src/core/Akka.Tests/Util/Internal/ExtensionsTests.cs b/src/core/Akka.Tests/Util/Internal/ExtensionsTests.cs index 4d42d5fef1c..9c74a28b8b6 100644 --- a/src/core/Akka.Tests/Util/Internal/ExtensionsTests.cs +++ b/src/core/Akka.Tests/Util/Internal/ExtensionsTests.cs @@ -102,6 +102,7 @@ public void SplitDottedPathHonouringQuotesHandlesDotsNextToQuotes() actual.ShouldAllBeEquivalentTo(expectation); } +#if FSCHECK [Property] public void SplitDottedPathHonouringQuotesWithTestOracle() { @@ -110,6 +111,7 @@ public void SplitDottedPathHonouringQuotesWithTestOracle() SplitDottedPathHonouringQuotesOracle(s).SequenceEqual(s.SplitDottedPathHonouringQuotes())) .QuickCheckThrowOnFailure(); } +#endif private static IEnumerable SplitDottedPathHonouringQuotesOracle(string path) { diff --git a/src/core/Akka/Akka.csproj b/src/core/Akka/Akka.csproj index 44d1df7dd6e..087b4501289 100644 --- a/src/core/Akka/Akka.csproj +++ b/src/core/Akka/Akka.csproj @@ -4,10 +4,9 @@ Akka Akka.NET is a port of the popular Java/Scala framework Akka to .NET - net45;netstandard1.6 + $(NetFrameworkLibVersion);$(NetStandardLibVersion) $(AkkaPackageTags) true - 1.6.1 @@ -15,27 +14,14 @@ - + - + - - - - - - - - - - - - - TextTemplatingFileGenerator @@ -48,11 +34,11 @@ - + $(DefineConstants);SERIALIZATION;CONFIGURATION;UNSAFE_THREADING;CLONEABLE;APPDOMAIN - + $(DefineConstants);CORECLR diff --git a/src/core/Akka/Util/Internal/NetCorePolyfills.cs b/src/core/Akka/Util/Internal/NetCorePolyfills.cs deleted file mode 100644 index 19830d0b8d4..00000000000 --- a/src/core/Akka/Util/Internal/NetCorePolyfills.cs +++ /dev/null @@ -1,19 +0,0 @@ -//----------------------------------------------------------------------- -// -// Copyright (C) 2009-2018 Lightbend Inc. -// Copyright (C) 2013-2018 .NET Foundation -// -//----------------------------------------------------------------------- - -#if !SERIALIZATION -namespace System -{ - public class SerializableAttribute : Attribute - { - } - - public class NonSerializedAttribute : Attribute - { - } -} -#endif diff --git a/src/examples/Chat/ChatClient/ChatClient.csproj b/src/examples/Chat/ChatClient/ChatClient.csproj index 16ebddbe889..8cf56b5c666 100644 --- a/src/examples/Chat/ChatClient/ChatClient.csproj +++ b/src/examples/Chat/ChatClient/ChatClient.csproj @@ -1,8 +1,8 @@ - + Exe - netcoreapp1.1 + $(NetCoreTestVersion) diff --git a/src/examples/Chat/ChatMessages/ChatMessages.csproj b/src/examples/Chat/ChatMessages/ChatMessages.csproj index a30b92868e0..bfa48fe5c98 100644 --- a/src/examples/Chat/ChatMessages/ChatMessages.csproj +++ b/src/examples/Chat/ChatMessages/ChatMessages.csproj @@ -1,7 +1,7 @@ - + - netstandard1.6 + $(NetStandardLibVersion) diff --git a/src/examples/Chat/ChatServer/ChatServer.csproj b/src/examples/Chat/ChatServer/ChatServer.csproj index a0420e0cc85..9b63f60c027 100644 --- a/src/examples/Chat/ChatServer/ChatServer.csproj +++ b/src/examples/Chat/ChatServer/ChatServer.csproj @@ -1,8 +1,9 @@ + Exe - netcoreapp1.1 + $(NetCoreTestVersion) diff --git a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/ClusterSharding.Node.csproj b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/ClusterSharding.Node.csproj index b99371984cd..354a0fd2d0a 100644 --- a/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/ClusterSharding.Node.csproj +++ b/src/examples/Cluster/ClusterSharding/ClusterSharding.Node/ClusterSharding.Node.csproj @@ -1,15 +1,15 @@  + Exe - netcoreapp1.1 + $(NetCoreTestVersion) - \ No newline at end of file diff --git a/src/examples/Cluster/Roles/Samples.Cluster.Transformation/Samples.Cluster.Transformation.csproj b/src/examples/Cluster/Roles/Samples.Cluster.Transformation/Samples.Cluster.Transformation.csproj index 9dca2239ceb..2af2671e212 100644 --- a/src/examples/Cluster/Roles/Samples.Cluster.Transformation/Samples.Cluster.Transformation.csproj +++ b/src/examples/Cluster/Roles/Samples.Cluster.Transformation/Samples.Cluster.Transformation.csproj @@ -1,8 +1,9 @@  + Exe - net45 + $(NetFrameworkTestVersion) diff --git a/src/examples/Cluster/Samples.Cluster.Simple/Samples.Cluster.Simple.csproj b/src/examples/Cluster/Samples.Cluster.Simple/Samples.Cluster.Simple.csproj index 270d9e1468f..17ce65057b8 100644 --- a/src/examples/Cluster/Samples.Cluster.Simple/Samples.Cluster.Simple.csproj +++ b/src/examples/Cluster/Samples.Cluster.Simple/Samples.Cluster.Simple.csproj @@ -1,8 +1,9 @@  + Exe - net45 + $(NetFrameworkTestVersion) diff --git a/src/global.json b/src/global.json index 4d61027af6f..21e27cedebb 100644 --- a/src/global.json +++ b/src/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.0.0" + "version": "2.1.500" } } \ No newline at end of file diff --git a/src/xunit.runner.json b/src/xunit.runner.json new file mode 100644 index 00000000000..cafdde412f1 --- /dev/null +++ b/src/xunit.runner.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://xunit.github.io/schema/current/xunit.runner.schema.json", + "parallelizeTestCollections": false +} \ No newline at end of file