From e507904b9b3d5b9b3e7715d931adc265847f7fb0 Mon Sep 17 00:00:00 2001 From: Josh Green Date: Sun, 28 Oct 2018 20:05:47 +0000 Subject: [PATCH] References fixed, all building (#65) --- BuildTasks.sln | 2 +- CoreLibraries.sln | 85 ++++++++++--------- ILMerge.sln | 2 +- Initializer.sln | 12 +-- PerfSetup.sln | 2 +- src/Common.proj | 50 +++++------ .../ILMerge.Build.Task.csproj | 4 +- ...cations.Utilities.Cryptography.Test.csproj | 4 +- ...Applications.Utilities.Cryptography.csproj | 2 +- ...pplications.Utilities.Database.Test.csproj | 8 +- .../WebApplications.Utilities.Database.csproj | 8 +- ...bApplications.Utilities.Initializer.csproj | 2 +- ...Applications.Utilities.Logging.Test.csproj | 6 +- ...tions.Utilities.Logging.TestConsole.csproj | 6 +- .../WebApplications.Utilities.Logging.csproj | 4 +- ...ilities.Performance.Tools.PerfSetup.csproj | 2 +- ...ications.Utilities.Performance.Test.csproj | 2 +- ...bApplications.Utilities.Performance.csproj | 2 +- ...lications.Utilities.PowerShell.Test.csproj | 2 +- ...ebApplications.Utilities.PowerShell.csproj | 2 +- ...lications.Utilities.Scheduling.Test.csproj | 4 +- ...ebApplications.Utilities.Scheduling.csproj | 2 +- ...ations.Utilities.Serialization.Test.csproj | 4 +- ...pplications.Utilities.Serialization.csproj | 2 +- ...plications.Utilities.Service.Client.csproj | 4 +- ...plications.Utilities.Service.Common.csproj | 4 +- .../ServiceClient/ServiceClient.csproj | 6 +- ...Applications.Utilities.Service.Test.csproj | 8 +- .../WebApplications.Utilities.Service.csproj | 6 +- .../WebApplications.Utilities.Test.csproj | 2 +- 30 files changed, 126 insertions(+), 123 deletions(-) diff --git a/BuildTasks.sln b/BuildTasks.sln index f4f64d49..013c39ce 100644 --- a/BuildTasks.sln +++ b/BuildTasks.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.BuildTasks", "Utilities\BuildTasks\WebApplications.Utilities.BuildTasks.csproj", "{CA6C3C0E-96DB-4B74-A8E4-33ABA73D0553}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.BuildTasks", "src\WebApplications.Utilities\BuildTasks\WebApplications.Utilities.BuildTasks.csproj", "{CA6C3C0E-96DB-4B74-A8E4-33ABA73D0553}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/CoreLibraries.sln b/CoreLibraries.sln index 788460ef..9ae77478 100644 --- a/CoreLibraries.sln +++ b/CoreLibraries.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2046 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{76EB4D52-A38F-44B2-956A-CB49A6B4B435}" ProjectSection(SolutionItems) = preProject @@ -13,10 +13,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{BA63C147 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{E3E40955-4440-469B-9B46-0BFF5C54AC8B}" ProjectSection(SolutionItems) = preProject - src\ILMerge\ILMerge.targets = src\ILMerge\ILMerge.targets - src\Initializer\InjectModuleInitializer.targets = src\Initializer\InjectModuleInitializer.targets - src\Performance\WebApplications.Utilities.Performance.targets = src\Performance\WebApplications.Utilities.Performance.targets - src\Utilities\WebApplications.Utilities.targets = src\Utilities\WebApplications.Utilities.targets + src\ILMerge.Build.Task\ILMerge.targets = src\ILMerge.Build.Task\ILMerge.targets + src\WebApplications.Utilities.Initializer\InjectModuleInitializer.targets = src\WebApplications.Utilities.Initializer\InjectModuleInitializer.targets + src\WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.targets = src\WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.targets + src\WebApplications.Utilities\WebApplications.Utilities.targets = src\WebApplications.Utilities\WebApplications.Utilities.targets EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{61760DCB-AC78-49B3-9BFB-83A1CD92F870}" @@ -24,21 +24,21 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{A0713DA0-135B-4A84-B71E-4B58A9F73ACA}" ProjectSection(SolutionItems) = preProject src\Common.proj = src\Common.proj - CommonAttributes.cs = CommonAttributes.cs + src\CommonAttributes.cs = src\CommonAttributes.cs EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{E0405738-5F57-4FC9-8C4E-9E62ED957E31}" ProjectSection(SolutionItems) = preProject - src\PowerShell\Test\Test.nuspec = src\PowerShell\Test\Test.nuspec - src\Testing\WebApplications.Testing.nuspec = src\Testing\WebApplications.Testing.nuspec - src\Cryptography\WebApplications.Utilities.Cryptography.nuspec = src\Cryptography\WebApplications.Utilities.Cryptography.nuspec - src\Database\WebApplications.Utilities.Database.nuspec = src\Database\WebApplications.Utilities.Database.nuspec - src\Logging\WebApplications.Utilities.Logging.nuspec = src\Logging\WebApplications.Utilities.Logging.nuspec - src\Utilities\WebApplications.Utilities.nuspec = src\Utilities\WebApplications.Utilities.nuspec - src\Performance\WebApplications.Utilities.Performance.nuspec = src\Performance\WebApplications.Utilities.Performance.nuspec - src\Scheduling\WebApplications.Utilities.Scheduling.nuspec = src\Scheduling\WebApplications.Utilities.Scheduling.nuspec - src\Serialization\WebApplications.Utilities.Serialization.nuspec = src\Serialization\WebApplications.Utilities.Serialization.nuspec - src\Service\WebApplications.Utilities.Service.nuspec = src\Service\WebApplications.Utilities.Service.nuspec + src\WebApplications.Utilities.PowerShell\Test\Test.nuspec = src\WebApplications.Utilities.PowerShell\Test\Test.nuspec + src\WebApplications.Testing\WebApplications.Testing.nuspec = src\WebApplications.Testing\WebApplications.Testing.nuspec + src\WebApplications.Utilities.Cryptography\WebApplications.Utilities.Cryptography.nuspec = src\WebApplications.Utilities.Cryptography\WebApplications.Utilities.Cryptography.nuspec + src\WebApplications.Utilities.Database\WebApplications.Utilities.Database.nuspec = src\WebApplications.Utilities.Database\WebApplications.Utilities.Database.nuspec + src\WebApplications.Utilities.Logging\WebApplications.Utilities.Logging.nuspec = src\WebApplications.Utilities.Logging\WebApplications.Utilities.Logging.nuspec + src\WebApplications.Utilities\WebApplications.Utilities.nuspec = src\WebApplications.Utilities\WebApplications.Utilities.nuspec + src\WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.nuspec = src\WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.nuspec + src\WebApplications.Utilities.Scheduling\WebApplications.Utilities.Scheduling.nuspec = src\WebApplications.Utilities.Scheduling\WebApplications.Utilities.Scheduling.nuspec + src\WebApplications.Utilities.Serialization\WebApplications.Utilities.Serialization.nuspec = src\WebApplications.Utilities.Serialization\WebApplications.Utilities.Serialization.nuspec + src\WebApplications.Utilities.Service\WebApplications.Utilities.Service.nuspec = src\WebApplications.Utilities.Service\WebApplications.Utilities.Service.nuspec EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{0FB945E9-C475-42B7-8B85-8F9666DF60B4}" @@ -49,53 +49,53 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub", "GitHub", "{0FB945 readme.md = readme.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Testing", "src\Testing\WebApplications.Testing.csproj", "{E41CD12C-805C-4493-A45A-9BC917D7B240}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Testing", "src\WebApplications.Testing\WebApplications.Testing.csproj", "{E41CD12C-805C-4493-A45A-9BC917D7B240}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Testing.Test", "src\Testing\Test\WebApplications.Testing.Test.csproj", "{CBE3CF94-6406-4EED-AADA-3E6B441B1DE3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Testing.Test", "src\WebApplications.Testing\Test\WebApplications.Testing.Test.csproj", "{CBE3CF94-6406-4EED-AADA-3E6B441B1DE3}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities", "src\Utilities\WebApplications.Utilities.csproj", "{2931C698-6123-49BC-81FD-F72A4C1415EA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities", "src\WebApplications.Utilities\WebApplications.Utilities.csproj", "{2931C698-6123-49BC-81FD-F72A4C1415EA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Test", "src\Utilities\Test\WebApplications.Utilities.Test.csproj", "{AAC22B8B-D633-4EE5-B1EA-915F0C9BCB46}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Test", "src\WebApplications.Utilities\Test\WebApplications.Utilities.Test.csproj", "{AAC22B8B-D633-4EE5-B1EA-915F0C9BCB46}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Cryptography", "src\Cryptography\WebApplications.Utilities.Cryptography.csproj", "{3740397C-1956-4D6E-80F3-D67DFD4EE4EB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Cryptography", "src\WebApplications.Utilities.Cryptography\WebApplications.Utilities.Cryptography.csproj", "{3740397C-1956-4D6E-80F3-D67DFD4EE4EB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Cryptography.Test", "src\Cryptography\Test\WebApplications.Utilities.Cryptography.Test.csproj", "{0A67DBB5-780E-4BC6-841E-E1B50309895D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Cryptography.Test", "src\WebApplications.Utilities.Cryptography\Test\WebApplications.Utilities.Cryptography.Test.csproj", "{0A67DBB5-780E-4BC6-841E-E1B50309895D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance", "src\Performance\WebApplications.Utilities.Performance.csproj", "{04220E31-53F6-453F-80C5-0E2D49776D36}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance", "src\WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.csproj", "{04220E31-53F6-453F-80C5-0E2D49776D36}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance.Test", "src\Performance\Test\WebApplications.Utilities.Performance.Test.csproj", "{2A45DCFA-A60C-4AE6-80E8-18D62D04E438}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance.Test", "src\WebApplications.Utilities.Performance\Test\WebApplications.Utilities.Performance.Test.csproj", "{2A45DCFA-A60C-4AE6-80E8-18D62D04E438}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Serialization", "src\Serialization\WebApplications.Utilities.Serialization.csproj", "{686798D4-CC9C-460F-937F-28933CC53E09}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Serialization", "src\WebApplications.Utilities.Serialization\WebApplications.Utilities.Serialization.csproj", "{686798D4-CC9C-460F-937F-28933CC53E09}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Serialization.Test", "src\Serialization\Test\WebApplications.Utilities.Serialization.Test.csproj", "{D118B240-3DCE-46E3-A721-751B60E003B1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Serialization.Test", "src\WebApplications.Utilities.Serialization\Test\WebApplications.Utilities.Serialization.Test.csproj", "{D118B240-3DCE-46E3-A721-751B60E003B1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Logging", "src\Logging\WebApplications.Utilities.Logging.csproj", "{0EBA7604-0BDB-438E-967F-7DFE93E6ABD5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Logging", "src\WebApplications.Utilities.Logging\WebApplications.Utilities.Logging.csproj", "{0EBA7604-0BDB-438E-967F-7DFE93E6ABD5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Logging.Test", "src\Logging\Test\WebApplications.Utilities.Logging.Test.csproj", "{4B05B106-0F92-46D0-B129-107D0D05F48A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Logging.Test", "src\WebApplications.Utilities.Logging\Test\WebApplications.Utilities.Logging.Test.csproj", "{4B05B106-0F92-46D0-B129-107D0D05F48A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Logging.TestConsole", "src\Logging\TestConsole\WebApplications.Utilities.Logging.TestConsole.csproj", "{CA520F77-36EC-4849-8F04-FB6E24DA6D76}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Logging.TestConsole", "src\WebApplications.Utilities.Logging\TestConsole\WebApplications.Utilities.Logging.TestConsole.csproj", "{CA520F77-36EC-4849-8F04-FB6E24DA6D76}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Scheduling", "src\Scheduling\WebApplications.Utilities.Scheduling.csproj", "{A98D210C-0884-4985-BC71-705B44F61CA9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Scheduling", "src\WebApplications.Utilities.Scheduling\WebApplications.Utilities.Scheduling.csproj", "{A98D210C-0884-4985-BC71-705B44F61CA9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Scheduling.Test", "src\Scheduling\Test\WebApplications.Utilities.Scheduling.Test.csproj", "{A14C9BAC-2E4A-4163-ACF4-0844BD4C3CC7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Scheduling.Test", "src\WebApplications.Utilities.Scheduling\Test\WebApplications.Utilities.Scheduling.Test.csproj", "{A14C9BAC-2E4A-4163-ACF4-0844BD4C3CC7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Database", "src\Database\WebApplications.Utilities.Database.csproj", "{371CE56A-0251-41DA-8EF5-72A69E290CB9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Database", "src\WebApplications.Utilities.Database\WebApplications.Utilities.Database.csproj", "{371CE56A-0251-41DA-8EF5-72A69E290CB9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Database.Test", "src\Database\Test\WebApplications.Utilities.Database.Test.csproj", "{8C6554DF-D0FE-48B5-B487-19882850AC69}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Database.Test", "src\WebApplications.Utilities.Database\Test\WebApplications.Utilities.Database.Test.csproj", "{8C6554DF-D0FE-48B5-B487-19882850AC69}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service", "src\Service\WebApplications.Utilities.Service.csproj", "{B580A145-6DE0-45D4-B4B6-924A52BF10B7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service", "src\WebApplications.Utilities.Service\WebApplications.Utilities.Service.csproj", "{B580A145-6DE0-45D4-B4B6-924A52BF10B7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service.Common", "src\Service\Common\WebApplications.Utilities.Service.Common.csproj", "{B365AD50-598A-4D1B-8656-1F0F8ADCDBC8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service.Common", "src\WebApplications.Utilities.Service\Common\WebApplications.Utilities.Service.Common.csproj", "{B365AD50-598A-4D1B-8656-1F0F8ADCDBC8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service.Client", "src\Service\Client\WebApplications.Utilities.Service.Client.csproj", "{839D6111-FFE7-4498-928C-75054DE61CE9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service.Client", "src\WebApplications.Utilities.Service\Client\WebApplications.Utilities.Service.Client.csproj", "{839D6111-FFE7-4498-928C-75054DE61CE9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceClient", "src\Service\ServiceClient\ServiceClient.csproj", "{12FE7E65-E744-4F7F-A7EB-608249C75235}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ServiceClient", "src\WebApplications.Utilities.Service\ServiceClient\ServiceClient.csproj", "{12FE7E65-E744-4F7F-A7EB-608249C75235}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service.Test", "src\Service\Test\WebApplications.Utilities.Service.Test.csproj", "{8BAD8DB0-4CF3-4E6F-A3AF-E79BE299667C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service.Test", "src\WebApplications.Utilities.Service\Test\WebApplications.Utilities.Service.Test.csproj", "{8BAD8DB0-4CF3-4E6F-A3AF-E79BE299667C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.PowerShell.Test", "src\PowerShell\Test\WebApplications.Utilities.PowerShell.Test.csproj", "{4C7FAC1D-4B3B-4191-9D52-BEA7E91AB39A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.PowerShell.Test", "src\WebApplications.Utilities.PowerShell\Test\WebApplications.Utilities.PowerShell.Test.csproj", "{4C7FAC1D-4B3B-4191-9D52-BEA7E91AB39A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.PowerShell", "src\PowerShell\WebApplications.Utilities.PowerShell.csproj", "{FDF4F262-B182-49DB-9A39-6D487EA058FD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.PowerShell", "src\WebApplications.Utilities.PowerShell\WebApplications.Utilities.PowerShell.csproj", "{FDF4F262-B182-49DB-9A39-6D487EA058FD}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -416,4 +416,7 @@ Global {4C7FAC1D-4B3B-4191-9D52-BEA7E91AB39A} = {BA63C147-8B85-4C94-9EAD-AA11E6A0B996} {FDF4F262-B182-49DB-9A39-6D487EA058FD} = {61760DCB-AC78-49B3-9BFB-83A1CD92F870} EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {5B286CE1-24E3-4F97-9520-6FD757A1AB98} + EndGlobalSection EndGlobal diff --git a/ILMerge.sln b/ILMerge.sln index 0b89fc40..e80d29af 100644 --- a/ILMerge.sln +++ b/ILMerge.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILMerge.Build.Task", "ILMerge\ILMerge.Build.Task.csproj", "{D45DFBAF-5019-4435-80FB-1FA2EC48F23A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILMerge.Build.Task", "src\ILMerge.Build.Task\ILMerge.Build.Task.csproj", "{D45DFBAF-5019-4435-80FB-1FA2EC48F23A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/Initializer.sln b/Initializer.sln index 70faa3b2..19c0cb0a 100644 --- a/Initializer.sln +++ b/Initializer.sln @@ -3,17 +3,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer", "Initializer\WebApplications.Utilities.Initializer.csproj", "{3626816D-EB33-4ED0-AF95-FD7CA6C6D99A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer", "src\WebApplications.Utilities.Initializer\WebApplications.Utilities.Initializer.csproj", "{3626816D-EB33-4ED0-AF95-FD7CA6C6D99A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer.Test", "Initializer\Test\WebApplications.Utilities.Initializer.Test.csproj", "{1F4CFF76-3151-460B-B1A4-2E77EEF20029}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer.Test", "src\WebApplications.Utilities.Initializer\Test\WebApplications.Utilities.Initializer.Test.csproj", "{1F4CFF76-3151-460B-B1A4-2E77EEF20029}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer.TestApp", "Initializer\TestApp\WebApplications.Utilities.Initializer.TestApp.csproj", "{B32CE846-8FAF-4B89-9A17-22B4427133C9}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer.TestApp", "src\WebApplications.Utilities.Initializer\TestApp\WebApplications.Utilities.Initializer.TestApp.csproj", "{B32CE846-8FAF-4B89-9A17-22B4427133C9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73FDA02C-149C-41C2-A80C-C011015CCE0F}" ProjectSection(SolutionItems) = preProject - Initializer\InjectModuleInitializer.targets = Initializer\InjectModuleInitializer.targets - Utilities\WebApplications.Utilities.nuspec = Utilities\WebApplications.Utilities.nuspec - Utilities\WebApplications.Utilities.targets = Utilities\WebApplications.Utilities.targets + src\WebApplications.Utilities.Initializer\InjectModuleInitializer.targets = src\WebApplications.Utilities.Initializer\InjectModuleInitializer.targets + src\WebApplications.Utilities.Utilities\WebApplications.Utilities.nuspec = src\WebApplications.Utilities.Utilities\WebApplications.Utilities.nuspec + src\WebApplications.Utilities.Utilities\WebApplications.Utilities.targets = src\WebApplications.Utilities.Utilities\WebApplications.Utilities.targets EndProjectSection EndProject Global diff --git a/PerfSetup.sln b/PerfSetup.sln index 9f426f2c..da99e070 100644 --- a/PerfSetup.sln +++ b/PerfSetup.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance.Tools.PerfSetup", "Performance\PerfSetup\WebApplications.Utilities.Performance.Tools.PerfSetup.csproj", "{6F2B5D7A-E8B7-4820-9C39-30F722B0DB01}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance.Tools.PerfSetup", "src\WebApplications.Utilities.Performance\PerfSetup\WebApplications.Utilities.Performance.Tools.PerfSetup.csproj", "{6F2B5D7A-E8B7-4820-9C39-30F722B0DB01}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/src/Common.proj b/src/Common.proj index aa20c5f9..a752c8c4 100644 --- a/src/Common.proj +++ b/src/Common.proj @@ -16,7 +16,7 @@ $(MSBuildThisFileDirectory) $(SlnDir)\ $(SlnDir) - $(SlnDir)Utilities\Resources\ + $(SlnDir)WebApplications.Utilities\Resources\ @@ -46,7 +46,7 @@ true - $(SlnDir)nugets + $(SlnDir)..\nugets true true @@ -112,58 +112,58 @@ - $(SlnDir)Utilities\BuildTasks\bin\Release\AnyCPU\WebApplications.Utilities.BuildTasks.dll + $(SlnDir)WebApplications.Utilities\BuildTasks\bin\Release\AnyCPU\WebApplications.Utilities.BuildTasks.dll - + Configuration=Release;Platform=AnyCPU - + - $(SlnDir)ILMerge\bin\Release\AnyCPU\ILMerge.Build.Task.dll - $(SlnDir)ILMerge\bin\Release\AnyCPU\ILMerge.exe + $(SlnDir)ILMerge.Build.Task\bin\Release\AnyCPU\ILMerge.Build.Task.dll + $(SlnDir)ILMerge.Build.Task\bin\Release\AnyCPU\ILMerge.exe - + Configuration=Release;Platform=AnyCPU - + - $(SlnDir)Initializer\bin\Release\AnyCPU\Merged\WebApplications.Utilities.Initializer.dll + $(SlnDir)WebApplications.Utilities.Initializer\bin\Release\AnyCPU\Merged\WebApplications.Utilities.Initializer.dll - + Configuration=Release;Platform=AnyCPU - + - $(SlnDir)Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe - $(SlnDir)Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe + $(SlnDir)WebApplications.Utilities.Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe + $(SlnDir)WebApplications.Utilities.Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe - + Configuration=Release;Platform=x86 - + Configuration=Release;Platform=x64 - + - + @@ -176,11 +176,11 @@ - + - + @@ -192,11 +192,11 @@ - $(SlnDir)Utilities\BuildTasks\bin\Release\AnyCPU\WebApplications.Utilities.BuildTasks.dll - $(SlnDir)ILMerge\bin\Release\AnyCPU\ILMerge.Build.Task.dll - $(SlnDir)Initializer\bin\Release\AnyCPU\Merged\WebApplications.Utilities.Initializer.dll - $(SlnDir)Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe - $(SlnDir)Performance\PerfSetup\bin\Release\Merged\PerfSetup64.exe + $(SlnDir)WebApplications.Utilities\BuildTasks\bin\Release\AnyCPU\WebApplications.Utilities.BuildTasks.dll + $(SlnDir)ILMerge.Build.Tasks\bin\Release\AnyCPU\ILMerge.Build.Task.dll + $(SlnDir)WebApplications.Utilities.Initializer\bin\Release\AnyCPU\Merged\WebApplications.Utilities.Initializer.dll + $(SlnDir)WebApplications.Utilities.Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe + $(SlnDir)WebApplications.Utilities.Performance\PerfSetup\bin\Release\Merged\PerfSetup64.exe diff --git a/src/ILMerge.Build.Task/ILMerge.Build.Task.csproj b/src/ILMerge.Build.Task/ILMerge.Build.Task.csproj index 8d48e11e..8d3b81a0 100644 --- a/src/ILMerge.Build.Task/ILMerge.Build.Task.csproj +++ b/src/ILMerge.Build.Task/ILMerge.Build.Task.csproj @@ -16,7 +16,7 @@ - + @@ -27,7 +27,7 @@ - + @(ILMergePackage) diff --git a/src/WebApplications.Utilities.Cryptography/Test/WebApplications.Utilities.Cryptography.Test.csproj b/src/WebApplications.Utilities.Cryptography/Test/WebApplications.Utilities.Cryptography.Test.csproj index 4b6b2c91..124018ae 100644 --- a/src/WebApplications.Utilities.Cryptography/Test/WebApplications.Utilities.Cryptography.Test.csproj +++ b/src/WebApplications.Utilities.Cryptography/Test/WebApplications.Utilities.Cryptography.Test.csproj @@ -57,11 +57,11 @@ - + {e41cd12c-805c-4493-a45a-9bc917d7b240} WebApplications.Testing - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Cryptography/WebApplications.Utilities.Cryptography.csproj b/src/WebApplications.Utilities.Cryptography/WebApplications.Utilities.Cryptography.csproj index 4df52fda..b75a70fd 100644 --- a/src/WebApplications.Utilities.Cryptography/WebApplications.Utilities.Cryptography.csproj +++ b/src/WebApplications.Utilities.Cryptography/WebApplications.Utilities.Cryptography.csproj @@ -63,7 +63,7 @@ - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Database/Test/WebApplications.Utilities.Database.Test.csproj b/src/WebApplications.Utilities.Database/Test/WebApplications.Utilities.Database.Test.csproj index 1df967cf..80877cf5 100644 --- a/src/WebApplications.Utilities.Database/Test/WebApplications.Utilities.Database.Test.csproj +++ b/src/WebApplications.Utilities.Database/Test/WebApplications.Utilities.Database.Test.csproj @@ -121,19 +121,19 @@ - + {0eba7604-0bdb-438e-967f-7dfe93e6abd5} WebApplications.Utilities.Logging - + {04220e31-53f6-453f-80c5-0e2d49776d36} WebApplications.Utilities.Performance - + {e41cd12c-805c-4493-a45a-9bc917d7b240} WebApplications.Testing - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Database/WebApplications.Utilities.Database.csproj b/src/WebApplications.Utilities.Database/WebApplications.Utilities.Database.csproj index c1e8662e..704030b8 100644 --- a/src/WebApplications.Utilities.Database/WebApplications.Utilities.Database.csproj +++ b/src/WebApplications.Utilities.Database/WebApplications.Utilities.Database.csproj @@ -237,19 +237,19 @@ - + {0eba7604-0bdb-438e-967f-7dfe93e6abd5} WebApplications.Utilities.Logging - + {04220e31-53f6-453f-80c5-0e2d49776d36} WebApplications.Utilities.Performance - + {686798d4-cc9c-460f-937f-28933cc53e09} WebApplications.Utilities.Serialization - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Initializer/WebApplications.Utilities.Initializer.csproj b/src/WebApplications.Utilities.Initializer/WebApplications.Utilities.Initializer.csproj index 3e8a1b8f..43005081 100644 --- a/src/WebApplications.Utilities.Initializer/WebApplications.Utilities.Initializer.csproj +++ b/src/WebApplications.Utilities.Initializer/WebApplications.Utilities.Initializer.csproj @@ -42,7 +42,7 @@ - + Annotations.cs diff --git a/src/WebApplications.Utilities.Logging/Test/WebApplications.Utilities.Logging.Test.csproj b/src/WebApplications.Utilities.Logging/Test/WebApplications.Utilities.Logging.Test.csproj index 7edba1ad..8c90c9f9 100644 --- a/src/WebApplications.Utilities.Logging/Test/WebApplications.Utilities.Logging.Test.csproj +++ b/src/WebApplications.Utilities.Logging/Test/WebApplications.Utilities.Logging.Test.csproj @@ -59,15 +59,15 @@ - + {04220e31-53f6-453f-80c5-0e2d49776d36} WebApplications.Utilities.Performance - + {e41cd12c-805c-4493-a45a-9bc917d7b240} WebApplications.Testing - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Logging/TestConsole/WebApplications.Utilities.Logging.TestConsole.csproj b/src/WebApplications.Utilities.Logging/TestConsole/WebApplications.Utilities.Logging.TestConsole.csproj index ee2c31e3..72e660c0 100644 --- a/src/WebApplications.Utilities.Logging/TestConsole/WebApplications.Utilities.Logging.TestConsole.csproj +++ b/src/WebApplications.Utilities.Logging/TestConsole/WebApplications.Utilities.Logging.TestConsole.csproj @@ -42,15 +42,15 @@ - + {04220e31-53f6-453f-80c5-0e2d49776d36} WebApplications.Utilities.Performance - + {e41cd12c-805c-4493-a45a-9bc917d7b240} WebApplications.Testing - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Logging/WebApplications.Utilities.Logging.csproj b/src/WebApplications.Utilities.Logging/WebApplications.Utilities.Logging.csproj index ad379686..abf5eb3d 100644 --- a/src/WebApplications.Utilities.Logging/WebApplications.Utilities.Logging.csproj +++ b/src/WebApplications.Utilities.Logging/WebApplications.Utilities.Logging.csproj @@ -84,11 +84,11 @@ - + {04220e31-53f6-453f-80c5-0e2d49776d36} WebApplications.Utilities.Performance - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Performance/PerfSetup/WebApplications.Utilities.Performance.Tools.PerfSetup.csproj b/src/WebApplications.Utilities.Performance/PerfSetup/WebApplications.Utilities.Performance.Tools.PerfSetup.csproj index 26d34ed5..39cf19ff 100644 --- a/src/WebApplications.Utilities.Performance/PerfSetup/WebApplications.Utilities.Performance.Tools.PerfSetup.csproj +++ b/src/WebApplications.Utilities.Performance/PerfSetup/WebApplications.Utilities.Performance.Tools.PerfSetup.csproj @@ -95,7 +95,7 @@ - + diff --git a/src/WebApplications.Utilities.Performance/Test/WebApplications.Utilities.Performance.Test.csproj b/src/WebApplications.Utilities.Performance/Test/WebApplications.Utilities.Performance.Test.csproj index 49ea2404..0d2a3490 100644 --- a/src/WebApplications.Utilities.Performance/Test/WebApplications.Utilities.Performance.Test.csproj +++ b/src/WebApplications.Utilities.Performance/Test/WebApplications.Utilities.Performance.Test.csproj @@ -39,7 +39,7 @@ - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Performance/WebApplications.Utilities.Performance.csproj b/src/WebApplications.Utilities.Performance/WebApplications.Utilities.Performance.csproj index 42c65e35..08f52a56 100644 --- a/src/WebApplications.Utilities.Performance/WebApplications.Utilities.Performance.csproj +++ b/src/WebApplications.Utilities.Performance/WebApplications.Utilities.Performance.csproj @@ -57,7 +57,7 @@ - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.PowerShell/Test/WebApplications.Utilities.PowerShell.Test.csproj b/src/WebApplications.Utilities.PowerShell/Test/WebApplications.Utilities.PowerShell.Test.csproj index bab1d8d5..c589e5a5 100644 --- a/src/WebApplications.Utilities.PowerShell/Test/WebApplications.Utilities.PowerShell.Test.csproj +++ b/src/WebApplications.Utilities.PowerShell/Test/WebApplications.Utilities.PowerShell.Test.csproj @@ -29,7 +29,7 @@ - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.PowerShell/WebApplications.Utilities.PowerShell.csproj b/src/WebApplications.Utilities.PowerShell/WebApplications.Utilities.PowerShell.csproj index 2acee50d..36c902a7 100644 --- a/src/WebApplications.Utilities.PowerShell/WebApplications.Utilities.PowerShell.csproj +++ b/src/WebApplications.Utilities.PowerShell/WebApplications.Utilities.PowerShell.csproj @@ -35,7 +35,7 @@ - + {2931C698-6123-49BC-81FD-F72A4C1415EA} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Scheduling/Test/WebApplications.Utilities.Scheduling.Test.csproj b/src/WebApplications.Utilities.Scheduling/Test/WebApplications.Utilities.Scheduling.Test.csproj index 18d8a677..2218bf8b 100644 --- a/src/WebApplications.Utilities.Scheduling/Test/WebApplications.Utilities.Scheduling.Test.csproj +++ b/src/WebApplications.Utilities.Scheduling/Test/WebApplications.Utilities.Scheduling.Test.csproj @@ -42,11 +42,11 @@ - + {e41cd12c-805c-4493-a45a-9bc917d7b240} WebApplications.Testing - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Scheduling/WebApplications.Utilities.Scheduling.csproj b/src/WebApplications.Utilities.Scheduling/WebApplications.Utilities.Scheduling.csproj index 28052219..765d7520 100644 --- a/src/WebApplications.Utilities.Scheduling/WebApplications.Utilities.Scheduling.csproj +++ b/src/WebApplications.Utilities.Scheduling/WebApplications.Utilities.Scheduling.csproj @@ -74,7 +74,7 @@ - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Serialization/Test/WebApplications.Utilities.Serialization.Test.csproj b/src/WebApplications.Utilities.Serialization/Test/WebApplications.Utilities.Serialization.Test.csproj index db248eda..2ef7adb4 100644 --- a/src/WebApplications.Utilities.Serialization/Test/WebApplications.Utilities.Serialization.Test.csproj +++ b/src/WebApplications.Utilities.Serialization/Test/WebApplications.Utilities.Serialization.Test.csproj @@ -47,11 +47,11 @@ - + {e41cd12c-805c-4493-a45a-9bc917d7b240} WebApplications.Testing - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Serialization/WebApplications.Utilities.Serialization.csproj b/src/WebApplications.Utilities.Serialization/WebApplications.Utilities.Serialization.csproj index 78ff64a5..b7a3022e 100644 --- a/src/WebApplications.Utilities.Serialization/WebApplications.Utilities.Serialization.csproj +++ b/src/WebApplications.Utilities.Serialization/WebApplications.Utilities.Serialization.csproj @@ -49,7 +49,7 @@ - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Service/Client/WebApplications.Utilities.Service.Client.csproj b/src/WebApplications.Utilities.Service/Client/WebApplications.Utilities.Service.Client.csproj index ddec5ca2..a980bfd8 100644 --- a/src/WebApplications.Utilities.Service/Client/WebApplications.Utilities.Service.Client.csproj +++ b/src/WebApplications.Utilities.Service/Client/WebApplications.Utilities.Service.Client.csproj @@ -69,11 +69,11 @@ - + {0eba7604-0bdb-438e-967f-7dfe93e6abd5} WebApplications.Utilities.Logging - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Service/Common/WebApplications.Utilities.Service.Common.csproj b/src/WebApplications.Utilities.Service/Common/WebApplications.Utilities.Service.Common.csproj index 8ebbb0cb..2ee1bc25 100644 --- a/src/WebApplications.Utilities.Service/Common/WebApplications.Utilities.Service.Common.csproj +++ b/src/WebApplications.Utilities.Service/Common/WebApplications.Utilities.Service.Common.csproj @@ -68,11 +68,11 @@ - + {0eba7604-0bdb-438e-967f-7dfe93e6abd5} WebApplications.Utilities.Logging - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Service/ServiceClient/ServiceClient.csproj b/src/WebApplications.Utilities.Service/ServiceClient/ServiceClient.csproj index 0f046465..b980dce5 100644 --- a/src/WebApplications.Utilities.Service/ServiceClient/ServiceClient.csproj +++ b/src/WebApplications.Utilities.Service/ServiceClient/ServiceClient.csproj @@ -31,15 +31,15 @@ - + {0eba7604-0bdb-438e-967f-7dfe93e6abd5} WebApplications.Utilities.Logging - + {04220e31-53f6-453f-80c5-0e2d49776d36} WebApplications.Utilities.Performance - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Service/Test/WebApplications.Utilities.Service.Test.csproj b/src/WebApplications.Utilities.Service/Test/WebApplications.Utilities.Service.Test.csproj index 6619c06f..e46c1169 100644 --- a/src/WebApplications.Utilities.Service/Test/WebApplications.Utilities.Service.Test.csproj +++ b/src/WebApplications.Utilities.Service/Test/WebApplications.Utilities.Service.Test.csproj @@ -70,19 +70,19 @@ - + {0eba7604-0bdb-438e-967f-7dfe93e6abd5} WebApplications.Utilities.Logging - + {04220e31-53f6-453f-80c5-0e2d49776d36} WebApplications.Utilities.Performance - + {e41cd12c-805c-4493-a45a-9bc917d7b240} WebApplications.Testing - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities.Service/WebApplications.Utilities.Service.csproj b/src/WebApplications.Utilities.Service/WebApplications.Utilities.Service.csproj index 9ae66eaa..9716cb61 100644 --- a/src/WebApplications.Utilities.Service/WebApplications.Utilities.Service.csproj +++ b/src/WebApplications.Utilities.Service/WebApplications.Utilities.Service.csproj @@ -72,15 +72,15 @@ - + {0eba7604-0bdb-438e-967f-7dfe93e6abd5} WebApplications.Utilities.Logging - + {04220e31-53f6-453f-80c5-0e2d49776d36} WebApplications.Utilities.Performance - + {2931c698-6123-49bc-81fd-f72a4c1415ea} WebApplications.Utilities diff --git a/src/WebApplications.Utilities/Test/WebApplications.Utilities.Test.csproj b/src/WebApplications.Utilities/Test/WebApplications.Utilities.Test.csproj index 35657b31..ead0c915 100644 --- a/src/WebApplications.Utilities/Test/WebApplications.Utilities.Test.csproj +++ b/src/WebApplications.Utilities/Test/WebApplications.Utilities.Test.csproj @@ -113,7 +113,7 @@ - + {e41cd12c-805c-4493-a45a-9bc917d7b240} WebApplications.Testing