From eca49622618a6845e44cabe5941bee8d14c86b5b Mon Sep 17 00:00:00 2001 From: Julian Dominguez Date: Sat, 15 Apr 2017 23:40:47 -0700 Subject: [PATCH 1/2] Move from .NET 4.5.1 to 4.6.1. Upgrade all projects to .NET 4.6.1. Upgrade package references to latest Roslyn, immutable collection, Dependency Injection and Configuration Remove all binding redirects from App.config files Add AutoGenerateBindingRedirects and GenerateBindingRedirectsOutputType to all projects --- .../ClientGenerator.2017.csproj | 3 ++- src/ClientGenerator/ClientGenerator.csproj | 6 +++-- src/ClientGenerator/app.config | 6 ++--- src/ClientGenerator/project.json | 11 ++++++++ src/NuGet/Microsoft.Orleans.Core.nuspec | 13 +++++---- .../Microsoft.Orleans.CounterControl.nuspec | 6 ++--- .../Microsoft.Orleans.EventSourcing.nuspec | 6 ++--- .../Microsoft.Orleans.OrleansAWSUtils.nuspec | 6 ++--- ...Microsoft.Orleans.OrleansAzureUtils.nuspec | 6 ++--- ...rosoft.Orleans.OrleansCodeGenerator.nuspec | 6 ++--- ...icrosoft.Orleans.OrleansConsulUtils.nuspec | 4 +-- .../Microsoft.Orleans.OrleansHost.nuspec | 4 +-- .../Microsoft.Orleans.OrleansManager.nuspec | 4 +-- .../Microsoft.Orleans.OrleansProviders.nuspec | 6 ++--- .../Microsoft.Orleans.OrleansRuntime.nuspec | 8 +++--- ...Microsoft.Orleans.OrleansServiceBus.nuspec | 6 ++--- .../Microsoft.Orleans.OrleansSqlUtils.nuspec | 12 ++++----- ...rleans.OrleansTelemetryConsumers.AI.nuspec | 2 +- ....OrleansTelemetryConsumers.Counters.nuspec | 6 ++--- ....OrleansTelemetryConsumers.NewRelic.nuspec | 2 +- ...osoft.Orleans.OrleansZooKeeperUtils.nuspec | 6 ++--- ...icrosoft.Orleans.Serialization.Bond.nuspec | 6 ++--- .../Microsoft.Orleans.ServiceFabric.nuspec | 6 ++--- .../Microsoft.Orleans.TestingHost.nuspec | 8 +++--- src/Orleans.sln | 4 +-- src/Orleans/Orleans.2017.csproj | 8 +++--- src/Orleans/Orleans.csproj | 4 ++- src/Orleans/project.json | 8 +++--- .../OrleansAWSUtils.2017.csproj | 2 +- src/OrleansAWSUtils/OrleansAWSUtils.csproj | 5 +++- src/OrleansAWSUtils/project.json | 2 +- .../OrleansAzureUtils.2017.csproj | 2 +- .../OrleansAzureUtils.csproj | 4 ++- src/OrleansAzureUtils/app.config | 19 ++++--------- src/OrleansAzureUtils/project.json | 2 +- .../OrleansBondUtils.2017.csproj | 2 +- src/OrleansBondUtils/OrleansBondUtils.csproj | 4 ++- src/OrleansBondUtils/project.json | 2 +- .../OrleansCodeGenerator.2017.csproj | 4 +-- .../OrleansCodeGenerator.csproj | 8 +++--- src/OrleansCodeGenerator/project.json | 4 +-- .../OrleansConsulUtils.2017.csproj | 2 +- .../OrleansConsulUtils.csproj | 7 +++-- src/OrleansConsulUtils/project.json | 2 +- src/OrleansCounterControl/App.config | 6 ++--- .../OrleansCounterControl.2017.csproj | 3 ++- .../OrleansCounterControl.csproj | 4 ++- .../OrleansEventSourcing.2017.csproj | 2 +- .../OrleansEventSourcing.csproj | 4 ++- .../OrleansGoogleUtils.2017.csproj | 2 +- .../OrleansGoogleUtils.csproj | 4 ++- src/OrleansGoogleUtils/project.json | 2 +- src/OrleansHost/OrleansHost.2017.csproj | 3 ++- src/OrleansHost/OrleansHost.csproj | 4 ++- src/OrleansHost/app.config | 22 +++------------ src/OrleansHost/project.json | 2 +- src/OrleansManager/OrleansManager.2017.csproj | 3 ++- src/OrleansManager/OrleansManager.csproj | 4 ++- src/OrleansManager/app.config | 2 +- src/OrleansPSUtils/OrleansPSUtils.2017.csproj | 3 ++- src/OrleansPSUtils/OrleansPSUtils.csproj | 4 ++- src/OrleansPSUtils/project.json | 9 ++----- .../OrleansProviders.2017.csproj | 2 +- src/OrleansProviders/OrleansProviders.csproj | 4 ++- src/OrleansProviders/project.json | 2 +- src/OrleansRuntime/OrleansRuntime.2017.csproj | 5 +--- src/OrleansRuntime/OrleansRuntime.csproj | 4 ++- src/OrleansRuntime/project.json | 3 +-- .../OrleansSQLUtils.2017.csproj | 2 +- src/OrleansSQLUtils/OrleansSQLUtils.csproj | 4 ++- src/OrleansSQLUtils/project.json | 2 +- .../OrleansServiceBus.2017.csproj | 2 +- .../OrleansServiceBus.csproj | 4 ++- src/OrleansServiceBus/app.config | 27 ++++--------------- src/OrleansServiceBus/project.json | 2 +- src/OrleansServiceFabricUtils/App.config | 8 +----- .../OrleansServiceFabricUtils.2017.csproj | 2 +- .../OrleansServiceFabricUtils.csproj | 5 ++-- src/OrleansServiceFabricUtils/project.json | 2 +- .../OrleansTelemetryConsumers.AI.2017.csproj | 2 +- .../OrleansTelemetryConsumers.AI.csproj | 4 ++- src/OrleansTelemetryConsumers.AI/project.json | 2 +- ...ansTelemetryConsumers.Counters.2017.csproj | 2 +- .../OrleansTelemetryConsumers.Counters.csproj | 5 +++- ...ansTelemetryConsumers.NewRelic.2017.csproj | 2 +- .../OrleansTelemetryConsumers.NewRelic.csproj | 4 ++- .../project.json | 2 +- .../OrleansTestingHost.2017.csproj | 6 ++--- .../OrleansTestingHost.csproj | 4 ++- src/OrleansTestingHost/project.json | 6 ++--- .../OrleansVSTools/OrleansVSTools.csproj | 2 +- ...emTemplateGrainImplementationCSharp.csproj | 2 +- .../VSItemTemplateGrainInterfaceCSharp.csproj | 2 +- .../VSProjectSiloHostCSharp.csproj | 2 +- ...ctTemplateGrainImplementationCSharp.csproj | 2 +- ...ProjectTemplateGrainInterfaceCSharp.csproj | 2 +- .../OrleansZooKeeperUtils.2017.csproj | 2 +- .../OrleansZooKeeperUtils.csproj | 4 ++- src/OrleansZooKeeperUtils/project.json | 2 +- .../AWSUtils.Tests/AWSUtils.Tests.2017.csproj | 3 ++- test/AWSUtils.Tests/AWSUtils.Tests.csproj | 7 +++-- test/AWSUtils.Tests/App.config | 6 ----- test/AWSUtils.Tests/project.json | 2 +- .../BenchmarkGrainInterfaces.2017.csproj | 2 +- .../BenchmarkGrainInterfaces.csproj | 4 ++- .../BenchmarkGrains.2017.csproj | 2 +- .../BenchmarkGrains/BenchmarkGrains.csproj | 4 ++- test/Benchmarks/Benchmarks/App.config | 2 +- .../Benchmarks/Benchmarks.2017.csproj | 3 ++- test/Benchmarks/Benchmarks/Benchmarks.csproj | 7 +++-- test/Benchmarks/Benchmarks/project.json | 2 +- test/BondUtils.Tests/App.config | 6 ----- .../BondUtils.Tests.2017.csproj | 3 ++- test/BondUtils.Tests/BondUtils.Tests.csproj | 7 +++-- test/BondUtils.Tests/project.json | 2 +- test/Consul.Tests/App.config | 4 +-- test/Consul.Tests/Consul.Tests.2017.csproj | 6 +++-- test/Consul.Tests/Consul.Tests.csproj | 14 +++------- test/Consul.Tests/ConsulTestUtils.cs | 6 ++++- test/Consul.Tests/project.json | 3 ++- test/DefaultCluster.Tests/App.config | 6 ----- .../DefaultCluster.Tests.2017.csproj | 5 ++-- .../DefaultCluster.Tests.csproj | 11 ++++---- test/DefaultCluster.Tests/project.json | 2 +- test/GoogleUtils.Tests/App.config | 6 ----- .../GoogleUtils.Tests.2017.csproj | 3 ++- .../GoogleUtils.Tests.csproj | 7 +++-- test/GoogleUtils.Tests/project.json | 2 +- test/NonSilo.Tests/App.config | 11 -------- test/NonSilo.Tests/NonSilo.Tests.2017.csproj | 3 ++- test/NonSilo.Tests/NonSilo.Tests.csproj | 8 +++--- test/NonSilo.Tests/project.json | 2 +- test/PSUtils.Tests/App.config | 6 ----- test/PSUtils.Tests/PSUtils.Tests.2017.csproj | 3 ++- test/PSUtils.Tests/PSUtils.Tests.csproj | 7 +++-- test/PSUtils.Tests/project.json | 2 +- test/ServiceBus.Tests/App.config | 6 ----- .../ServiceBus.Tests.2017.csproj | 3 ++- test/ServiceBus.Tests/ServiceBus.Tests.csproj | 7 +++-- test/ServiceBus.Tests/project.json | 2 +- .../TestExtensions/TestExtensions.2017.csproj | 6 ++--- test/TestExtensions/TestExtensions.csproj | 4 ++- test/TestExtensions/project.json | 6 ++--- test/TestFSharp/TestFSharp.fsproj | 5 ++-- test/TestFSharp/packages.config | 4 +-- .../TestFSharpInterfaces.fsproj | 5 ++-- test/TestFSharpInterfaces/packages.config | 4 +-- .../TestGrainInterfaces.2017.csproj | 2 +- .../TestGrainInterfaces.csproj | 4 ++- test/TestGrainInterfaces/project.json | 2 +- test/TestGrains/TestGrains.2017.csproj | 2 +- test/TestGrains/TestGrains.csproj | 4 ++- test/TestGrains/project.json | 2 +- .../TestInterfaces/TestInterfaces.2017.csproj | 2 +- test/TestInterfaces/TestInterfaces.csproj | 4 ++- .../TestInternalDtosRefOrleans.2017.csproj | 2 +- .../TestInternalDtosRefOrleans.csproj | 4 ++- .../TestInternalGrainInterfaces.2017.csproj | 2 +- .../TestInternalGrainInterfaces.csproj | 4 ++- test/TestInternalGrainInterfaces/project.json | 2 +- .../TestInternalGrains.2017.csproj | 2 +- .../TestInternalGrains.csproj | 4 ++- test/TestInternalGrains/project.json | 2 +- .../TestServiceFabric.2017.csproj | 3 ++- .../TestServiceFabric.csproj | 4 ++- test/TestServiceFabric/project.json | 2 +- test/Tester/App.config | 24 +---------------- .../HeterogeneousSilosTests/UpgradeTests.cs | 3 +-- test/Tester/Tester.2017.csproj | 6 ++--- test/Tester/Tester.csproj | 11 ++++---- test/Tester/project.json | 6 ++--- test/TesterAzureUtils/App.config | 11 -------- .../Tester.AzureUtils.2017.csproj | 4 +-- test/TesterAzureUtils/TesterAzureUtils.csproj | 7 +++-- test/TesterAzureUtils/project.json | 2 +- test/TesterInternal/App.config | 24 +---------------- .../TesterInternal/TesterInternal.2017.csproj | 3 ++- test/TesterInternal/TesterInternal.csproj | 6 ++--- test/TesterInternal/project.json | 2 +- test/TesterSQLUtils/App.config | 11 -------- .../Tester.SQLUtils.2017.csproj | 4 +-- test/TesterSQLUtils/TesterSQLUtils.csproj | 21 +++------------ test/TesterSQLUtils/project.json | 2 +- test/TesterZooKeeperUtils/App.config | 11 -------- .../Tester.ZooKeeperUtils.2017.csproj | 4 +-- .../TesterZooKeeperUtils.csproj | 5 ++-- test/TesterZooKeeperUtils/project.json | 2 +- .../TestVersionGrains.2017.csproj | 2 +- .../TestVersionGrains.csproj | 7 ++++- test/Versions/TestVersionGrains/project.json | 11 ++++++++ .../TestVersionGrains2.2017.csproj | 2 +- .../TestVersionGrains2.csproj | 7 ++++- test/Versions/TestVersionGrains2/project.json | 11 ++++++++ 193 files changed, 435 insertions(+), 524 deletions(-) create mode 100644 src/ClientGenerator/project.json delete mode 100644 test/NonSilo.Tests/App.config delete mode 100644 test/TesterAzureUtils/App.config delete mode 100644 test/TesterSQLUtils/App.config delete mode 100644 test/TesterZooKeeperUtils/App.config create mode 100644 test/Versions/TestVersionGrains/project.json create mode 100644 test/Versions/TestVersionGrains2/project.json diff --git a/src/ClientGenerator/ClientGenerator.2017.csproj b/src/ClientGenerator/ClientGenerator.2017.csproj index 4c7a1b9db6..e3418447ec 100644 --- a/src/ClientGenerator/ClientGenerator.2017.csproj +++ b/src/ClientGenerator/ClientGenerator.2017.csproj @@ -4,10 +4,11 @@ - net451 + net461 Exe false true + true 1591 Properties Orleans.CodeGeneration diff --git a/src/ClientGenerator/ClientGenerator.csproj b/src/ClientGenerator/ClientGenerator.csproj index 4d2abfe371..904b6c2008 100644 --- a/src/ClientGenerator/ClientGenerator.csproj +++ b/src/ClientGenerator/ClientGenerator.csproj @@ -15,9 +15,11 @@ Properties Orleans.CodeGeneration ClientGenerator - v4.5.1 + v4.6.1 512 + true + true true @@ -59,7 +61,6 @@ - @@ -81,6 +82,7 @@ + \ No newline at end of file diff --git a/src/ClientGenerator/app.config b/src/ClientGenerator/app.config index bed25ab7ba..1a42e4b63c 100644 --- a/src/ClientGenerator/app.config +++ b/src/ClientGenerator/app.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/src/ClientGenerator/project.json b/src/ClientGenerator/project.json new file mode 100644 index 0000000000..73c2daa4d4 --- /dev/null +++ b/src/ClientGenerator/project.json @@ -0,0 +1,11 @@ +{ + "dependencies": { + }, + "frameworks": { + "net461": {} + }, + "runtimes": { + "win-anycpu": {}, + "win": {} + } +} \ No newline at end of file diff --git a/src/NuGet/Microsoft.Orleans.Core.nuspec b/src/NuGet/Microsoft.Orleans.Core.nuspec index 96efe7005e..173561a2e3 100644 --- a/src/NuGet/Microsoft.Orleans.Core.nuspec +++ b/src/NuGet/Microsoft.Orleans.Core.nuspec @@ -19,16 +19,15 @@ Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET - - - - + + + - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.CounterControl.nuspec b/src/NuGet/Microsoft.Orleans.CounterControl.nuspec index 22d6323312..0f9c506341 100644 --- a/src/NuGet/Microsoft.Orleans.CounterControl.nuspec +++ b/src/NuGet/Microsoft.Orleans.CounterControl.nuspec @@ -22,12 +22,12 @@ - + - - + + diff --git a/src/NuGet/Microsoft.Orleans.EventSourcing.nuspec b/src/NuGet/Microsoft.Orleans.EventSourcing.nuspec index 6cd252bfc8..b461abdb0a 100644 --- a/src/NuGet/Microsoft.Orleans.EventSourcing.nuspec +++ b/src/NuGet/Microsoft.Orleans.EventSourcing.nuspec @@ -22,9 +22,9 @@ - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansAWSUtils.nuspec b/src/NuGet/Microsoft.Orleans.OrleansAWSUtils.nuspec index e8ecbed9b5..85aabc5a8d 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansAWSUtils.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansAWSUtils.nuspec @@ -27,9 +27,9 @@ - - - + + + \ No newline at end of file diff --git a/src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec b/src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec index 0130e45854..e1c5ccff7c 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansAzureUtils.nuspec @@ -26,9 +26,9 @@ - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec b/src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec index 8cc9177af4..75b371ff37 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansCodeGenerator.nuspec @@ -19,12 +19,12 @@ Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET - + - - + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansConsulUtils.nuspec b/src/NuGet/Microsoft.Orleans.OrleansConsulUtils.nuspec index 6524ab079b..670a23d33d 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansConsulUtils.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansConsulUtils.nuspec @@ -24,8 +24,8 @@ - - + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansHost.nuspec b/src/NuGet/Microsoft.Orleans.OrleansHost.nuspec index b26f48985a..6364c02e0a 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansHost.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansHost.nuspec @@ -23,8 +23,8 @@ - - + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansManager.nuspec b/src/NuGet/Microsoft.Orleans.OrleansManager.nuspec index 327b7263f4..c0889de0ea 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansManager.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansManager.nuspec @@ -22,8 +22,8 @@ - - + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec b/src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec index 40dffee589..244f6b82eb 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansProviders.nuspec @@ -22,9 +22,9 @@ - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec b/src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec index 75a6f1e3fe..cb056305d8 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansRuntime.nuspec @@ -19,14 +19,12 @@ Orleans Cloud-Computing Actor-Model Actors Distributed-Systems C# .NET - - - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansServiceBus.nuspec b/src/NuGet/Microsoft.Orleans.OrleansServiceBus.nuspec index 93f5216c7a..091868c836 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansServiceBus.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansServiceBus.nuspec @@ -26,9 +26,9 @@ - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansSqlUtils.nuspec b/src/NuGet/Microsoft.Orleans.OrleansSqlUtils.nuspec index a3aeb543c2..c6409373c9 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansSqlUtils.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansSqlUtils.nuspec @@ -23,11 +23,11 @@ - - - - - - + + + + + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.AI.nuspec b/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.AI.nuspec index 9a64088ba8..dc180991e1 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.AI.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.AI.nuspec @@ -23,6 +23,6 @@ - + diff --git a/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.Counters.nuspec b/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.Counters.nuspec index c6fcf6d6d0..9e113a6820 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.Counters.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.Counters.nuspec @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.NewRelic.nuspec b/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.NewRelic.nuspec index 982326c50e..e690b71686 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.NewRelic.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansTelemetryConsumers.NewRelic.nuspec @@ -23,6 +23,6 @@ - + diff --git a/src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec b/src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec index e534f4cfdd..940344a1c9 100644 --- a/src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec +++ b/src/NuGet/Microsoft.Orleans.OrleansZooKeeperUtils.nuspec @@ -24,9 +24,9 @@ - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.Serialization.Bond.nuspec b/src/NuGet/Microsoft.Orleans.Serialization.Bond.nuspec index 55f8470f41..fd3dabd1c4 100644 --- a/src/NuGet/Microsoft.Orleans.Serialization.Bond.nuspec +++ b/src/NuGet/Microsoft.Orleans.Serialization.Bond.nuspec @@ -24,9 +24,9 @@ - - - + + + diff --git a/src/NuGet/Microsoft.Orleans.ServiceFabric.nuspec b/src/NuGet/Microsoft.Orleans.ServiceFabric.nuspec index ee19f240d0..61ae43a4a8 100644 --- a/src/NuGet/Microsoft.Orleans.ServiceFabric.nuspec +++ b/src/NuGet/Microsoft.Orleans.ServiceFabric.nuspec @@ -25,9 +25,9 @@ - - - + + + \ No newline at end of file diff --git a/src/NuGet/Microsoft.Orleans.TestingHost.nuspec b/src/NuGet/Microsoft.Orleans.TestingHost.nuspec index e93ccd6815..b672cb0fa7 100644 --- a/src/NuGet/Microsoft.Orleans.TestingHost.nuspec +++ b/src/NuGet/Microsoft.Orleans.TestingHost.nuspec @@ -21,13 +21,13 @@ - + - - - + + + diff --git a/src/Orleans.sln b/src/Orleans.sln index 48e163cf17..0b5dbd6cb9 100644 --- a/src/Orleans.sln +++ b/src/Orleans.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.26403.7 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{013DFD29-E1DB-4968-A67B-C2342E6F5B6E}" ProjectSection(SolutionItems) = preProject diff --git a/src/Orleans/Orleans.2017.csproj b/src/Orleans/Orleans.2017.csproj index 572a3f1c76..a9ebabeaa7 100644 --- a/src/Orleans/Orleans.2017.csproj +++ b/src/Orleans/Orleans.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true true @@ -37,10 +37,10 @@ - + - - + + diff --git a/src/Orleans/Orleans.csproj b/src/Orleans/Orleans.csproj index 831081579c..c8539e36cb 100644 --- a/src/Orleans/Orleans.csproj +++ b/src/Orleans/Orleans.csproj @@ -14,10 +14,12 @@ Properties Orleans Orleans - v4.5.1 + v4.6.1 512 false + true + true ..\ diff --git a/src/Orleans/project.json b/src/Orleans/project.json index a648cb443d..edad5ce9f2 100644 --- a/src/Orleans/project.json +++ b/src/Orleans/project.json @@ -1,12 +1,12 @@ { "dependencies": { - "Microsoft.Extensions.DependencyInjection": "1.0.0", + "Microsoft.Extensions.DependencyInjection": "1.1.0", "Newtonsoft.Json": "9.0.1", - "System.Collections.Immutable": "1.1.37", - "System.Reflection.Metadata": "1.2.0" + "System.Collections.Immutable": "1.3.1", + "System.Reflection.Metadata": "1.4.2" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansAWSUtils/OrleansAWSUtils.2017.csproj b/src/OrleansAWSUtils/OrleansAWSUtils.2017.csproj index ddd9bbc602..7b59e0a818 100644 --- a/src/OrleansAWSUtils/OrleansAWSUtils.2017.csproj +++ b/src/OrleansAWSUtils/OrleansAWSUtils.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansAWSUtils/OrleansAWSUtils.csproj b/src/OrleansAWSUtils/OrleansAWSUtils.csproj index 232ae71bfb..90a39bab40 100644 --- a/src/OrleansAWSUtils/OrleansAWSUtils.csproj +++ b/src/OrleansAWSUtils/OrleansAWSUtils.csproj @@ -9,8 +9,11 @@ Properties OrleansAWSUtils OrleansAWSUtils - v4.5.1 + v4.6.1 512 + + true + true true diff --git a/src/OrleansAWSUtils/project.json b/src/OrleansAWSUtils/project.json index b63939ecd7..024435b18f 100644 --- a/src/OrleansAWSUtils/project.json +++ b/src/OrleansAWSUtils/project.json @@ -4,7 +4,7 @@ "AWSSDK.SQS": "3.1.0.9" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansAzureUtils/OrleansAzureUtils.2017.csproj b/src/OrleansAzureUtils/OrleansAzureUtils.2017.csproj index 421ae32c72..57f443a704 100644 --- a/src/OrleansAzureUtils/OrleansAzureUtils.2017.csproj +++ b/src/OrleansAzureUtils/OrleansAzureUtils.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansAzureUtils/OrleansAzureUtils.csproj b/src/OrleansAzureUtils/OrleansAzureUtils.csproj index 59d1a56737..2638ea174a 100644 --- a/src/OrleansAzureUtils/OrleansAzureUtils.csproj +++ b/src/OrleansAzureUtils/OrleansAzureUtils.csproj @@ -11,10 +11,12 @@ Properties Orleans.Runtime.Host OrleansAzureUtils - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansAzureUtils/app.config b/src/OrleansAzureUtils/app.config index 6412bc2379..fd3b41004a 100644 --- a/src/OrleansAzureUtils/app.config +++ b/src/OrleansAzureUtils/app.config @@ -1,15 +1,6 @@ - + - - - - - - - - - - - - - \ No newline at end of file + + + + diff --git a/src/OrleansAzureUtils/project.json b/src/OrleansAzureUtils/project.json index d47c6f094c..c0b6f08cb1 100644 --- a/src/OrleansAzureUtils/project.json +++ b/src/OrleansAzureUtils/project.json @@ -3,7 +3,7 @@ "WindowsAzure.Storage": "7.0.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansBondUtils/OrleansBondUtils.2017.csproj b/src/OrleansBondUtils/OrleansBondUtils.2017.csproj index bc281334f8..74fdd1d986 100644 --- a/src/OrleansBondUtils/OrleansBondUtils.2017.csproj +++ b/src/OrleansBondUtils/OrleansBondUtils.2017.csproj @@ -11,7 +11,7 @@ NETSTANDARD;NETSTANDARD_TODO - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansBondUtils/OrleansBondUtils.csproj b/src/OrleansBondUtils/OrleansBondUtils.csproj index 8ef55ae945..6f6bf91557 100644 --- a/src/OrleansBondUtils/OrleansBondUtils.csproj +++ b/src/OrleansBondUtils/OrleansBondUtils.csproj @@ -9,10 +9,12 @@ Properties Orleans.Serialization OrleansBondUtils - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansBondUtils/project.json b/src/OrleansBondUtils/project.json index 4e45557f3e..24b926a988 100644 --- a/src/OrleansBondUtils/project.json +++ b/src/OrleansBondUtils/project.json @@ -3,7 +3,7 @@ "Bond.Runtime.CSharp": "5.1.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansCodeGenerator/OrleansCodeGenerator.2017.csproj b/src/OrleansCodeGenerator/OrleansCodeGenerator.2017.csproj index 902e2c9926..a2774ef006 100644 --- a/src/OrleansCodeGenerator/OrleansCodeGenerator.2017.csproj +++ b/src/OrleansCodeGenerator/OrleansCodeGenerator.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true true @@ -20,7 +20,7 @@ - + diff --git a/src/OrleansCodeGenerator/OrleansCodeGenerator.csproj b/src/OrleansCodeGenerator/OrleansCodeGenerator.csproj index 4133ba5725..fdb8f5eabf 100644 --- a/src/OrleansCodeGenerator/OrleansCodeGenerator.csproj +++ b/src/OrleansCodeGenerator/OrleansCodeGenerator.csproj @@ -9,10 +9,12 @@ Properties Orleans.CodeGenerator OrleansCodeGenerator - v4.5.1 + v4.6.1 512 AnyCPU + true + true true @@ -42,11 +44,7 @@ - - - - diff --git a/src/OrleansCodeGenerator/project.json b/src/OrleansCodeGenerator/project.json index 9aebefa617..ec3b10e732 100644 --- a/src/OrleansCodeGenerator/project.json +++ b/src/OrleansCodeGenerator/project.json @@ -1,9 +1,9 @@ { "dependencies": { - "Microsoft.CodeAnalysis.CSharp": "1.3.2" + "Microsoft.CodeAnalysis.CSharp": "2.0.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansConsulUtils/OrleansConsulUtils.2017.csproj b/src/OrleansConsulUtils/OrleansConsulUtils.2017.csproj index 252dfe3f46..45d60c485b 100644 --- a/src/OrleansConsulUtils/OrleansConsulUtils.2017.csproj +++ b/src/OrleansConsulUtils/OrleansConsulUtils.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true true diff --git a/src/OrleansConsulUtils/OrleansConsulUtils.csproj b/src/OrleansConsulUtils/OrleansConsulUtils.csproj index 977f3dfa4f..54d969a843 100644 --- a/src/OrleansConsulUtils/OrleansConsulUtils.csproj +++ b/src/OrleansConsulUtils/OrleansConsulUtils.csproj @@ -9,12 +9,12 @@ Properties Orleans.Runtime.Host OrleansConsulUtils - v4.5.1 + v4.6.1 512 - true - true AnyCPU + true + true true @@ -48,7 +48,6 @@ - diff --git a/src/OrleansConsulUtils/project.json b/src/OrleansConsulUtils/project.json index c67e98faf2..32019da4b9 100644 --- a/src/OrleansConsulUtils/project.json +++ b/src/OrleansConsulUtils/project.json @@ -3,7 +3,7 @@ "Consul": "0.7.0.3" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansCounterControl/App.config b/src/OrleansCounterControl/App.config index bed25ab7ba..3e6b6ccd19 100644 --- a/src/OrleansCounterControl/App.config +++ b/src/OrleansCounterControl/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/src/OrleansCounterControl/OrleansCounterControl.2017.csproj b/src/OrleansCounterControl/OrleansCounterControl.2017.csproj index a59949cdec..40a646078c 100644 --- a/src/OrleansCounterControl/OrleansCounterControl.2017.csproj +++ b/src/OrleansCounterControl/OrleansCounterControl.2017.csproj @@ -8,10 +8,11 @@ - net451 + net461 Exe false true + true 1591 Properties Orleans.Counter.Control diff --git a/src/OrleansCounterControl/OrleansCounterControl.csproj b/src/OrleansCounterControl/OrleansCounterControl.csproj index 4106f43898..06b06ec70f 100644 --- a/src/OrleansCounterControl/OrleansCounterControl.csproj +++ b/src/OrleansCounterControl/OrleansCounterControl.csproj @@ -11,9 +11,11 @@ Properties Orleans.Counter.Control OrleansCounterControl - v4.5.1 + v4.6.1 512 + true + true AnyCPU diff --git a/src/OrleansEventSourcing/OrleansEventSourcing.2017.csproj b/src/OrleansEventSourcing/OrleansEventSourcing.2017.csproj index dc1019b3ad..7835a41a6c 100644 --- a/src/OrleansEventSourcing/OrleansEventSourcing.2017.csproj +++ b/src/OrleansEventSourcing/OrleansEventSourcing.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true true diff --git a/src/OrleansEventSourcing/OrleansEventSourcing.csproj b/src/OrleansEventSourcing/OrleansEventSourcing.csproj index fcbd67d1a4..4a60a73a38 100644 --- a/src/OrleansEventSourcing/OrleansEventSourcing.csproj +++ b/src/OrleansEventSourcing/OrleansEventSourcing.csproj @@ -9,7 +9,7 @@ Properties Orleans.EventSourcing OrleansEventSourcing - v4.5.1 + v4.6.1 512 prompt 4 @@ -17,6 +17,8 @@ 4014 AnyCPU + true + true true diff --git a/src/OrleansGoogleUtils/OrleansGoogleUtils.2017.csproj b/src/OrleansGoogleUtils/OrleansGoogleUtils.2017.csproj index 02bef0be12..14a2a47be6 100644 --- a/src/OrleansGoogleUtils/OrleansGoogleUtils.2017.csproj +++ b/src/OrleansGoogleUtils/OrleansGoogleUtils.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansGoogleUtils/OrleansGoogleUtils.csproj b/src/OrleansGoogleUtils/OrleansGoogleUtils.csproj index 85c235213d..bd4748100d 100644 --- a/src/OrleansGoogleUtils/OrleansGoogleUtils.csproj +++ b/src/OrleansGoogleUtils/OrleansGoogleUtils.csproj @@ -9,10 +9,12 @@ Properties Orleans.Serialization OrleansGoogleUtils - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansGoogleUtils/project.json b/src/OrleansGoogleUtils/project.json index 87603c5a03..e6c802f03e 100644 --- a/src/OrleansGoogleUtils/project.json +++ b/src/OrleansGoogleUtils/project.json @@ -3,7 +3,7 @@ "Google.Protobuf": "3.0.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansHost/OrleansHost.2017.csproj b/src/OrleansHost/OrleansHost.2017.csproj index 0a226ceb20..8fc2e2bc72 100644 --- a/src/OrleansHost/OrleansHost.2017.csproj +++ b/src/OrleansHost/OrleansHost.2017.csproj @@ -8,10 +8,11 @@ - net451 + net461 Exe false true + true 1591 Properties Orleans.Runtime.Host diff --git a/src/OrleansHost/OrleansHost.csproj b/src/OrleansHost/OrleansHost.csproj index 6ca1275ac2..17ff43339d 100644 --- a/src/OrleansHost/OrleansHost.csproj +++ b/src/OrleansHost/OrleansHost.csproj @@ -11,9 +11,11 @@ Properties Orleans.Runtime.Host OrleansHost - v4.5.1 + v4.6.1 512 + true + true true diff --git a/src/OrleansHost/app.config b/src/OrleansHost/app.config index 7605b75d03..a9ab0581c0 100644 --- a/src/OrleansHost/app.config +++ b/src/OrleansHost/app.config @@ -1,34 +1,20 @@ - + - + - + - + - - - - - - - - - - - - - - diff --git a/src/OrleansHost/project.json b/src/OrleansHost/project.json index d64785de89..608f848195 100644 --- a/src/OrleansHost/project.json +++ b/src/OrleansHost/project.json @@ -3,7 +3,7 @@ }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansManager/OrleansManager.2017.csproj b/src/OrleansManager/OrleansManager.2017.csproj index e12ce28e2b..748f4dca41 100644 --- a/src/OrleansManager/OrleansManager.2017.csproj +++ b/src/OrleansManager/OrleansManager.2017.csproj @@ -8,10 +8,11 @@ - net451 + net461 Exe false true + true 1591 Properties OrleansManager diff --git a/src/OrleansManager/OrleansManager.csproj b/src/OrleansManager/OrleansManager.csproj index 989fbbc6ac..96fefc5f1d 100644 --- a/src/OrleansManager/OrleansManager.csproj +++ b/src/OrleansManager/OrleansManager.csproj @@ -11,9 +11,11 @@ Properties OrleansManager OrleansManager - v4.5.1 + v4.6.1 512 + true + true true diff --git a/src/OrleansManager/app.config b/src/OrleansManager/app.config index bce633a558..99216b8f80 100644 --- a/src/OrleansManager/app.config +++ b/src/OrleansManager/app.config @@ -1,6 +1,6 @@ - + diff --git a/src/OrleansPSUtils/OrleansPSUtils.2017.csproj b/src/OrleansPSUtils/OrleansPSUtils.2017.csproj index f7fd759594..a4905b244e 100644 --- a/src/OrleansPSUtils/OrleansPSUtils.2017.csproj +++ b/src/OrleansPSUtils/OrleansPSUtils.2017.csproj @@ -8,10 +8,11 @@ - net451 + net461 false true true + true 1591 OrleansPSUtils OrleansPSUtils diff --git a/src/OrleansPSUtils/OrleansPSUtils.csproj b/src/OrleansPSUtils/OrleansPSUtils.csproj index 1feebf5f85..9c6592aa2b 100644 --- a/src/OrleansPSUtils/OrleansPSUtils.csproj +++ b/src/OrleansPSUtils/OrleansPSUtils.csproj @@ -31,9 +31,11 @@ Properties OrleansPSUtils OrleansPSUtils - v4.5.1 + v4.6.1 512 + true + true true diff --git a/src/OrleansPSUtils/project.json b/src/OrleansPSUtils/project.json index 56138b35f8..18eddb9dec 100644 --- a/src/OrleansPSUtils/project.json +++ b/src/OrleansPSUtils/project.json @@ -1,14 +1,9 @@ { "dependencies": { - "Microsoft.CodeAnalysis.Analyzers": "1.1.0", - "Microsoft.CodeAnalysis.Common": "1.3.2", - "Microsoft.CodeAnalysis.CSharp": "1.3.2", - "System.Collections.Immutable": "1.1.37", - "System.Management.Automation.dll": "10.0.10586", - "System.Reflection.Metadata": "1.2.0" + "Microsoft.PowerShell.5.ReferenceAssemblies": "1.0.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansProviders/OrleansProviders.2017.csproj b/src/OrleansProviders/OrleansProviders.2017.csproj index 9abe7165bc..22ab4a4d7c 100644 --- a/src/OrleansProviders/OrleansProviders.2017.csproj +++ b/src/OrleansProviders/OrleansProviders.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true true diff --git a/src/OrleansProviders/OrleansProviders.csproj b/src/OrleansProviders/OrleansProviders.csproj index 0e484567c2..c7099106b7 100644 --- a/src/OrleansProviders/OrleansProviders.csproj +++ b/src/OrleansProviders/OrleansProviders.csproj @@ -11,10 +11,12 @@ Properties Orleans.Providers OrleansProviders - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansProviders/project.json b/src/OrleansProviders/project.json index d64785de89..608f848195 100644 --- a/src/OrleansProviders/project.json +++ b/src/OrleansProviders/project.json @@ -3,7 +3,7 @@ }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansRuntime/OrleansRuntime.2017.csproj b/src/OrleansRuntime/OrleansRuntime.2017.csproj index 86df5c1103..09809b1abc 100644 --- a/src/OrleansRuntime/OrleansRuntime.2017.csproj +++ b/src/OrleansRuntime/OrleansRuntime.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true true @@ -22,9 +22,6 @@ - - - diff --git a/src/OrleansRuntime/OrleansRuntime.csproj b/src/OrleansRuntime/OrleansRuntime.csproj index e83dfa6ef7..9b6f83a736 100644 --- a/src/OrleansRuntime/OrleansRuntime.csproj +++ b/src/OrleansRuntime/OrleansRuntime.csproj @@ -11,9 +11,11 @@ Properties Orleans.Runtime OrleansRuntime - v4.5.1 + v4.6.1 512 + true + true true diff --git a/src/OrleansRuntime/project.json b/src/OrleansRuntime/project.json index 02c95abc14..14d9d9a198 100644 --- a/src/OrleansRuntime/project.json +++ b/src/OrleansRuntime/project.json @@ -1,9 +1,8 @@ { "dependencies": { - "Microsoft.Extensions.DependencyInjection": "1.0.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansSQLUtils/OrleansSQLUtils.2017.csproj b/src/OrleansSQLUtils/OrleansSQLUtils.2017.csproj index ef851fd0ce..b308b73bd3 100644 --- a/src/OrleansSQLUtils/OrleansSQLUtils.2017.csproj +++ b/src/OrleansSQLUtils/OrleansSQLUtils.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansSQLUtils/OrleansSQLUtils.csproj b/src/OrleansSQLUtils/OrleansSQLUtils.csproj index dbd78952af..b236efe165 100644 --- a/src/OrleansSQLUtils/OrleansSQLUtils.csproj +++ b/src/OrleansSQLUtils/OrleansSQLUtils.csproj @@ -9,10 +9,12 @@ Properties OrleansSQLUtils OrleansSQLUtils - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansSQLUtils/project.json b/src/OrleansSQLUtils/project.json index f79cbdf86a..4aa234edb7 100644 --- a/src/OrleansSQLUtils/project.json +++ b/src/OrleansSQLUtils/project.json @@ -2,7 +2,7 @@ "dependencies": { }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansServiceBus/OrleansServiceBus.2017.csproj b/src/OrleansServiceBus/OrleansServiceBus.2017.csproj index f4d5d705f8..bfa6c810b1 100644 --- a/src/OrleansServiceBus/OrleansServiceBus.2017.csproj +++ b/src/OrleansServiceBus/OrleansServiceBus.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansServiceBus/OrleansServiceBus.csproj b/src/OrleansServiceBus/OrleansServiceBus.csproj index 249ef0f517..eb97155da6 100644 --- a/src/OrleansServiceBus/OrleansServiceBus.csproj +++ b/src/OrleansServiceBus/OrleansServiceBus.csproj @@ -9,10 +9,12 @@ Properties OrleansServiceBus OrleansServiceBus - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansServiceBus/app.config b/src/OrleansServiceBus/app.config index 2e9b0f10d2..fd3b41004a 100644 --- a/src/OrleansServiceBus/app.config +++ b/src/OrleansServiceBus/app.config @@ -1,23 +1,6 @@ - + - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + diff --git a/src/OrleansServiceBus/project.json b/src/OrleansServiceBus/project.json index 3d31a39c84..0929bba42f 100644 --- a/src/OrleansServiceBus/project.json +++ b/src/OrleansServiceBus/project.json @@ -5,7 +5,7 @@ "WindowsAzure.Storage": "7.0.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansServiceFabricUtils/App.config b/src/OrleansServiceFabricUtils/App.config index 7fa9245f01..cb5f51998e 100644 --- a/src/OrleansServiceFabricUtils/App.config +++ b/src/OrleansServiceFabricUtils/App.config @@ -1,16 +1,10 @@ - + - - - - - - diff --git a/src/OrleansServiceFabricUtils/OrleansServiceFabricUtils.2017.csproj b/src/OrleansServiceFabricUtils/OrleansServiceFabricUtils.2017.csproj index e1e24a0400..a79be0dc36 100644 --- a/src/OrleansServiceFabricUtils/OrleansServiceFabricUtils.2017.csproj +++ b/src/OrleansServiceFabricUtils/OrleansServiceFabricUtils.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansServiceFabricUtils/OrleansServiceFabricUtils.csproj b/src/OrleansServiceFabricUtils/OrleansServiceFabricUtils.csproj index 812cc7f2e4..0753de1076 100644 --- a/src/OrleansServiceFabricUtils/OrleansServiceFabricUtils.csproj +++ b/src/OrleansServiceFabricUtils/OrleansServiceFabricUtils.csproj @@ -9,10 +9,11 @@ Properties Microsoft.Orleans.ServiceFabric Microsoft.Orleans.ServiceFabric - v4.5.1 + v4.6.1 512 - true + true + true x64 diff --git a/src/OrleansServiceFabricUtils/project.json b/src/OrleansServiceFabricUtils/project.json index e4258a8525..cf4afd35be 100644 --- a/src/OrleansServiceFabricUtils/project.json +++ b/src/OrleansServiceFabricUtils/project.json @@ -4,7 +4,7 @@ "Newtonsoft.Json": "9.0.1" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-x64": {} diff --git a/src/OrleansTelemetryConsumers.AI/OrleansTelemetryConsumers.AI.2017.csproj b/src/OrleansTelemetryConsumers.AI/OrleansTelemetryConsumers.AI.2017.csproj index 0870d0b9f9..0fd5a1a308 100644 --- a/src/OrleansTelemetryConsumers.AI/OrleansTelemetryConsumers.AI.2017.csproj +++ b/src/OrleansTelemetryConsumers.AI/OrleansTelemetryConsumers.AI.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansTelemetryConsumers.AI/OrleansTelemetryConsumers.AI.csproj b/src/OrleansTelemetryConsumers.AI/OrleansTelemetryConsumers.AI.csproj index 99ed55cfdf..cacdb09007 100644 --- a/src/OrleansTelemetryConsumers.AI/OrleansTelemetryConsumers.AI.csproj +++ b/src/OrleansTelemetryConsumers.AI/OrleansTelemetryConsumers.AI.csproj @@ -9,10 +9,12 @@ Properties Orleans.TelemetryConsumers.AI OrleansTelemetryConsumers.AI - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansTelemetryConsumers.AI/project.json b/src/OrleansTelemetryConsumers.AI/project.json index 234556274c..f0b25d90f4 100644 --- a/src/OrleansTelemetryConsumers.AI/project.json +++ b/src/OrleansTelemetryConsumers.AI/project.json @@ -3,7 +3,7 @@ "Microsoft.ApplicationInsights": "1.2.3" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansTelemetryConsumers.Counters/OrleansTelemetryConsumers.Counters.2017.csproj b/src/OrleansTelemetryConsumers.Counters/OrleansTelemetryConsumers.Counters.2017.csproj index ff6c06d628..f0c7d9b528 100644 --- a/src/OrleansTelemetryConsumers.Counters/OrleansTelemetryConsumers.Counters.2017.csproj +++ b/src/OrleansTelemetryConsumers.Counters/OrleansTelemetryConsumers.Counters.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true true diff --git a/src/OrleansTelemetryConsumers.Counters/OrleansTelemetryConsumers.Counters.csproj b/src/OrleansTelemetryConsumers.Counters/OrleansTelemetryConsumers.Counters.csproj index da74cf489b..2142f20b19 100644 --- a/src/OrleansTelemetryConsumers.Counters/OrleansTelemetryConsumers.Counters.csproj +++ b/src/OrleansTelemetryConsumers.Counters/OrleansTelemetryConsumers.Counters.csproj @@ -9,8 +9,11 @@ Properties OrleansTelemetryConsumers.Counters OrleansTelemetryConsumers.Counters - v4.5.1 + v4.6.1 512 + + true + true true diff --git a/src/OrleansTelemetryConsumers.NewRelic/OrleansTelemetryConsumers.NewRelic.2017.csproj b/src/OrleansTelemetryConsumers.NewRelic/OrleansTelemetryConsumers.NewRelic.2017.csproj index 8035032c69..44ada5f8b0 100644 --- a/src/OrleansTelemetryConsumers.NewRelic/OrleansTelemetryConsumers.NewRelic.2017.csproj +++ b/src/OrleansTelemetryConsumers.NewRelic/OrleansTelemetryConsumers.NewRelic.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true true diff --git a/src/OrleansTelemetryConsumers.NewRelic/OrleansTelemetryConsumers.NewRelic.csproj b/src/OrleansTelemetryConsumers.NewRelic/OrleansTelemetryConsumers.NewRelic.csproj index f9c10c7720..aea1ae7d31 100644 --- a/src/OrleansTelemetryConsumers.NewRelic/OrleansTelemetryConsumers.NewRelic.csproj +++ b/src/OrleansTelemetryConsumers.NewRelic/OrleansTelemetryConsumers.NewRelic.csproj @@ -9,10 +9,12 @@ Properties Orleans.TelemetryConsumers.NewRelic OrleansTelemetryConsumers.NewRelic - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansTelemetryConsumers.NewRelic/project.json b/src/OrleansTelemetryConsumers.NewRelic/project.json index 6d4c4b9ed9..ddec4d3c46 100644 --- a/src/OrleansTelemetryConsumers.NewRelic/project.json +++ b/src/OrleansTelemetryConsumers.NewRelic/project.json @@ -3,7 +3,7 @@ "NewRelic.Agent.Api": "5.10.59.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansTestingHost/OrleansTestingHost.2017.csproj b/src/OrleansTestingHost/OrleansTestingHost.2017.csproj index f0b2cd090f..df08c154fe 100644 --- a/src/OrleansTestingHost/OrleansTestingHost.2017.csproj +++ b/src/OrleansTestingHost/OrleansTestingHost.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false true win @@ -21,8 +21,8 @@ - - + + diff --git a/src/OrleansTestingHost/OrleansTestingHost.csproj b/src/OrleansTestingHost/OrleansTestingHost.csproj index 66fb2bee3f..bd1a186da3 100644 --- a/src/OrleansTestingHost/OrleansTestingHost.csproj +++ b/src/OrleansTestingHost/OrleansTestingHost.csproj @@ -9,10 +9,12 @@ Properties Orleans.TestingHost OrleansTestingHost - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansTestingHost/project.json b/src/OrleansTestingHost/project.json index db2dadaea4..0c3930d3b0 100644 --- a/src/OrleansTestingHost/project.json +++ b/src/OrleansTestingHost/project.json @@ -1,10 +1,10 @@ { "dependencies": { - "Microsoft.Extensions.Configuration": "1.0.0", - "Microsoft.Extensions.Configuration.Binder": "1.0.0" + "Microsoft.Extensions.Configuration": "1.1.1", + "Microsoft.Extensions.Configuration.Binder": "1.1.1" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj b/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj index 0ad50e8dfe..2a8d143775 100644 --- a/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj +++ b/src/OrleansVSTools/OrleansVSTools/OrleansVSTools.csproj @@ -16,7 +16,7 @@ OrleansVSTools true OrleansVSTools.snk - v4.5.1 + v4.6.1 false false false diff --git a/src/OrleansVSTools/VSItemTemplateGrainImplementationCSharp/VSItemTemplateGrainImplementationCSharp.csproj b/src/OrleansVSTools/VSItemTemplateGrainImplementationCSharp/VSItemTemplateGrainImplementationCSharp.csproj index c7aef505dc..9e29f5d5ad 100644 --- a/src/OrleansVSTools/VSItemTemplateGrainImplementationCSharp/VSItemTemplateGrainImplementationCSharp.csproj +++ b/src/OrleansVSTools/VSItemTemplateGrainImplementationCSharp/VSItemTemplateGrainImplementationCSharp.csproj @@ -14,7 +14,7 @@ Properties VSItemTemplateGrainImplementationCSharp VSItemTemplateGrainImplementationCSharp - v4.5.1 + v4.6.1 512 false false diff --git a/src/OrleansVSTools/VSItemTemplateGrainInterfaceCSharp/VSItemTemplateGrainInterfaceCSharp.csproj b/src/OrleansVSTools/VSItemTemplateGrainInterfaceCSharp/VSItemTemplateGrainInterfaceCSharp.csproj index d1a40229f3..32a0d66f82 100644 --- a/src/OrleansVSTools/VSItemTemplateGrainInterfaceCSharp/VSItemTemplateGrainInterfaceCSharp.csproj +++ b/src/OrleansVSTools/VSItemTemplateGrainInterfaceCSharp/VSItemTemplateGrainInterfaceCSharp.csproj @@ -14,7 +14,7 @@ Properties VSItemTemplateGrainInterfaceCSharp VSItemTemplateGrainInterfaceCSharp - v4.5.1 + v4.6.1 512 false false diff --git a/src/OrleansVSTools/VSProjectSiloHostCSharp/VSProjectSiloHostCSharp.csproj b/src/OrleansVSTools/VSProjectSiloHostCSharp/VSProjectSiloHostCSharp.csproj index 3900ec0e69..ce5c7b39ce 100644 --- a/src/OrleansVSTools/VSProjectSiloHostCSharp/VSProjectSiloHostCSharp.csproj +++ b/src/OrleansVSTools/VSProjectSiloHostCSharp/VSProjectSiloHostCSharp.csproj @@ -14,7 +14,7 @@ Properties VSProjectSiloHost VSProjectSiloHost - v4.5.1 + v4.6.1 512 false false diff --git a/src/OrleansVSTools/VSProjectTemplateGrainImplementationCSharp/VSProjectTemplateGrainImplementationCSharp.csproj b/src/OrleansVSTools/VSProjectTemplateGrainImplementationCSharp/VSProjectTemplateGrainImplementationCSharp.csproj index 8a6ae0d9ca..8ac50a127f 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainImplementationCSharp/VSProjectTemplateGrainImplementationCSharp.csproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainImplementationCSharp/VSProjectTemplateGrainImplementationCSharp.csproj @@ -14,7 +14,7 @@ Properties VSProjectTemplateGrainImplementationCSharp VSProjectTemplateGrainImplementationCSharp - v4.5.1 + v4.6.1 512 false false diff --git a/src/OrleansVSTools/VSProjectTemplateGrainInterfaceCSharp/VSProjectTemplateGrainInterfaceCSharp.csproj b/src/OrleansVSTools/VSProjectTemplateGrainInterfaceCSharp/VSProjectTemplateGrainInterfaceCSharp.csproj index abfa017b61..06c6288a52 100644 --- a/src/OrleansVSTools/VSProjectTemplateGrainInterfaceCSharp/VSProjectTemplateGrainInterfaceCSharp.csproj +++ b/src/OrleansVSTools/VSProjectTemplateGrainInterfaceCSharp/VSProjectTemplateGrainInterfaceCSharp.csproj @@ -14,7 +14,7 @@ Properties VSProjectTemplateGrainInterfaceCSharp VSProjectTemplateGrainInterfaceCSharp - v4.5.1 + v4.6.1 512 false false diff --git a/src/OrleansZooKeeperUtils/OrleansZooKeeperUtils.2017.csproj b/src/OrleansZooKeeperUtils/OrleansZooKeeperUtils.2017.csproj index 8d0b7ad8e4..ffdd030756 100644 --- a/src/OrleansZooKeeperUtils/OrleansZooKeeperUtils.2017.csproj +++ b/src/OrleansZooKeeperUtils/OrleansZooKeeperUtils.2017.csproj @@ -8,7 +8,7 @@ - net451 + net461 false $(PackageTargetFallback);portable-net45+win8+wpa81+wp8 true diff --git a/src/OrleansZooKeeperUtils/OrleansZooKeeperUtils.csproj b/src/OrleansZooKeeperUtils/OrleansZooKeeperUtils.csproj index 2549aeda90..9c245a74d4 100644 --- a/src/OrleansZooKeeperUtils/OrleansZooKeeperUtils.csproj +++ b/src/OrleansZooKeeperUtils/OrleansZooKeeperUtils.csproj @@ -9,10 +9,12 @@ Properties Orleans.Runtime.Host OrleansZooKeeperUtils - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/src/OrleansZooKeeperUtils/project.json b/src/OrleansZooKeeperUtils/project.json index 28fbc32f78..7e6823fb9f 100644 --- a/src/OrleansZooKeeperUtils/project.json +++ b/src/OrleansZooKeeperUtils/project.json @@ -3,7 +3,7 @@ "ZooKeeperNetEx": "3.4.8.5" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/AWSUtils.Tests/AWSUtils.Tests.2017.csproj b/test/AWSUtils.Tests/AWSUtils.Tests.2017.csproj index 6a9a844220..6d715f6578 100644 --- a/test/AWSUtils.Tests/AWSUtils.Tests.2017.csproj +++ b/test/AWSUtils.Tests/AWSUtils.Tests.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true AWSUtils.Tests AWSUtils.Tests diff --git a/test/AWSUtils.Tests/AWSUtils.Tests.csproj b/test/AWSUtils.Tests/AWSUtils.Tests.csproj index bf5f71e518..c9c3974c41 100644 --- a/test/AWSUtils.Tests/AWSUtils.Tests.csproj +++ b/test/AWSUtils.Tests/AWSUtils.Tests.csproj @@ -9,13 +9,12 @@ Properties AWSUtils.Tests AWSUtils.Tests - v4.5.1 + v4.6.1 512 - true - - AnyCPU + true + true true diff --git a/test/AWSUtils.Tests/App.config b/test/AWSUtils.Tests/App.config index 42e1f95a39..089e3b008a 100644 --- a/test/AWSUtils.Tests/App.config +++ b/test/AWSUtils.Tests/App.config @@ -4,11 +4,5 @@ - - - - - - \ No newline at end of file diff --git a/test/AWSUtils.Tests/project.json b/test/AWSUtils.Tests/project.json index cfda975a1d..7ed39ec0df 100644 --- a/test/AWSUtils.Tests/project.json +++ b/test/AWSUtils.Tests/project.json @@ -8,7 +8,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/Benchmarks/BenchmarkGrainInterfaces/BenchmarkGrainInterfaces.2017.csproj b/test/Benchmarks/BenchmarkGrainInterfaces/BenchmarkGrainInterfaces.2017.csproj index 7b2a31b8b5..1a66215799 100644 --- a/test/Benchmarks/BenchmarkGrainInterfaces/BenchmarkGrainInterfaces.2017.csproj +++ b/test/Benchmarks/BenchmarkGrainInterfaces/BenchmarkGrainInterfaces.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true diff --git a/test/Benchmarks/BenchmarkGrainInterfaces/BenchmarkGrainInterfaces.csproj b/test/Benchmarks/BenchmarkGrainInterfaces/BenchmarkGrainInterfaces.csproj index 2bfb6b15bb..7ca3d51c79 100644 --- a/test/Benchmarks/BenchmarkGrainInterfaces/BenchmarkGrainInterfaces.csproj +++ b/test/Benchmarks/BenchmarkGrainInterfaces/BenchmarkGrainInterfaces.csproj @@ -9,9 +9,11 @@ Properties BenchmarkGrainInterfaces BenchmarkGrainInterfaces - v4.5.1 + v4.6.1 512 + true + true true diff --git a/test/Benchmarks/BenchmarkGrains/BenchmarkGrains.2017.csproj b/test/Benchmarks/BenchmarkGrains/BenchmarkGrains.2017.csproj index 3ff28a3156..5874899eeb 100644 --- a/test/Benchmarks/BenchmarkGrains/BenchmarkGrains.2017.csproj +++ b/test/Benchmarks/BenchmarkGrains/BenchmarkGrains.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true diff --git a/test/Benchmarks/BenchmarkGrains/BenchmarkGrains.csproj b/test/Benchmarks/BenchmarkGrains/BenchmarkGrains.csproj index 4534ede0d7..ba1a9b4978 100644 --- a/test/Benchmarks/BenchmarkGrains/BenchmarkGrains.csproj +++ b/test/Benchmarks/BenchmarkGrains/BenchmarkGrains.csproj @@ -9,9 +9,11 @@ Properties BenchmarkGrains BenchmarkGrains - v4.5.1 + v4.6.1 512 + true + true true diff --git a/test/Benchmarks/Benchmarks/App.config b/test/Benchmarks/Benchmarks/App.config index 7a3faada62..11d51541cb 100644 --- a/test/Benchmarks/Benchmarks/App.config +++ b/test/Benchmarks/Benchmarks/App.config @@ -1,7 +1,7 @@ - + diff --git a/test/Benchmarks/Benchmarks/Benchmarks.2017.csproj b/test/Benchmarks/Benchmarks/Benchmarks.2017.csproj index 4283d24e35..59d04f2e73 100644 --- a/test/Benchmarks/Benchmarks/Benchmarks.2017.csproj +++ b/test/Benchmarks/Benchmarks/Benchmarks.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true Benchmarks Benchmarks diff --git a/test/Benchmarks/Benchmarks/Benchmarks.csproj b/test/Benchmarks/Benchmarks/Benchmarks.csproj index d435d46486..f41a759741 100644 --- a/test/Benchmarks/Benchmarks/Benchmarks.csproj +++ b/test/Benchmarks/Benchmarks/Benchmarks.csproj @@ -9,11 +9,10 @@ Properties Benchmarks Benchmarks - v4.5.1 + v4.6.1 512 - - - + true + true AnyCPU diff --git a/test/Benchmarks/Benchmarks/project.json b/test/Benchmarks/Benchmarks/project.json index 8ed9944f52..f3ef88171c 100644 --- a/test/Benchmarks/Benchmarks/project.json +++ b/test/Benchmarks/Benchmarks/project.json @@ -6,7 +6,7 @@ "xunit.extensibility.core": "2.1.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/BondUtils.Tests/App.config b/test/BondUtils.Tests/App.config index 42e1f95a39..089e3b008a 100644 --- a/test/BondUtils.Tests/App.config +++ b/test/BondUtils.Tests/App.config @@ -4,11 +4,5 @@ - - - - - - \ No newline at end of file diff --git a/test/BondUtils.Tests/BondUtils.Tests.2017.csproj b/test/BondUtils.Tests/BondUtils.Tests.2017.csproj index fa830c8efd..8d1ee43568 100644 --- a/test/BondUtils.Tests/BondUtils.Tests.2017.csproj +++ b/test/BondUtils.Tests/BondUtils.Tests.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true BondUtils.Tests BondUtils.Tests diff --git a/test/BondUtils.Tests/BondUtils.Tests.csproj b/test/BondUtils.Tests/BondUtils.Tests.csproj index 522ad26a35..95520b6d6e 100644 --- a/test/BondUtils.Tests/BondUtils.Tests.csproj +++ b/test/BondUtils.Tests/BondUtils.Tests.csproj @@ -9,13 +9,12 @@ Properties BondUtils.Tests BondUtils.Tests - v4.5.1 + v4.6.1 512 - true - - AnyCPU + true + true true diff --git a/test/BondUtils.Tests/project.json b/test/BondUtils.Tests/project.json index 00a71ca0a7..23387f6971 100644 --- a/test/BondUtils.Tests/project.json +++ b/test/BondUtils.Tests/project.json @@ -6,7 +6,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/Consul.Tests/App.config b/test/Consul.Tests/App.config index 42e1f95a39..35bbe61d35 100644 --- a/test/Consul.Tests/App.config +++ b/test/Consul.Tests/App.config @@ -6,8 +6,8 @@ - - + + diff --git a/test/Consul.Tests/Consul.Tests.2017.csproj b/test/Consul.Tests/Consul.Tests.2017.csproj index 8e4ece6b8d..05f39ade41 100644 --- a/test/Consul.Tests/Consul.Tests.2017.csproj +++ b/test/Consul.Tests/Consul.Tests.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win - false + true + true Consul.Tests Consul.Tests @@ -11,6 +12,7 @@ + diff --git a/test/Consul.Tests/Consul.Tests.csproj b/test/Consul.Tests/Consul.Tests.csproj index 86084418a5..7e8dab0623 100644 --- a/test/Consul.Tests/Consul.Tests.csproj +++ b/test/Consul.Tests/Consul.Tests.csproj @@ -9,8 +9,10 @@ Properties Consul.Tests Consul.Tests - v4.5.1 + v4.6.1 512 + true + true true @@ -29,16 +31,6 @@ prompt 4 - - - - - - - - - - diff --git a/test/Consul.Tests/ConsulTestUtils.cs b/test/Consul.Tests/ConsulTestUtils.cs index d3a9981387..a81ebc3432 100644 --- a/test/Consul.Tests/ConsulTestUtils.cs +++ b/test/Consul.Tests/ConsulTestUtils.cs @@ -23,6 +23,7 @@ public static async Task EnsureConsulAsync() try { var client = new HttpClient(); + client.Timeout = TimeSpan.FromSeconds(15); var response = await client.GetAsync($"{CONSUL_ENDPOINT}/v1/health/service/consul?pretty"); return response.StatusCode == HttpStatusCode.OK; } @@ -30,7 +31,10 @@ public static async Task EnsureConsulAsync() { return false; } - + catch (OperationCanceledException) + { + return false; + } } } } diff --git a/test/Consul.Tests/project.json b/test/Consul.Tests/project.json index 00a71ca0a7..b5973447cf 100644 --- a/test/Consul.Tests/project.json +++ b/test/Consul.Tests/project.json @@ -1,12 +1,13 @@ { "dependencies": { "FluentAssertions": "4.18.0", + "System.Net.Http": "4.3.0", "xunit": "2.1.0", "xunit.runner.visualstudio": "2.1.0", "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/DefaultCluster.Tests/App.config b/test/DefaultCluster.Tests/App.config index 42e1f95a39..089e3b008a 100644 --- a/test/DefaultCluster.Tests/App.config +++ b/test/DefaultCluster.Tests/App.config @@ -4,11 +4,5 @@ - - - - - - \ No newline at end of file diff --git a/test/DefaultCluster.Tests/DefaultCluster.Tests.2017.csproj b/test/DefaultCluster.Tests/DefaultCluster.Tests.2017.csproj index ef9f33fb4c..44f2e79e7a 100644 --- a/test/DefaultCluster.Tests/DefaultCluster.Tests.2017.csproj +++ b/test/DefaultCluster.Tests/DefaultCluster.Tests.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true DefaultCluster.Tests DefaultCluster.Tests @@ -19,8 +20,6 @@ - - diff --git a/test/DefaultCluster.Tests/DefaultCluster.Tests.csproj b/test/DefaultCluster.Tests/DefaultCluster.Tests.csproj index ded73a00ca..a884ca7dd7 100644 --- a/test/DefaultCluster.Tests/DefaultCluster.Tests.csproj +++ b/test/DefaultCluster.Tests/DefaultCluster.Tests.csproj @@ -9,13 +9,12 @@ Properties DefaultCluster.Tests DefaultCluster.Tests - v4.5.1 + v4.6.1 512 - true - - AnyCPU + true + true true @@ -157,7 +156,9 @@ - + + Designer + diff --git a/test/DefaultCluster.Tests/project.json b/test/DefaultCluster.Tests/project.json index 00a71ca0a7..23387f6971 100644 --- a/test/DefaultCluster.Tests/project.json +++ b/test/DefaultCluster.Tests/project.json @@ -6,7 +6,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/GoogleUtils.Tests/App.config b/test/GoogleUtils.Tests/App.config index 42e1f95a39..089e3b008a 100644 --- a/test/GoogleUtils.Tests/App.config +++ b/test/GoogleUtils.Tests/App.config @@ -4,11 +4,5 @@ - - - - - - \ No newline at end of file diff --git a/test/GoogleUtils.Tests/GoogleUtils.Tests.2017.csproj b/test/GoogleUtils.Tests/GoogleUtils.Tests.2017.csproj index 3917e7c067..6b8818c98c 100644 --- a/test/GoogleUtils.Tests/GoogleUtils.Tests.2017.csproj +++ b/test/GoogleUtils.Tests/GoogleUtils.Tests.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true GoogleUtils.Tests GoogleUtils.Tests diff --git a/test/GoogleUtils.Tests/GoogleUtils.Tests.csproj b/test/GoogleUtils.Tests/GoogleUtils.Tests.csproj index a402872c43..c9cd6df3ae 100644 --- a/test/GoogleUtils.Tests/GoogleUtils.Tests.csproj +++ b/test/GoogleUtils.Tests/GoogleUtils.Tests.csproj @@ -9,13 +9,12 @@ Properties GoogleUtils.Tests GoogleUtils.Tests - v4.5.1 + v4.6.1 512 - true - - AnyCPU + true + true true diff --git a/test/GoogleUtils.Tests/project.json b/test/GoogleUtils.Tests/project.json index 00a71ca0a7..23387f6971 100644 --- a/test/GoogleUtils.Tests/project.json +++ b/test/GoogleUtils.Tests/project.json @@ -6,7 +6,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/NonSilo.Tests/App.config b/test/NonSilo.Tests/App.config deleted file mode 100644 index aad1cd3baf..0000000000 --- a/test/NonSilo.Tests/App.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/test/NonSilo.Tests/NonSilo.Tests.2017.csproj b/test/NonSilo.Tests/NonSilo.Tests.2017.csproj index fefe42ccbb..b49abee620 100644 --- a/test/NonSilo.Tests/NonSilo.Tests.2017.csproj +++ b/test/NonSilo.Tests/NonSilo.Tests.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true NonSilo.Tests NonSilo.Tests diff --git a/test/NonSilo.Tests/NonSilo.Tests.csproj b/test/NonSilo.Tests/NonSilo.Tests.csproj index b0418c46d0..231cdcf398 100644 --- a/test/NonSilo.Tests/NonSilo.Tests.csproj +++ b/test/NonSilo.Tests/NonSilo.Tests.csproj @@ -9,13 +9,12 @@ Properties NonSilo.Tests NonSilo.Tests - v4.5.1 + v4.6.1 512 - true - - AnyCPU + true + true true @@ -226,7 +225,6 @@ - PreserveNewest diff --git a/test/NonSilo.Tests/project.json b/test/NonSilo.Tests/project.json index 2c79bc287f..a15068d31b 100644 --- a/test/NonSilo.Tests/project.json +++ b/test/NonSilo.Tests/project.json @@ -3,7 +3,7 @@ "Newtonsoft.Json": "9.0.1" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/PSUtils.Tests/App.config b/test/PSUtils.Tests/App.config index 42e1f95a39..089e3b008a 100644 --- a/test/PSUtils.Tests/App.config +++ b/test/PSUtils.Tests/App.config @@ -4,11 +4,5 @@ - - - - - - \ No newline at end of file diff --git a/test/PSUtils.Tests/PSUtils.Tests.2017.csproj b/test/PSUtils.Tests/PSUtils.Tests.2017.csproj index 2b4baa4e69..3528fd0802 100644 --- a/test/PSUtils.Tests/PSUtils.Tests.2017.csproj +++ b/test/PSUtils.Tests/PSUtils.Tests.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true PSUtils.Tests PSUtils.Tests diff --git a/test/PSUtils.Tests/PSUtils.Tests.csproj b/test/PSUtils.Tests/PSUtils.Tests.csproj index 43e19eb6c6..bf2642e591 100644 --- a/test/PSUtils.Tests/PSUtils.Tests.csproj +++ b/test/PSUtils.Tests/PSUtils.Tests.csproj @@ -9,13 +9,12 @@ Properties PSUtils.Tests PSUtils.Tests - v4.5.1 + v4.6.1 512 - true - - AnyCPU + true + true true diff --git a/test/PSUtils.Tests/project.json b/test/PSUtils.Tests/project.json index 00a71ca0a7..23387f6971 100644 --- a/test/PSUtils.Tests/project.json +++ b/test/PSUtils.Tests/project.json @@ -6,7 +6,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/ServiceBus.Tests/App.config b/test/ServiceBus.Tests/App.config index 42e1f95a39..089e3b008a 100644 --- a/test/ServiceBus.Tests/App.config +++ b/test/ServiceBus.Tests/App.config @@ -4,11 +4,5 @@ - - - - - - \ No newline at end of file diff --git a/test/ServiceBus.Tests/ServiceBus.Tests.2017.csproj b/test/ServiceBus.Tests/ServiceBus.Tests.2017.csproj index 9e20eb0c41..a6630d643b 100644 --- a/test/ServiceBus.Tests/ServiceBus.Tests.2017.csproj +++ b/test/ServiceBus.Tests/ServiceBus.Tests.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true ServiceBus.Tests ServiceBus.Tests diff --git a/test/ServiceBus.Tests/ServiceBus.Tests.csproj b/test/ServiceBus.Tests/ServiceBus.Tests.csproj index c0ed1dfa35..6f9ed59c67 100644 --- a/test/ServiceBus.Tests/ServiceBus.Tests.csproj +++ b/test/ServiceBus.Tests/ServiceBus.Tests.csproj @@ -9,13 +9,12 @@ Properties ServiceBus.Tests ServiceBus.Tests - v4.5.1 + v4.6.1 512 - true - - AnyCPU + true + true true diff --git a/test/ServiceBus.Tests/project.json b/test/ServiceBus.Tests/project.json index 00a71ca0a7..23387f6971 100644 --- a/test/ServiceBus.Tests/project.json +++ b/test/ServiceBus.Tests/project.json @@ -6,7 +6,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TestExtensions/TestExtensions.2017.csproj b/test/TestExtensions/TestExtensions.2017.csproj index 9f58b1051c..9a1b15d74e 100644 --- a/test/TestExtensions/TestExtensions.2017.csproj +++ b/test/TestExtensions/TestExtensions.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true @@ -13,8 +13,8 @@ - - + + diff --git a/test/TestExtensions/TestExtensions.csproj b/test/TestExtensions/TestExtensions.csproj index af2dfc4fb5..0a2a7c492d 100644 --- a/test/TestExtensions/TestExtensions.csproj +++ b/test/TestExtensions/TestExtensions.csproj @@ -9,10 +9,12 @@ Properties TestExtensions TestExtensions - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/test/TestExtensions/project.json b/test/TestExtensions/project.json index 9ccb45b412..15d6d62738 100644 --- a/test/TestExtensions/project.json +++ b/test/TestExtensions/project.json @@ -1,14 +1,14 @@ { "dependencies": { - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1", + "Microsoft.Extensions.Configuration.Json": "1.1.1", "xunit.abstractions": "2.0.0", "xunit.core": "2.1.0", "xunit.extensibility.core": "2.1.0", "xunit.extensibility.execution": "2.1.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TestFSharp/TestFSharp.fsproj b/test/TestFSharp/TestFSharp.fsproj index f791b62340..b333693132 100644 --- a/test/TestFSharp/TestFSharp.fsproj +++ b/test/TestFSharp/TestFSharp.fsproj @@ -8,10 +8,11 @@ Library TestFSharp TestFSharp - v4.5.1 + v4.6.1 4.4.1.0 - true TestFSharp + true + true true diff --git a/test/TestFSharp/packages.config b/test/TestFSharp/packages.config index d1dd726e7a..95aa142af3 100644 --- a/test/TestFSharp/packages.config +++ b/test/TestFSharp/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/test/TestFSharpInterfaces/TestFSharpInterfaces.fsproj b/test/TestFSharpInterfaces/TestFSharpInterfaces.fsproj index 49ed0f4be2..b809d8b328 100644 --- a/test/TestFSharpInterfaces/TestFSharpInterfaces.fsproj +++ b/test/TestFSharpInterfaces/TestFSharpInterfaces.fsproj @@ -8,10 +8,11 @@ Library TestFSharpInterfaces TestFSharpInterfaces - v4.5.1 + v4.6.1 4.4.1.0 - true TestFSharpInterfaces + true + true true diff --git a/test/TestFSharpInterfaces/packages.config b/test/TestFSharpInterfaces/packages.config index d1dd726e7a..95aa142af3 100644 --- a/test/TestFSharpInterfaces/packages.config +++ b/test/TestFSharpInterfaces/packages.config @@ -1,5 +1,5 @@  - - + + \ No newline at end of file diff --git a/test/TestGrainInterfaces/TestGrainInterfaces.2017.csproj b/test/TestGrainInterfaces/TestGrainInterfaces.2017.csproj index e76a59ae07..59df50ea3d 100644 --- a/test/TestGrainInterfaces/TestGrainInterfaces.2017.csproj +++ b/test/TestGrainInterfaces/TestGrainInterfaces.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true diff --git a/test/TestGrainInterfaces/TestGrainInterfaces.csproj b/test/TestGrainInterfaces/TestGrainInterfaces.csproj index 2fe0dcc421..da0cc906d9 100644 --- a/test/TestGrainInterfaces/TestGrainInterfaces.csproj +++ b/test/TestGrainInterfaces/TestGrainInterfaces.csproj @@ -11,10 +11,12 @@ Properties UnitTests.GrainInterfaces TestGrainInterfaces - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/test/TestGrainInterfaces/project.json b/test/TestGrainInterfaces/project.json index 0bc2a86605..5dab61b5b8 100644 --- a/test/TestGrainInterfaces/project.json +++ b/test/TestGrainInterfaces/project.json @@ -3,7 +3,7 @@ "FSharp.Core": "4.0.0.1" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TestGrains/TestGrains.2017.csproj b/test/TestGrains/TestGrains.2017.csproj index ac0bae0e51..cb8a6927f9 100644 --- a/test/TestGrains/TestGrains.2017.csproj +++ b/test/TestGrains/TestGrains.2017.csproj @@ -1,6 +1,6 @@ - net451 + net461 false win true diff --git a/test/TestGrains/TestGrains.csproj b/test/TestGrains/TestGrains.csproj index 264d078d2f..3b3db65e12 100644 --- a/test/TestGrains/TestGrains.csproj +++ b/test/TestGrains/TestGrains.csproj @@ -11,9 +11,11 @@ Properties UnitTests.Grains TestGrains - v4.5.1 + v4.6.1 512 + true + true true diff --git a/test/TestGrains/project.json b/test/TestGrains/project.json index 1e47f85fa8..e7076e05ee 100644 --- a/test/TestGrains/project.json +++ b/test/TestGrains/project.json @@ -2,7 +2,7 @@ "dependencies": { }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TestInterfaces/TestInterfaces.2017.csproj b/test/TestInterfaces/TestInterfaces.2017.csproj index aaecf689a2..9e9e6375cc 100644 --- a/test/TestInterfaces/TestInterfaces.2017.csproj +++ b/test/TestInterfaces/TestInterfaces.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true diff --git a/test/TestInterfaces/TestInterfaces.csproj b/test/TestInterfaces/TestInterfaces.csproj index c3895931d3..d9c026e4af 100644 --- a/test/TestInterfaces/TestInterfaces.csproj +++ b/test/TestInterfaces/TestInterfaces.csproj @@ -9,10 +9,12 @@ Properties UnitTests.Interfaces TestInterfaces - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/test/TestInternalDtosRefOrleans/TestInternalDtosRefOrleans.2017.csproj b/test/TestInternalDtosRefOrleans/TestInternalDtosRefOrleans.2017.csproj index bc83eb7beb..313bfd5ceb 100644 --- a/test/TestInternalDtosRefOrleans/TestInternalDtosRefOrleans.2017.csproj +++ b/test/TestInternalDtosRefOrleans/TestInternalDtosRefOrleans.2017.csproj @@ -1,6 +1,6 @@ - net451 + net461 false win true diff --git a/test/TestInternalDtosRefOrleans/TestInternalDtosRefOrleans.csproj b/test/TestInternalDtosRefOrleans/TestInternalDtosRefOrleans.csproj index ae8b9c7148..59abbc920f 100644 --- a/test/TestInternalDtosRefOrleans/TestInternalDtosRefOrleans.csproj +++ b/test/TestInternalDtosRefOrleans/TestInternalDtosRefOrleans.csproj @@ -9,10 +9,12 @@ Properties UnitTests.DtosRefOrleans TestInternalDtosRefOrleans - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/test/TestInternalGrainInterfaces/TestInternalGrainInterfaces.2017.csproj b/test/TestInternalGrainInterfaces/TestInternalGrainInterfaces.2017.csproj index fa70bade7a..07d6f0df50 100644 --- a/test/TestInternalGrainInterfaces/TestInternalGrainInterfaces.2017.csproj +++ b/test/TestInternalGrainInterfaces/TestInternalGrainInterfaces.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true diff --git a/test/TestInternalGrainInterfaces/TestInternalGrainInterfaces.csproj b/test/TestInternalGrainInterfaces/TestInternalGrainInterfaces.csproj index 72fed672ec..3e5818e330 100644 --- a/test/TestInternalGrainInterfaces/TestInternalGrainInterfaces.csproj +++ b/test/TestInternalGrainInterfaces/TestInternalGrainInterfaces.csproj @@ -9,10 +9,12 @@ Properties UnitTests.GrainInterfaces TestInternalGrainInterfaces - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/test/TestInternalGrainInterfaces/project.json b/test/TestInternalGrainInterfaces/project.json index 0bc2a86605..5dab61b5b8 100644 --- a/test/TestInternalGrainInterfaces/project.json +++ b/test/TestInternalGrainInterfaces/project.json @@ -3,7 +3,7 @@ "FSharp.Core": "4.0.0.1" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TestInternalGrains/TestInternalGrains.2017.csproj b/test/TestInternalGrains/TestInternalGrains.2017.csproj index 79e1a3ccbe..e774a47679 100644 --- a/test/TestInternalGrains/TestInternalGrains.2017.csproj +++ b/test/TestInternalGrains/TestInternalGrains.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true diff --git a/test/TestInternalGrains/TestInternalGrains.csproj b/test/TestInternalGrains/TestInternalGrains.csproj index dccc49c42d..b06efbe583 100644 --- a/test/TestInternalGrains/TestInternalGrains.csproj +++ b/test/TestInternalGrains/TestInternalGrains.csproj @@ -9,10 +9,12 @@ Properties UnitTests.Grains TestInternalGrains - v4.5.1 + v4.6.1 512 AnyCPU + true + true true diff --git a/test/TestInternalGrains/project.json b/test/TestInternalGrains/project.json index 24b6350c37..4a03ebf2ae 100644 --- a/test/TestInternalGrains/project.json +++ b/test/TestInternalGrains/project.json @@ -3,7 +3,7 @@ "xunit.assert": "2.1.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TestServiceFabric/TestServiceFabric.2017.csproj b/test/TestServiceFabric/TestServiceFabric.2017.csproj index 8d41a2dd90..0ef3b7738e 100644 --- a/test/TestServiceFabric/TestServiceFabric.2017.csproj +++ b/test/TestServiceFabric/TestServiceFabric.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true TestServiceFabric TestServiceFabric diff --git a/test/TestServiceFabric/TestServiceFabric.csproj b/test/TestServiceFabric/TestServiceFabric.csproj index 557794dd66..1c7a658117 100644 --- a/test/TestServiceFabric/TestServiceFabric.csproj +++ b/test/TestServiceFabric/TestServiceFabric.csproj @@ -9,9 +9,11 @@ Properties TestServiceFabric TestServiceFabric - v4.5.1 + v4.6.1 512 + true + true true diff --git a/test/TestServiceFabric/project.json b/test/TestServiceFabric/project.json index d946c2abc6..9be60006e5 100644 --- a/test/TestServiceFabric/project.json +++ b/test/TestServiceFabric/project.json @@ -7,7 +7,7 @@ "xunit": "2.1.0" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-x64": {} diff --git a/test/Tester/App.config b/test/Tester/App.config index a11cb01cbd..51da84c949 100644 --- a/test/Tester/App.config +++ b/test/Tester/App.config @@ -17,33 +17,11 @@ - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/Tester/HeterogeneousSilosTests/UpgradeTests.cs b/test/Tester/HeterogeneousSilosTests/UpgradeTests.cs index 78f70196e7..a7f6165d58 100644 --- a/test/Tester/HeterogeneousSilosTests/UpgradeTests.cs +++ b/test/Tester/HeterogeneousSilosTests/UpgradeTests.cs @@ -1,6 +1,5 @@ using System; using System.Collections.Generic; -using System.Globalization; using System.IO; using System.Reflection; using System.Threading.Tasks; @@ -13,7 +12,7 @@ namespace Tester.HeterogeneousSilosTests { - [TestCategory("ExcludeXAML")] + [TestCategory("Versioning"), TestCategory("ExcludeXAML")] public class UpgradeTests : IDisposable { diff --git a/test/Tester/Tester.2017.csproj b/test/Tester/Tester.2017.csproj index 4920cc9f5e..6554e825c2 100644 --- a/test/Tester/Tester.2017.csproj +++ b/test/Tester/Tester.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true Tester Tester @@ -11,9 +12,6 @@ - - - diff --git a/test/Tester/Tester.csproj b/test/Tester/Tester.csproj index 1255eac304..231e6a468b 100644 --- a/test/Tester/Tester.csproj +++ b/test/Tester/Tester.csproj @@ -9,13 +9,12 @@ Properties Tester Tester - v4.5.1 + v4.6.1 512 - true - - AnyCPU + true + true true @@ -205,7 +204,9 @@ - + + Designer + PreserveNewest diff --git a/test/Tester/project.json b/test/Tester/project.json index c7f0fd9311..70b01f3418 100644 --- a/test/Tester/project.json +++ b/test/Tester/project.json @@ -1,15 +1,15 @@ { "dependencies": { "FluentAssertions": "4.18.0", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0", - "Microsoft.Extensions.Configuration.Json": "1.0.0", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.1", + "Microsoft.Extensions.Configuration.Json": "1.1.1", "Newtonsoft.Json": "9.0.1", "xunit": "2.1.0", "xunit.runner.visualstudio": "2.1.0", "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TesterAzureUtils/App.config b/test/TesterAzureUtils/App.config deleted file mode 100644 index 701f86759a..0000000000 --- a/test/TesterAzureUtils/App.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/test/TesterAzureUtils/Tester.AzureUtils.2017.csproj b/test/TesterAzureUtils/Tester.AzureUtils.2017.csproj index a4237b10a3..4c97c236e5 100644 --- a/test/TesterAzureUtils/Tester.AzureUtils.2017.csproj +++ b/test/TesterAzureUtils/Tester.AzureUtils.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true Tester.AzureUtils Tester.AzureUtils @@ -39,7 +40,6 @@ - PreserveNewest diff --git a/test/TesterAzureUtils/TesterAzureUtils.csproj b/test/TesterAzureUtils/TesterAzureUtils.csproj index 4f04c10416..93f409603d 100644 --- a/test/TesterAzureUtils/TesterAzureUtils.csproj +++ b/test/TesterAzureUtils/TesterAzureUtils.csproj @@ -9,13 +9,13 @@ Properties Tester.AzureUtils Tester.AzureUtils - v4.5.1 + v4.6.1 512 true - - AnyCPU + true + true true @@ -150,7 +150,6 @@ - PreserveNewest diff --git a/test/TesterAzureUtils/project.json b/test/TesterAzureUtils/project.json index 5850bb9424..69842c64a3 100644 --- a/test/TesterAzureUtils/project.json +++ b/test/TesterAzureUtils/project.json @@ -7,7 +7,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TesterInternal/App.config b/test/TesterInternal/App.config index ea0ecf0222..2e1eccd50b 100644 --- a/test/TesterInternal/App.config +++ b/test/TesterInternal/App.config @@ -1,33 +1,11 @@  - + - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/TesterInternal/TesterInternal.2017.csproj b/test/TesterInternal/TesterInternal.2017.csproj index 4650eb12a0..b2246f78a7 100644 --- a/test/TesterInternal/TesterInternal.2017.csproj +++ b/test/TesterInternal/TesterInternal.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true UnitTests TesterInternal diff --git a/test/TesterInternal/TesterInternal.csproj b/test/TesterInternal/TesterInternal.csproj index cdbe145535..2e4329675b 100644 --- a/test/TesterInternal/TesterInternal.csproj +++ b/test/TesterInternal/TesterInternal.csproj @@ -9,13 +9,13 @@ Properties UnitTests TesterInternal - v4.5.1 + v4.6.1 512 ..\ - - AnyCPU + true + true true diff --git a/test/TesterInternal/project.json b/test/TesterInternal/project.json index a1c6a18f7d..a6cbfb4e9d 100644 --- a/test/TesterInternal/project.json +++ b/test/TesterInternal/project.json @@ -5,7 +5,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TesterSQLUtils/App.config b/test/TesterSQLUtils/App.config deleted file mode 100644 index 701f86759a..0000000000 --- a/test/TesterSQLUtils/App.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/test/TesterSQLUtils/Tester.SQLUtils.2017.csproj b/test/TesterSQLUtils/Tester.SQLUtils.2017.csproj index bcee6908ae..28923e213e 100644 --- a/test/TesterSQLUtils/Tester.SQLUtils.2017.csproj +++ b/test/TesterSQLUtils/Tester.SQLUtils.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true Tester.SQLUtils Tester.SQLUtils @@ -50,7 +51,6 @@ PreserveNewest - PreserveNewest diff --git a/test/TesterSQLUtils/TesterSQLUtils.csproj b/test/TesterSQLUtils/TesterSQLUtils.csproj index 9f703fef58..a2cb232db6 100644 --- a/test/TesterSQLUtils/TesterSQLUtils.csproj +++ b/test/TesterSQLUtils/TesterSQLUtils.csproj @@ -9,23 +9,10 @@ Properties Tester.SQLUtils Tester.SQLUtils - v4.5.1 + v4.6.1 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true + true + true true @@ -51,7 +38,6 @@ - @@ -92,7 +78,6 @@ - PreserveNewest diff --git a/test/TesterSQLUtils/project.json b/test/TesterSQLUtils/project.json index ed0c8dd583..57281ec031 100644 --- a/test/TesterSQLUtils/project.json +++ b/test/TesterSQLUtils/project.json @@ -11,7 +11,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/TesterZooKeeperUtils/App.config b/test/TesterZooKeeperUtils/App.config deleted file mode 100644 index 701f86759a..0000000000 --- a/test/TesterZooKeeperUtils/App.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/test/TesterZooKeeperUtils/Tester.ZooKeeperUtils.2017.csproj b/test/TesterZooKeeperUtils/Tester.ZooKeeperUtils.2017.csproj index 6dd2c23625..522072d058 100644 --- a/test/TesterZooKeeperUtils/Tester.ZooKeeperUtils.2017.csproj +++ b/test/TesterZooKeeperUtils/Tester.ZooKeeperUtils.2017.csproj @@ -1,9 +1,10 @@  - net451 + net461 false win true + true Tester.ZooKeeperUtils Tester.ZooKeeperUtils @@ -26,7 +27,6 @@ - PreserveNewest diff --git a/test/TesterZooKeeperUtils/TesterZooKeeperUtils.csproj b/test/TesterZooKeeperUtils/TesterZooKeeperUtils.csproj index c37d393cdb..1c530bd490 100644 --- a/test/TesterZooKeeperUtils/TesterZooKeeperUtils.csproj +++ b/test/TesterZooKeeperUtils/TesterZooKeeperUtils.csproj @@ -9,8 +9,10 @@ Properties Tester.ZooKeeperUtils Tester.ZooKeeperUtils - v4.5.1 + v4.6.1 512 + true + true true @@ -80,7 +82,6 @@ - diff --git a/test/TesterZooKeeperUtils/project.json b/test/TesterZooKeeperUtils/project.json index 5850bb9424..69842c64a3 100644 --- a/test/TesterZooKeeperUtils/project.json +++ b/test/TesterZooKeeperUtils/project.json @@ -7,7 +7,7 @@ "Xunit.SkippableFact": "1.2.14" }, "frameworks": { - "net451": {} + "net461": {} }, "runtimes": { "win-anycpu": {}, diff --git a/test/Versions/TestVersionGrains/TestVersionGrains.2017.csproj b/test/Versions/TestVersionGrains/TestVersionGrains.2017.csproj index d17ad4fae8..f3f0b811e7 100644 --- a/test/Versions/TestVersionGrains/TestVersionGrains.2017.csproj +++ b/test/Versions/TestVersionGrains/TestVersionGrains.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true diff --git a/test/Versions/TestVersionGrains/TestVersionGrains.csproj b/test/Versions/TestVersionGrains/TestVersionGrains.csproj index 6dadcf993c..192a9b5204 100644 --- a/test/Versions/TestVersionGrains/TestVersionGrains.csproj +++ b/test/Versions/TestVersionGrains/TestVersionGrains.csproj @@ -9,9 +9,11 @@ Properties TestVersionGrains TestVersionGrains - v4.5.1 + v4.6.1 512 + true + true $(OutDir)\TestVersionGrainsV1 @@ -69,5 +71,8 @@ Orleans + + + \ No newline at end of file diff --git a/test/Versions/TestVersionGrains/project.json b/test/Versions/TestVersionGrains/project.json new file mode 100644 index 0000000000..73c2daa4d4 --- /dev/null +++ b/test/Versions/TestVersionGrains/project.json @@ -0,0 +1,11 @@ +{ + "dependencies": { + }, + "frameworks": { + "net461": {} + }, + "runtimes": { + "win-anycpu": {}, + "win": {} + } +} \ No newline at end of file diff --git a/test/Versions/TestVersionGrains2/TestVersionGrains2.2017.csproj b/test/Versions/TestVersionGrains2/TestVersionGrains2.2017.csproj index d17ad4fae8..f3f0b811e7 100644 --- a/test/Versions/TestVersionGrains2/TestVersionGrains2.2017.csproj +++ b/test/Versions/TestVersionGrains2/TestVersionGrains2.2017.csproj @@ -1,6 +1,6 @@  - net451 + net461 false win true diff --git a/test/Versions/TestVersionGrains2/TestVersionGrains2.csproj b/test/Versions/TestVersionGrains2/TestVersionGrains2.csproj index 2688ff5442..e6ceb3d5ff 100644 --- a/test/Versions/TestVersionGrains2/TestVersionGrains2.csproj +++ b/test/Versions/TestVersionGrains2/TestVersionGrains2.csproj @@ -9,9 +9,11 @@ Properties TestVersionGrains TestVersionGrains - v4.5.1 + v4.6.1 512 + true + true $(OutDir)\TestVersionGrainsV2 @@ -69,5 +71,8 @@ Orleans + + + \ No newline at end of file diff --git a/test/Versions/TestVersionGrains2/project.json b/test/Versions/TestVersionGrains2/project.json new file mode 100644 index 0000000000..73c2daa4d4 --- /dev/null +++ b/test/Versions/TestVersionGrains2/project.json @@ -0,0 +1,11 @@ +{ + "dependencies": { + }, + "frameworks": { + "net461": {} + }, + "runtimes": { + "win-anycpu": {}, + "win": {} + } +} \ No newline at end of file From abe22cd05f621fd8fc8d70dd5b7bda4e4ac05b6d Mon Sep 17 00:00:00 2001 From: Julian Dominguez Date: Tue, 18 Apr 2017 13:31:09 -0700 Subject: [PATCH 2/2] Output configuration file being used --- src/Orleans/Configuration/ConfigUtilities.cs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/Orleans/Configuration/ConfigUtilities.cs b/src/Orleans/Configuration/ConfigUtilities.cs index 5b423738d8..4783aff34e 100644 --- a/src/Orleans/Configuration/ConfigUtilities.cs +++ b/src/Orleans/Configuration/ConfigUtilities.cs @@ -627,8 +627,8 @@ public static string RuntimeVersionInfo() #if !NETSTANDARD_TODO // TODO: could use Microsoft.Extensions.PlatformAbstractions package to get this info sb.Append(" .NET version: ").AppendLine(Environment.Version.ToString()); - sb.Append(" Is .NET 4.5=").AppendLine(IsNet45OrNewer().ToString()); sb.Append(" OS version: ").AppendLine(Environment.OSVersion.ToString()); + sb.Append(" App config file: ").AppendLine(AppDomain.CurrentDomain.SetupInformation.ConfigurationFile); #endif sb.AppendFormat(" GC Type={0} GCLatencyMode={1}", GCSettings.IsServerGC ? "Server" : "Client", @@ -636,13 +636,5 @@ public static string RuntimeVersionInfo() .AppendLine(); return sb.ToString(); } - - internal static bool IsNet45OrNewer() - { - // From: http://stackoverflow.com/questions/8517159/how-to-detect-at-runtime-that-net-version-4-5-currently-running-your-code - - // Class "ReflectionContext" exists from .NET 4.5 onwards. - return Type.GetType("System.Reflection.ReflectionContext", false) != null; - } } }