From ea8c2a2e49960c131eb6f52f587f6e93ee96de0b Mon Sep 17 00:00:00 2001 From: Jonathan Goldstein Date: Wed, 12 Dec 2018 11:13:49 -0800 Subject: [PATCH] Added all dependencies everywhere to aboid dll hell --- Ambrosia/Ambrosia/Ambrosia.csproj | 8 +++++++- Clients/CSharp/AmbrosiaCS/AmbrosiaCS.csproj | 11 +++++++++- .../CSharp/AmbrosiaLibCS/AmbrosiaLibCS.csproj | 9 +++++++++ .../UnsafeDeregisterInstance.csproj | 17 +++++++++++++++- .../ImmortalCoordinator.csproj | 10 +++++++++- .../API/ServerAPI.csproj | 20 +++++++++++++++++++ .../Client/Job.csproj | 15 ++++++++++++++ .../IJob/IJob.csproj | 20 +++++++++++++++++++ .../PerformanceTest.sln | 8 ++++++++ .../Server/Server.csproj | 15 ++++++++++++++ 10 files changed, 129 insertions(+), 4 deletions(-) diff --git a/Ambrosia/Ambrosia/Ambrosia.csproj b/Ambrosia/Ambrosia/Ambrosia.csproj index b2bcb72..eff5044 100644 --- a/Ambrosia/Ambrosia/Ambrosia.csproj +++ b/Ambrosia/Ambrosia/Ambrosia.csproj @@ -15,6 +15,7 @@ $(DefineConstants);NETCORE + 15.8.168 @@ -25,11 +26,13 @@ 5.8.1 + 4.3.0 + - 9.3.2 + 9.3.3 2018.11.5.1 @@ -43,6 +46,9 @@ + + 4.5.0 + 4.5.0 diff --git a/Clients/CSharp/AmbrosiaCS/AmbrosiaCS.csproj b/Clients/CSharp/AmbrosiaCS/AmbrosiaCS.csproj index 7468893..b89ec63 100644 --- a/Clients/CSharp/AmbrosiaCS/AmbrosiaCS.csproj +++ b/Clients/CSharp/AmbrosiaCS/AmbrosiaCS.csproj @@ -17,19 +17,28 @@ NETCORE - + + + + + + 4.3.0 + 4.5.0 + + 4.5.0 + diff --git a/Clients/CSharp/AmbrosiaLibCS/AmbrosiaLibCS.csproj b/Clients/CSharp/AmbrosiaLibCS/AmbrosiaLibCS.csproj index 083127f..7cd96f4 100644 --- a/Clients/CSharp/AmbrosiaLibCS/AmbrosiaLibCS.csproj +++ b/Clients/CSharp/AmbrosiaLibCS/AmbrosiaLibCS.csproj @@ -17,17 +17,26 @@ NETCORE + + + + + 4.3.0 + 4.5.0 + + 4.5.0 + diff --git a/DevTools/UnsafeDeregisterInstance/UnsafeDeregisterInstance.csproj b/DevTools/UnsafeDeregisterInstance/UnsafeDeregisterInstance.csproj index 7f77f3a..e35f7ce 100644 --- a/DevTools/UnsafeDeregisterInstance/UnsafeDeregisterInstance.csproj +++ b/DevTools/UnsafeDeregisterInstance/UnsafeDeregisterInstance.csproj @@ -18,10 +18,25 @@ NETCORE + + + + + + + - 9.3.2 + 9.3.3 + + + 4.5.0 + + + 4.5.0 + + \ No newline at end of file diff --git a/ImmortalCoordinator/ImmortalCoordinator.csproj b/ImmortalCoordinator/ImmortalCoordinator.csproj index 0937242..03e53b6 100644 --- a/ImmortalCoordinator/ImmortalCoordinator.csproj +++ b/ImmortalCoordinator/ImmortalCoordinator.csproj @@ -23,14 +23,22 @@ + + - + + + + + + 4.5.0 + 4.5.0 diff --git a/InternalImmortals/PerformanceTestInterruptible/API/ServerAPI.csproj b/InternalImmortals/PerformanceTestInterruptible/API/ServerAPI.csproj index 42a7746..12bcda0 100644 --- a/InternalImmortals/PerformanceTestInterruptible/API/ServerAPI.csproj +++ b/InternalImmortals/PerformanceTestInterruptible/API/ServerAPI.csproj @@ -16,7 +16,27 @@ NETCORE + + + + + + + + + + + + + + + 4.5.0 + + + 4.5.0 + + \ No newline at end of file diff --git a/InternalImmortals/PerformanceTestInterruptible/Client/Job.csproj b/InternalImmortals/PerformanceTestInterruptible/Client/Job.csproj index f6146d7..2fd3e47 100644 --- a/InternalImmortals/PerformanceTestInterruptible/Client/Job.csproj +++ b/InternalImmortals/PerformanceTestInterruptible/Client/Job.csproj @@ -18,12 +18,27 @@ NETCORE + + + + + + + + + + + 4.5.0 + + + 4.5.0 + diff --git a/InternalImmortals/PerformanceTestInterruptible/IJob/IJob.csproj b/InternalImmortals/PerformanceTestInterruptible/IJob/IJob.csproj index ae8fee8..6dc99d8 100644 --- a/InternalImmortals/PerformanceTestInterruptible/IJob/IJob.csproj +++ b/InternalImmortals/PerformanceTestInterruptible/IJob/IJob.csproj @@ -16,7 +16,27 @@ NETCORE + + + + + + + + + + + + + + + 4.5.0 + + + 4.5.0 + + \ No newline at end of file diff --git a/InternalImmortals/PerformanceTestInterruptible/PerformanceTest.sln b/InternalImmortals/PerformanceTestInterruptible/PerformanceTest.sln index 16b1de8..33544c9 100644 --- a/InternalImmortals/PerformanceTestInterruptible/PerformanceTest.sln +++ b/InternalImmortals/PerformanceTestInterruptible/PerformanceTest.sln @@ -59,6 +59,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PTIAmbrosiaGeneratedAPINet4 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PTIAmbrosiaGeneratedAPINetCore", "GeneratedSourceFiles\PTIAmbrosiaGeneratedAPINetCore\latest\PTIAmbrosiaGeneratedAPINetCore.csproj", "{029135E9-7945-4C57-8535-FF17FABB8A7E}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnsafeDeregisterInstance", "..\..\DevTools\UnsafeDeregisterInstance\UnsafeDeregisterInstance.csproj", "{ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -137,6 +139,12 @@ Global {029135E9-7945-4C57-8535-FF17FABB8A7E}.Release|Any CPU.Build.0 = Release|Any CPU {029135E9-7945-4C57-8535-FF17FABB8A7E}.Release|x64.ActiveCfg = Release|Any CPU {029135E9-7945-4C57-8535-FF17FABB8A7E}.Release|x64.Build.0 = Release|Any CPU + {ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Debug|Any CPU.ActiveCfg = Debug|x64 + {ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Debug|x64.ActiveCfg = Debug|x64 + {ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Debug|x64.Build.0 = Debug|x64 + {ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Release|Any CPU.ActiveCfg = Release|x64 + {ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Release|x64.ActiveCfg = Release|x64 + {ECCAFBF6-2521-49AE-9ECC-5BDD6B8A567B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/InternalImmortals/PerformanceTestInterruptible/Server/Server.csproj b/InternalImmortals/PerformanceTestInterruptible/Server/Server.csproj index 1efc5da..7508a81 100644 --- a/InternalImmortals/PerformanceTestInterruptible/Server/Server.csproj +++ b/InternalImmortals/PerformanceTestInterruptible/Server/Server.csproj @@ -18,12 +18,27 @@ NETCORE + + + + + + + + + + + 4.5.0 + + + 4.5.0 +