References fixed, all building (webappsuk#65)

josh-green · Mar 8, 2019 · e507904 · e507904
1 parent a4af204
commit e507904
Show file tree

Hide file tree

Showing 30 changed files with 126 additions and 123 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -16,7 +16,7 @@
       <SlnDir>$(MSBuildThisFileDirectory)</SlnDir>
       <SlnDir Condition="!HasTrailingSlash('$(SlnDir)')">$(SlnDir)\</SlnDir>
       <SolutionDir>$(SlnDir)</SolutionDir>
-      <ResourcesPath>$(SlnDir)Utilities\Resources\</ResourcesPath>
+      <ResourcesPath>$(SlnDir)WebApplications.Utilities\Resources\</ResourcesPath>
     </PropertyGroup>
 
     <!-- Configuration specific properties -->
@@ -46,7 +46,7 @@
 
     <PropertyGroup Condition="'$(Configuration)' == 'NuGet'">
       <BuildPackage>true</BuildPackage>
-      <PackageOutputDir>$(SlnDir)nugets</PackageOutputDir>
+      <PackageOutputDir>$(SlnDir)..\nugets</PackageOutputDir>
       <IsRelease>true</IsRelease>
       <RunSignTool>true</RunSignTool>
     </PropertyGroup>
@@ -112,58 +112,58 @@
 
     <!-- Import utilities if Utilities is defined -->
     <PropertyGroup Condition="$(DefineConstants.Contains('Utilities'))">
-      <UtilityBuildTasks>$(SlnDir)Utilities\BuildTasks\bin\Release\AnyCPU\WebApplications.Utilities.BuildTasks.dll</UtilityBuildTasks>
+      <UtilityBuildTasks>$(SlnDir)WebApplications.Utilities\BuildTasks\bin\Release\AnyCPU\WebApplications.Utilities.BuildTasks.dll</UtilityBuildTasks>
     </PropertyGroup>
     <ItemGroup Condition="'$(UtilityBuildTasks)'!='' AND !Exists('$(UtilityBuildTasks)')">
-      <ProjectsToBuild Include="$(SlnDir)Utilities\BuildTasks\WebApplications.Utilities.BuildTasks.csproj">
+      <ProjectsToBuild Include="$(SlnDir)WebApplications.Utilities\BuildTasks\WebApplications.Utilities.BuildTasks.csproj">
         <Properties>Configuration=Release;Platform=AnyCPU</Properties>
       </ProjectsToBuild>
     </ItemGroup>
-    <Import Project="$(SlnDir)Utilities\WebApplications.Utilities.targets" Condition="$(DefineConstants.Contains('Utilities'))" />
+    <Import Project="$(SlnDir)WebApplications.Utilities\WebApplications.Utilities.targets" Condition="$(DefineConstants.Contains('Utilities'))" />
 
     <!-- Import ILMerge if ILMerge is defined -->
     <PropertyGroup Condition="$(DefineConstants.Contains('ILMerge'))">
-      <ILMergeBuildTask>$(SlnDir)ILMerge\bin\Release\AnyCPU\ILMerge.Build.Task.dll</ILMergeBuildTask>
-      <ILMergeTool>$(SlnDir)ILMerge\bin\Release\AnyCPU\ILMerge.exe</ILMergeTool>
+      <ILMergeBuildTask>$(SlnDir)ILMerge.Build.Task\bin\Release\AnyCPU\ILMerge.Build.Task.dll</ILMergeBuildTask>
+      <ILMergeTool>$(SlnDir)ILMerge.Build.Task\bin\Release\AnyCPU\ILMerge.exe</ILMergeTool>
     </PropertyGroup>
     <ItemGroup Condition="'$(ILMergeBuildTask)'!='' AND !Exists('$(ILMergeBuildTask)')">
-      <ProjectsToBuild Include="$(SlnDir)ILMerge\ILMerge.Build.Task.csproj">
+      <ProjectsToBuild Include="$(SlnDir)ILMerge.Build.Task\ILMerge.Build.Task.csproj">
         <Properties>Configuration=Release;Platform=AnyCPU</Properties>
       </ProjectsToBuild>
     </ItemGroup>
-    <Import Project="$(SlnDir)ILMerge\ILMerge.targets" Condition="$(DefineConstants.Contains('ILMerge'))" />
+    <Import Project="$(SlnDir)ILMerge.Build.Task\ILMerge.targets" Condition="$(DefineConstants.Contains('ILMerge'))" />
 
     <!-- Import module initializer if ModuleInitializer is defined -->
     <PropertyGroup Condition="$(DefineConstants.Contains('ModuleInitializer'))">
-      <InjectModuleInitializerTool>$(SlnDir)Initializer\bin\Release\AnyCPU\Merged\WebApplications.Utilities.Initializer.dll</InjectModuleInitializerTool>
+      <InjectModuleInitializerTool>$(SlnDir)WebApplications.Utilities.Initializer\bin\Release\AnyCPU\Merged\WebApplications.Utilities.Initializer.dll</InjectModuleInitializerTool>
     </PropertyGroup>
     <ItemGroup Condition="'$(InjectModuleInitializerTool)'!='' AND !Exists('$(InjectModuleInitializerTool)')">
-      <ProjectsToBuild Include="$(SlnDir)Initializer\WebApplications.Utilities.Initializer.csproj">
+      <ProjectsToBuild Include="$(SlnDir)WebApplications.Utilities.Initializer\WebApplications.Utilities.Initializer.csproj">
         <Properties>Configuration=Release;Platform=AnyCPU</Properties>
       </ProjectsToBuild>
     </ItemGroup>
-    <Import Project="$(SlnDir)Initializer\InjectModuleInitializer.targets" Condition="$(DefineConstants.Contains('ModuleInitializer'))" />
+    <Import Project="$(SlnDir)WebApplications.Utilities.Initializer\InjectModuleInitializer.targets" Condition="$(DefineConstants.Contains('ModuleInitializer'))" />
 
     <!-- Import PerfSetup if the PerfSetup constant is defined -->
     <PropertyGroup Condition="$(DefineConstants.Contains('PerfSetup'))">
-      <PerfSetupTool>$(SlnDir)Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe</PerfSetupTool>
-      <PerfSetupTool64>$(SlnDir)Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe</PerfSetupTool64>
+      <PerfSetupTool>$(SlnDir)WebApplications.Utilities.Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe</PerfSetupTool>
+      <PerfSetupTool64>$(SlnDir)WebApplications.Utilities.Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe</PerfSetupTool64>
     </PropertyGroup>
     <ItemGroup Condition="'$(PerfSetupTool)'!='' AND !Exists('$(PerfSetupTool)')">
-      <ProjectsToBuild Include="$(SlnDir)Performance\PerfSetup\WebApplications.Utilities.Performance.Tools.PerfSetup.csproj">
+      <ProjectsToBuild Include="$(SlnDir)WebApplications.Utilities.Performance\PerfSetup\WebApplications.Utilities.Performance.Tools.PerfSetup.csproj">
         <Properties>Configuration=Release;Platform=x86</Properties>
       </ProjectsToBuild>
     </ItemGroup>
     <ItemGroup Condition="'$(PerfSetupTool64)'!='' AND !Exists('$(PerfSetupTool64)')">
-      <ProjectsToBuild Include="$(SlnDir)Performance\PerfSetup\WebApplications.Utilities.Performance.Tools.PerfSetup.csproj">
+      <ProjectsToBuild Include="$(SlnDir)WebApplications.Utilities.Performance\PerfSetup\WebApplications.Utilities.Performance.Tools.PerfSetup.csproj">
         <Properties>Configuration=Release;Platform=x64</Properties>
       </ProjectsToBuild>
     </ItemGroup>
-    <Import Project="$(SlnDir)Performance\WebApplications.Utilities.Performance.targets" Condition="$(DefineConstants.Contains('PerfSetup'))" />
+    <Import Project="$(SlnDir)WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.targets" Condition="$(DefineConstants.Contains('PerfSetup'))" />
 
     <!-- Copy resources if CopyResources is defined -->
     <ItemGroup Condition="$(DefineConstants.Contains('CopyResources'))">
-      <ResourceFiles Include="$(SlnDir)Utilities\Resources\**\*" />
+      <ResourceFiles Include="$(SlnDir)WebApplications.Utilities\Resources\**\*" />
     </ItemGroup>
 
     <!-- When running from internal build server, this will digitally sign dlls -->
@@ -176,11 +176,11 @@
     <!-- Setup nugets folder -->
     <Target Name="SetupNuGetsDirTarget" Condition="'$(Configuration)' == 'NuGet'" BeforeTargets="BuildPackage">
       <!-- Ensure we have a nugets folder -->
-      <MakeDir Directories="$(SlnDir)nugets" Condition="!Exists('$(SlnDir)nugets')" />
+      <MakeDir Directories="$(SlnDir)..\nugets" Condition="!Exists('$(SlnDir)..\nugets')" />
 
       <!-- Check for existing packages matching this one and delete -->
       <ItemGroup>
-        <DeletePackage Include="$(SlnDir)nugets\$([System.IO.Path]::GetFileNameWithoutExtension('$(ProjectPath)'))*.nupkg" />
+        <DeletePackage Include="$(SlnDir)..\nugets\$([System.IO.Path]::GetFileNameWithoutExtension('$(ProjectPath)'))*.nupkg" />
       </ItemGroup>
       <Delete Files="@(DeletePackage)" Condition="'@(DeletePackage)' != ''" />
     </Target>
@@ -192,11 +192,11 @@
 
       <!-- Reset tool locations -->
       <PropertyGroup>
-        <UtilityBuildTasks Condition="$(DefineConstants.Contains('Utilities'))">$(SlnDir)Utilities\BuildTasks\bin\Release\AnyCPU\WebApplications.Utilities.BuildTasks.dll</UtilityBuildTasks>
-        <ILMergeBuildTask Condition="$(DefineConstants.Contains('ILMerge'))">$(SlnDir)ILMerge\bin\Release\AnyCPU\ILMerge.Build.Task.dll</ILMergeBuildTask>
-        <InjectModuleInitializerTool Condition="$(DefineConstants.Contains('ModuleInitializer'))">$(SlnDir)Initializer\bin\Release\AnyCPU\Merged\WebApplications.Utilities.Initializer.dll</InjectModuleInitializerTool>
-        <PerfSetupTool Condition="$(DefineConstants.Contains('PerfSetup'))">$(SlnDir)Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe</PerfSetupTool>
-        <PerfSetupTool64 Condition="$(DefineConstants.Contains('PerfSetup'))">$(SlnDir)Performance\PerfSetup\bin\Release\Merged\PerfSetup64.exe</PerfSetupTool64>
+        <UtilityBuildTasks Condition="$(DefineConstants.Contains('Utilities'))">$(SlnDir)WebApplications.Utilities\BuildTasks\bin\Release\AnyCPU\WebApplications.Utilities.BuildTasks.dll</UtilityBuildTasks>
+        <ILMergeBuildTask Condition="$(DefineConstants.Contains('ILMerge'))">$(SlnDir)ILMerge.Build.Tasks\bin\Release\AnyCPU\ILMerge.Build.Task.dll</ILMergeBuildTask>
+        <InjectModuleInitializerTool Condition="$(DefineConstants.Contains('ModuleInitializer'))">$(SlnDir)WebApplications.Utilities.Initializer\bin\Release\AnyCPU\Merged\WebApplications.Utilities.Initializer.dll</InjectModuleInitializerTool>
+        <PerfSetupTool Condition="$(DefineConstants.Contains('PerfSetup'))">$(SlnDir)WebApplications.Utilities.Performance\PerfSetup\bin\Release\Merged\PerfSetup32.exe</PerfSetupTool>
+        <PerfSetupTool64 Condition="$(DefineConstants.Contains('PerfSetup'))">$(SlnDir)WebApplications.Utilities.Performance\PerfSetup\bin\Release\Merged\PerfSetup64.exe</PerfSetupTool64>
       </PropertyGroup>
 
       <!-- Verify pre-requisits -->

diff --git a/src/ILMerge.Build.Task/ILMerge.Build.Task.csproj b/src/ILMerge.Build.Task/ILMerge.Build.Task.csproj
@@ -16,7 +16,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="../Utilities/Annotations/Annotations.cs" />
+    <Compile Include="../WebApplications.Utilities/Annotations/Annotations.cs" />
     <Compile Include="ILMerge.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -27,7 +27,7 @@
   <Target Name="CopyILMergeExeLocal" BeforeTargets="AfterBuild">
     <!-- Find the ILMerge tools, look in nuget packages first, then use included version. -->
     <ItemGroup Condition="!Exists('$(ILMergeTool)')">
-      <ILMergePackage Include="$(SlnDir)packages\ilmerge.*\tools\ILMerge.exe" />
+      <ILMergePackage Include="$(SlnDir)..\packages\ilmerge.*\tools\ILMerge.exe" />
     </ItemGroup>
     <PropertyGroup Condition="!Exists('$(ILMergeTool)') AND '@(ILMergePackage)'!=''">
       <ILMergeTool>@(ILMergePackage)</ILMergeTool>

diff --git a/...plications.Utilities.Cryptography/Test/WebApplications.Utilities.Cryptography.Test.csproj b/...plications.Utilities.Cryptography/Test/WebApplications.Utilities.Cryptography.Test.csproj
@@ -57,11 +57,11 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Testing\WebApplications.Testing.csproj">
+    <ProjectReference Include="..\..\WebApplications.Testing\WebApplications.Testing.csproj">
       <Project>{e41cd12c-805c-4493-a45a-9bc917d7b240}</Project>
       <Name>WebApplications.Testing</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Utilities\WebApplications.Utilities.csproj">
+    <ProjectReference Include="..\..\WebApplications.Utilities\WebApplications.Utilities.csproj">
       <Project>{2931c698-6123-49bc-81fd-f72a4c1415ea}</Project>
       <Name>WebApplications.Utilities</Name>
     </ProjectReference>

diff --git a/src/WebApplications.Utilities.Cryptography/WebApplications.Utilities.Cryptography.csproj b/src/WebApplications.Utilities.Cryptography/WebApplications.Utilities.Cryptography.csproj
@@ -63,7 +63,7 @@
     <None Include="app.config.transform" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Utilities\WebApplications.Utilities.csproj">
+    <ProjectReference Include="..\WebApplications.Utilities\WebApplications.Utilities.csproj">
       <Project>{2931c698-6123-49bc-81fd-f72a4c1415ea}</Project>
       <Name>WebApplications.Utilities</Name>
     </ProjectReference>

diff --git 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 @@
     <Content Include="SqlServerTypes\readme.htm" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Logging\WebApplications.Utilities.Logging.csproj">
+    <ProjectReference Include="..\..\WebApplications.Utilities.Logging\WebApplications.Utilities.Logging.csproj">
       <Project>{0eba7604-0bdb-438e-967f-7dfe93e6abd5}</Project>
       <Name>WebApplications.Utilities.Logging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Performance\WebApplications.Utilities.Performance.csproj">
+    <ProjectReference Include="..\..\WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.csproj">
       <Project>{04220e31-53f6-453f-80c5-0e2d49776d36}</Project>
       <Name>WebApplications.Utilities.Performance</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Testing\WebApplications.Testing.csproj">
+    <ProjectReference Include="..\..\WebApplications.Testing\WebApplications.Testing.csproj">
       <Project>{e41cd12c-805c-4493-a45a-9bc917d7b240}</Project>
       <Name>WebApplications.Testing</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Utilities\WebApplications.Utilities.csproj">
+    <ProjectReference Include="..\..\WebApplications.Utilities\WebApplications.Utilities.csproj">
       <Project>{2931c698-6123-49bc-81fd-f72a4c1415ea}</Project>
       <Name>WebApplications.Utilities</Name>
     </ProjectReference>

diff --git a/src/WebApplications.Utilities.Database/WebApplications.Utilities.Database.csproj b/src/WebApplications.Utilities.Database/WebApplications.Utilities.Database.csproj
@@ -237,19 +237,19 @@
     <Content Include="SqlServerTypes\readme.htm" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Logging\WebApplications.Utilities.Logging.csproj">
+    <ProjectReference Include="..\WebApplications.Utilities.Logging\WebApplications.Utilities.Logging.csproj">
       <Project>{0eba7604-0bdb-438e-967f-7dfe93e6abd5}</Project>
       <Name>WebApplications.Utilities.Logging</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Performance\WebApplications.Utilities.Performance.csproj">
+    <ProjectReference Include="..\WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.csproj">
       <Project>{04220e31-53f6-453f-80c5-0e2d49776d36}</Project>
       <Name>WebApplications.Utilities.Performance</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Serialization\WebApplications.Utilities.Serialization.csproj">
+    <ProjectReference Include="..\WebApplications.Utilities.Serialization\WebApplications.Utilities.Serialization.csproj">
       <Project>{686798d4-cc9c-460f-937f-28933cc53e09}</Project>
       <Name>WebApplications.Utilities.Serialization</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Utilities\WebApplications.Utilities.csproj">
+    <ProjectReference Include="..\WebApplications.Utilities\WebApplications.Utilities.csproj">
       <Project>{2931c698-6123-49bc-81fd-f72a4c1415ea}</Project>
       <Name>WebApplications.Utilities</Name>
     </ProjectReference>

diff --git a/src/WebApplications.Utilities.Initializer/WebApplications.Utilities.Initializer.csproj b/src/WebApplications.Utilities.Initializer/WebApplications.Utilities.Initializer.csproj
@@ -42,7 +42,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="ModuleInitializer.cs.pp" />
-    <Compile Include="..\Utilities\Annotations\Annotations.cs">
+    <Compile Include="..\WebApplications.Utilities\Annotations\Annotations.cs">
       <Link>Annotations.cs</Link>
     </Compile>
     <Compile Include="Injector.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
@@ -59,15 +59,15 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Performance\WebApplications.Utilities.Performance.csproj">
+    <ProjectReference Include="..\..\WebApplications.Utilities.Performance\WebApplications.Utilities.Performance.csproj">
       <Project>{04220e31-53f6-453f-80c5-0e2d49776d36}</Project>
       <Name>WebApplications.Utilities.Performance</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Testing\WebApplications.Testing.csproj">
+    <ProjectReference Include="..\..\WebApplications.Testing\WebApplications.Testing.csproj">
       <Project>{e41cd12c-805c-4493-a45a-9bc917d7b240}</Project>
       <Name>WebApplications.Testing</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Utilities\WebApplications.Utilities.csproj">
+    <ProjectReference Include="..\..\WebApplications.Utilities\WebApplications.Utilities.csproj">
       <Project>{2931c698-6123-49bc-81fd-f72a4c1415ea}</Project>
       <Name>WebApplications.Utilities</Name>
     </ProjectReference>