All projects (except "Tester") compile

MerlinCooper · Jun 22, 2020 · b2e289c · b2e289c
1 parent 79a0104
commit b2e289c
Show file tree

Hide file tree

Showing 10 changed files with 32 additions and 61 deletions.
diff --git a/Tester/Tester.csproj b/Tester/Tester.csproj
@@ -45,15 +45,16 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\iRacingReplayOverlay.net.csproj">
-      <Project>{0E523573-2972-4DC0-AECB-C4CF746854BB}</Project>
-      <Name>iRacingReplayOverlay.net</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\iRacingSDK.Net\iRacingSDK.csproj">
-      <Project>{5422ae20-f220-4be1-9e61-5296981abb5c}</Project>
+    <ProjectReference Include="..\..\iRacingReplayDirector.csproj">
+      <Project>{ff13a533-25a3-4238-a412-45b39e7844f6}</Project>
       <Name>iRacingSDK</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="iRacingSDK">
+      <Version>1.0.0.43</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/iRacingReplayOverlay.net.sln b/iRacingReplayOverlay.net.sln
@@ -44,6 +44,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingReplayDirector", "iR
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NoOverlay", "plugins\NoOverlay\NoOverlay.csproj", "{C4ABC83D-1801-4407-B7C2-BDF9396D28AD}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CEC2BB31-324D-41E3-83C8-A5C35C63129B} = {CEC2BB31-324D-41E3-83C8-A5C35C63129B}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/plugins/NoOverlay/NoOverlay.csproj b/plugins/NoOverlay/NoOverlay.csproj
@@ -103,8 +103,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <PostBuildEvent>mkdir $(SolutionDir)\bin\x64\Debug\plugins\NoOverlay
-      copy $(TargetDir)\JockeOverlays.* $(SolutionDir)\bin\x64\Debug\plugins\NoOverlay
-      copy $(TargetDir)\iRacingDirector.Plugin.Support.* $(SolutionDir)\bin\x64\Debug\plugins\NoOverlay</PostBuildEvent>
+copy $(TargetDir)\JockeOverlays.* $(SolutionDir)\bin\x64\Debug\plugins\NoOverlay
+copy $(TargetDir)\iRacingDirector.Plugin.Support.* $(SolutionDir)\bin\x64\Debug\plugins\NoOverlay</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/...ns/iRacingDirector.Plugin.StandardOverlays/iRacingDirector.Plugin.StandardOverlays.csproj b/...ns/iRacingDirector.Plugin.StandardOverlays/iRacingDirector.Plugin.StandardOverlays.csproj
@@ -101,11 +101,10 @@
     <PreBuildEvent>rmdir /S /Q $(SolutionDir)\bin\x64\Debug\plugins\iRacingDirector.Plugin.StandardOverlays</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PostBuildEvent>
-      mkdir $(SolutionDir)\bin\x64\Debug\plugins\iRacingDirector.Plugin.StandardOverlays
-      copy $(TargetDir)\iRacingDirector.Plugin.StandardOverlays.* $(SolutionDir)\bin\x64\Debug\plugins\iRacingDirector.Plugin.StandardOverlays
-      copy $(TargetDir)\iRacingDirector.Plugin.Support.* $(SolutionDir)\bin\x64\Debug\plugins\iRacingDirector.Plugin.StandardOverlays
-     copy $(TargetDir)\iRacingDirector.Plugin.Support.* $(SolutionDir)\bin\x64\Debug\plugins\JockeOverlays\iRacingDirector.Plugin.StandardOverlays
+    <PostBuildEvent>mkdir $(SolutionDir)\bin\x64\Debug\plugins\iRacingDirector.Plugin.StandardOverlays
+copy $(TargetDir)\iRacingDirector.Plugin.StandardOverlays.* $(SolutionDir)\bin\x64\Debug\plugins\iRacingDirector.Plugin.StandardOverlays
+copy $(TargetDir)\iRacingDirector.Plugin.Support.* $(SolutionDir)\bin\x64\Debug\plugins\iRacingDirector.Plugin.StandardOverlays
+copy $(TargetDir)\iRacingDirector.Plugin.Support.* $(SolutionDir)\bin\x64\Debug\plugins\JockeOverlays\iRacingDirector.Plugin.StandardOverlays
 </PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

diff --git a/plugins/iRacingDirector.Plugin.Tester/App.config b/plugins/iRacingDirector.Plugin.Tester/App.config
diff --git a/plugins/iRacingDirector.Plugin.Tester/DomainForm.cs b/plugins/iRacingDirector.Plugin.Tester/DomainForm.cs
@@ -3,6 +3,7 @@
 using System.Drawing;
 using System.IO;
 using System.Reflection;
+using iRacingReplayDirector;
 
 namespace iRacingDirector.Plugin.Tester
 {

diff --git a/plugins/iRacingDirector.Plugin.Tester/ImageViewer.cs b/plugins/iRacingDirector.Plugin.Tester/ImageViewer.cs
@@ -1,4 +1,4 @@
-using iRacingDirector;
+using iRacingReplayDirector; 
 using System;
 using System.Drawing;
 using System.Drawing.Drawing2D;

diff --git a/plugins/iRacingDirector.Plugin.Tester/Main.cs b/plugins/iRacingDirector.Plugin.Tester/Main.cs
@@ -3,7 +3,8 @@
 using System.IO;
 using System.Threading;
 using System.Windows.Forms;
-using iRacingDirector.Phases;
+using iRacingDirector;
+using iRacingReplayDirector.Phases;
 
 namespace iRacingDirector.Plugin.Tester
 {

diff --git a/plugins/iRacingDirector.Plugin.Tester/Program.cs b/plugins/iRacingDirector.Plugin.Tester/Program.cs
@@ -1,5 +1,5 @@
-using iRacingReplayDirector.Support;
-using iRacingSDK.Support;
+using iRacingSDK.Support;
+using iRacingReplayDirector.Support;
 using System;
 using System.Diagnostics;
 using System.IO;

diff --git a/plugins/iRacingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.csproj b/plugins/iRacingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.csproj
@@ -96,9 +96,6 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="iRacingSDK">
       <Version>1.0.0.43</Version>
@@ -107,6 +104,16 @@
       <Version>5.3.1</Version>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\iRacingSDK.Net\iRacingSDK.csproj">
+      <Project>{5422ae20-f220-4be1-9e61-5296981abb5c}</Project>
+      <Name>iRacingSDK</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\iRacingReplayDirector.csproj">
+      <Project>{ff13a533-25a3-4238-a412-45b39e7844f6}</Project>
+      <Name>iRacingSDK</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.