Merge pull request #92 from MerlinCooper/Update_YamlDotNet_to12.3.1

Use same NuGet Versions for project and sub-projects. Separate iRacingSDK project from iRacingReplayDirector to avoid interferrences
MerlinCooper · Feb 4, 2023 · 0453859 · 0453859
2 parents 3fa18df + 243f9e2
commit 0453859
Show file tree

Hide file tree

Showing 14 changed files with 36 additions and 92 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "iRacingSDK.Net"]
-	path = iRacingSDK.Net
-	url = https://github.com/MerlinCooper/iRacingSDK.Net.git

diff --git a/ImagerOverlayer/ImagerOverlayer.csproj b/ImagerOverlayer/ImagerOverlayer.csproj
@@ -43,10 +43,6 @@
       <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>
-      <Name>iRacingSDK</Name>
-    </ProjectReference>
     <ProjectReference Include="..\SuperMFLib\mfnet\mflib\src\MediaFoundation.csproj">
       <Project>{b78c0f3b-071a-4fd2-829d-7a67e0f7bd1c}</Project>
       <Name>MediaFoundation</Name>

diff --git a/Support/PluginProxy.cs b/Support/PluginProxy.cs
@@ -60,14 +60,15 @@ public PluginProxy(string pluginName)
         {
             if(!pluginName.ToLower().EndsWith(".dll"))
                 pluginName = Path.Combine(PluginPath, pluginName, pluginName + ".dll");
-                /* previous code handling StandardOverlay different than other plugins - likely not necessary - currently in testing
-                if (pluginName == StandardOverlaysName)
-                    pluginName = Path.Combine(PluginPath, StandardOverlayDirectory, StandardOverlayDirectory + ".dll");
-                else
-                    pluginName = Path.Combine(PluginPath, pluginName, pluginName + ".dll");*/
-
+            /* previous code handling StandardOverlay different than other plugins - likely not necessary - currently in testing
+            if (pluginName == StandardOverlaysName)
+                pluginName = Path.Combine(PluginPath, StandardOverlayDirectory, StandardOverlayDirectory + ".dll");
+            else
+                pluginName = Path.Combine(PluginPath, pluginName, pluginName + ".dll");*/
+            TraceInfo.WriteLine("Trying to load overlay plugin:{0}", pluginName);
             var an = AssemblyName.GetAssemblyName(pluginName);
             var assembly = Assembly.Load(an);
+            TraceInfo.WriteLine("Plugin {0} succsesfully loaded", pluginName);
 
             pluginType = assembly.GetTypes()
                 .Where(t => !t.IsInterface)

diff --git a/Tester/Tester.csproj b/Tester/Tester.csproj
@@ -46,10 +46,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="iRacingSDK">
-      <Version>1.0.0.43</Version>
+      <Version>1.0.1.23</Version>
     </PackageReference>
     <PackageReference Include="YamlDotNet">
-      <Version>11.2.1</Version>
+      <Version>12.3.1</Version>
     </PackageReference>
     <ProjectReference Include="..\iRacingReplayDirector.csproj">
       <Project>{ff13a533-25a3-4238-a412-45b39e7844f6}</Project>

diff --git a/iRacingReplayDirector.csproj b/iRacingReplayDirector.csproj
@@ -330,12 +330,7 @@
     <Content Include="DeploymentSite\index.html" />
     <Content Include="DeploymentSite\xmltojson.js" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="iRacingSDK.Net\iRacingSDK.csproj">
-      <Project>{5422AE20-F220-4BE1-9E61-5296981ABB5C}</Project>
-      <Name>iRacingSDK</Name>
-    </ProjectReference>
-  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AWSSDK.CloudWatchLogs">
       <Version>3.1.2.2</Version>
@@ -352,6 +347,9 @@
     <PackageReference Include="ILMerge">
       <Version>3.0.40</Version>
     </PackageReference>
+    <PackageReference Include="iRacingSDK">
+      <Version>1.0.1.23</Version>
+    </PackageReference>
     <PackageReference Include="MediaFoundation.Net">
       <Version>2.0.0.32</Version>
     </PackageReference>
@@ -362,7 +360,7 @@
       <Version>0.17.0</Version>
     </PackageReference>
     <PackageReference Include="YamlDotNet">
-      <Version>11.2.1</Version>
+      <Version>12.3.1</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/iRacingReplayDirectorApps.sln b/iRacingReplayDirectorApps.sln
@@ -1,22 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30804.86
+# Visual Studio Version 17
+VisualStudioVersion = 17.5.33318.248
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sample", "iRacingSDK.Net\Sample\Sample.csproj", "{8BDF1915-3140-478E-827F-25D495B8CDC5}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tester", "Tester\Tester.csproj", "{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C} = {5422AE20-F220-4BE1-9E61-5296981ABB5C}
 		{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18} = {E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingSDK", "iRacingSDK.Net\iRacingSDK.csproj", "{5422AE20-F220-4BE1-9E61-5296981ABB5C}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingSDK.Net.Tests", "iRacingSDK.Net\iRacingSDK.Net.Tests\iRacingSDK.Net.Tests.csproj", "{947BD2B6-FFF4-4762-8C0E-718112CDA72E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GenerateDataModels", "iRacingSDK.Net\GenerateDataModels\GenerateDataModels.csproj", "{90126FE7-C20E-43EC-93AF-77AA5268E860}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2BCCAE92-016E-41D6-9CB5-4FC83AC190BE}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingDirector.Plugin.StandardOverlays", "plugins\iRacingDirector.Plugin.StandardOverlays\iRacingDirector.Plugin.StandardOverlays.csproj", "{5916B84C-0264-4102-9CCC-28006D84E4FA}"
@@ -39,10 +30,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JockeOverlays", "plugins\Jo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingReplayDirector", "iRacingReplayDirector.csproj", "{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C} = {5422AE20-F220-4BE1-9E61-5296981ABB5C}
-		{CEC2BB31-324D-41E3-83C8-A5C35C63129B} = {CEC2BB31-324D-41E3-83C8-A5C35C63129B}
-		{C4ABC83D-1801-4407-B7C2-BDF9396D28AD} = {C4ABC83D-1801-4407-B7C2-BDF9396D28AD}
 		{5916B84C-0264-4102-9CCC-28006D84E4FA} = {5916B84C-0264-4102-9CCC-28006D84E4FA}
+		{C4ABC83D-1801-4407-B7C2-BDF9396D28AD} = {C4ABC83D-1801-4407-B7C2-BDF9396D28AD}
+		{CEC2BB31-324D-41E3-83C8-A5C35C63129B} = {CEC2BB31-324D-41E3-83C8-A5C35C63129B}
 		{F49DAE6F-321E-45A8-B9B4-23475A3F6080} = {F49DAE6F-321E-45A8-B9B4-23475A3F6080}
 	EndProjectSection
 EndProject
@@ -59,40 +49,12 @@ Global
 		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{8BDF1915-3140-478E-827F-25D495B8CDC5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{8BDF1915-3140-478E-827F-25D495B8CDC5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{8BDF1915-3140-478E-827F-25D495B8CDC5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{8BDF1915-3140-478E-827F-25D495B8CDC5}.Debug|x64.Build.0 = Debug|Any CPU
-		{8BDF1915-3140-478E-827F-25D495B8CDC5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{8BDF1915-3140-478E-827F-25D495B8CDC5}.Release|x64.ActiveCfg = Release|Any CPU
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Debug|Any CPU.ActiveCfg = Debug|x64
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Debug|Any CPU.Build.0 = Debug|x64
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Debug|x64.ActiveCfg = Debug|x64
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Debug|x64.Build.0 = Debug|x64
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Release|Any CPU.ActiveCfg = Release|x64
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Release|x64.ActiveCfg = Release|x64
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C}.Debug|x64.Build.0 = Debug|Any CPU
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C}.Release|x64.ActiveCfg = Release|Any CPU
-		{5422AE20-F220-4BE1-9E61-5296981ABB5C}.Release|x64.Build.0 = Release|Any CPU
-		{947BD2B6-FFF4-4762-8C0E-718112CDA72E}.Debug|Any CPU.ActiveCfg = Debug|x64
-		{947BD2B6-FFF4-4762-8C0E-718112CDA72E}.Debug|Any CPU.Build.0 = Debug|x64
-		{947BD2B6-FFF4-4762-8C0E-718112CDA72E}.Debug|x64.ActiveCfg = Debug|x64
-		{947BD2B6-FFF4-4762-8C0E-718112CDA72E}.Debug|x64.Build.0 = Debug|x64
-		{947BD2B6-FFF4-4762-8C0E-718112CDA72E}.Release|Any CPU.ActiveCfg = Release|x64
-		{947BD2B6-FFF4-4762-8C0E-718112CDA72E}.Release|Any CPU.Build.0 = Release|x64
-		{947BD2B6-FFF4-4762-8C0E-718112CDA72E}.Release|x64.ActiveCfg = Release|x64
-		{90126FE7-C20E-43EC-93AF-77AA5268E860}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{90126FE7-C20E-43EC-93AF-77AA5268E860}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{90126FE7-C20E-43EC-93AF-77AA5268E860}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{90126FE7-C20E-43EC-93AF-77AA5268E860}.Debug|x64.Build.0 = Debug|Any CPU
-		{90126FE7-C20E-43EC-93AF-77AA5268E860}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{90126FE7-C20E-43EC-93AF-77AA5268E860}.Release|Any CPU.Build.0 = Release|Any CPU
-		{90126FE7-C20E-43EC-93AF-77AA5268E860}.Release|x64.ActiveCfg = Release|Any CPU
 		{5916B84C-0264-4102-9CCC-28006D84E4FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5916B84C-0264-4102-9CCC-28006D84E4FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5916B84C-0264-4102-9CCC-28006D84E4FA}.Debug|x64.ActiveCfg = Debug|Any CPU

diff --git a/iRacingReplayOverlay.net.Tests/iRacingReplayOverlay.net.Tests.csproj b/iRacingReplayOverlay.net.Tests/iRacingReplayOverlay.net.Tests.csproj
@@ -69,16 +69,7 @@
       <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>
-      <Name>iRacingSDK</Name>
-    </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-    <ProjectReference Include="..\iRacingSDK.Net\iRacingSDK.csproj">
-      <Project>{5422ae20-f220-4be1-9e61-5296981abb5c}</Project>
-      <Name>iRacingSDK</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Octokit">

diff --git a/iRacingSDK.Net b/iRacingSDK.Net
diff --git a/plugins/JockeOverlays/JockeOverlays.csproj b/plugins/JockeOverlays/JockeOverlays.csproj
@@ -84,7 +84,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="iRacingSDK">
-      <Version>1.0.0.43</Version>
+      <Version>1.0.1.23</Version>
+    </PackageReference>
+    <PackageReference Include="YamlDotNet">
+      <Version>12.3.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/plugins/NoOverlay/MyPlugin.cs b/plugins/NoOverlay/MyPlugin.cs
@@ -1,5 +1,5 @@
 using iRacingDirector.Plugin;
-using iRacingSDK.Support;
+//using iRacingSDK.Support;
 using System.Drawing;
 
 namespace NoOverlay

diff --git a/plugins/NoOverlay/NoOverlay.csproj b/plugins/NoOverlay/NoOverlay.csproj
@@ -88,7 +88,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="iRacingSDK">
-      <Version>1.0.0.43</Version>
+      <Version>1.0.1.23</Version>
+    </PackageReference>
+    <PackageReference Include="YamlDotNet">
+      <Version>12.3.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/...ns/iRacingDirector.Plugin.StandardOverlays/iRacingDirector.Plugin.StandardOverlays.csproj b/...ns/iRacingDirector.Plugin.StandardOverlays/iRacingDirector.Plugin.StandardOverlays.csproj
@@ -84,7 +84,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="iRacingSDK">
-      <Version>1.0.0.43</Version>
+      <Version>1.0.1.23</Version>
+    </PackageReference>
+    <PackageReference Include="YamlDotNet">
+      <Version>12.3.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/...ector.Plugin.Support/iRacingDirector.Plugin.Support/iRacingDirector.Plugin.Support.csproj b/...ector.Plugin.Support/iRacingDirector.Plugin.Support/iRacingDirector.Plugin.Support.csproj
@@ -42,12 +42,6 @@
   <PropertyGroup Condition="Exists('.\..\..\packages')">
     <PackagesFolder>.\..\..\packages\</PackagesFolder>
   </PropertyGroup>
-  <ItemGroup Condition="Exists('..\..\..\iRacingSDK.Net\iRacingSDK.csproj')">
-    <ProjectReference Include="..\..\..\iRacingSDK.Net\iRacingSDK.csproj">
-      <Project>{5422ae20-f220-4be1-9e61-5296981abb5c}</Project>
-      <Name>iRacingSDK</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -69,10 +63,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="iRacingSDK">
-      <Version>1.0.0.43</Version>
+      <Version>1.0.1.23</Version>
     </PackageReference>
     <PackageReference Include="YamlDotNet">
-      <Version>11.2.1</Version>
+      <Version>12.3.1</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/plugins/iRacingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.csproj b/plugins/iRacingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.csproj
@@ -98,17 +98,14 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="iRacingSDK">
-      <Version>1.0.0.43</Version>
+      <Version>1.0.1.23</Version>
     </PackageReference>
     <PackageReference Include="YamlDotNet">
-      <Version>11.2.1</Version>
+      <Version>12.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>iRacingReplayDirector</Name>