Remove iRacingSDK.NET Submodule

MerlinCooper · May 13, 2020 · 37912f8 · 37912f8
1 parent 4ce4ec8
commit 37912f8
Show file tree

Hide file tree

Showing 11 changed files with 27 additions and 21 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -16,6 +16,3 @@
 [submodule "iRacingSDK.NET"]
 	path = iRacingSDK.NET
 	url = https://github.com/MerlinCooper/iRacingSDK.Net.git
-[submodule "iRacingSDK.Net"]
-	path = iRacingSDK.Net
-	url = https://github.com/MerlinCooper/iRacingSDK.Net.git
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/iRacingReplayDirector.csproj b/iRacingReplayDirector.csproj
@@ -6,7 +6,7 @@
     <AssemblyName Condition=" '$(OverrideAssemblyName)' != '' ">$(OverrideAssemblyName)</AssemblyName>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x64</Platform>
-    <ProjectGuid>{0E523573-2972-4DC0-AECB-C4CF746854BB}</ProjectGuid>
+    <ProjectGuid>{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>iRacingReplayDirector</RootNamespace>

diff --git a/iRacingReplayOverlay.net.Tests/iRacingReplayOverlay.net.Tests.csproj b/iRacingReplayOverlay.net.Tests/iRacingReplayOverlay.net.Tests.csproj
@@ -43,8 +43,8 @@
     <Reference Include="System" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\YamlDotNet.5.3.0\lib\net45\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.8.1.1\lib\net45\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/iRacingReplayOverlay.net.Tests/packages.config b/iRacingReplayOverlay.net.Tests/packages.config
@@ -4,5 +4,5 @@
   <package id="Moq" version="4.2.1409.1722" targetFramework="net451" />
   <package id="NUnit" version="2.6.3" targetFramework="net40" />
   <package id="NUnit.Runners" version="2.6.3" targetFramework="net451" />
-  <package id="YamlDotNet" version="5.3.0" targetFramework="net451" />
+  <package id="YamlDotNet" version="8.1.1" targetFramework="net451" />
 </packages>
diff --git a/iRacingReplayOverlay.net.csproj b/iRacingReplayOverlay.net.csproj
@@ -9,7 +9,7 @@
     <ProjectGuid>{0E523573-2972-4DC0-AECB-C4CF746854BB}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>iRacingReplayOverlay</RootNamespace>
+    <RootNamespace>iRacingReplayDirector</RootNamespace>
     <FileAlignment>512</FileAlignment>
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -50,11 +50,10 @@
   <PropertyGroup>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyName>iRacingReplayDirector</AssemblyName>
+  </PropertyGroup>
   <ItemGroup Condition="'$(Configuration)' == 'Release'">
-    <Reference Include="iRacingSDK, Version=1.0.0.36, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\iRacingSDK.1.0.0.36\lib\net40-client\iRacingSDK.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="MediaFoundation.Net, Version=2.0.0.32, Culture=neutral, processorArchitecture=AMD64">
       <HintPath>packages\MediaFoundation.Net.2.0.0.32\lib\net35-client\MediaFoundation.Net.dll</HintPath>
       <Private>True</Private>
@@ -83,6 +82,9 @@
       <HintPath>packages\AWSSDK.Core.3.1.4.0\lib\net35\AWSSDK.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="iRacingSDK, Version=1.0.0.40, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\iRacingSDK.1.0.0.40\lib\net40-client\iRacingSDK.dll</HintPath>
+    </Reference>
     <Reference Include="Newtonsoft.Json">
       <HintPath>packages\Newtonsoft.Json.4.0.5\lib\net40\Newtonsoft.Json.dll</HintPath>
     </Reference>

diff --git a/iRacingReplayOverlay.net.sln b/iRacingReplayOverlay.net.sln
@@ -42,6 +42,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingDirector.Plugin.Test
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JockeOverlays", "plugins\JockeOverlays\JockeOverlays.csproj", "{F49DAE6F-321E-45A8-B9B4-23475A3F6080}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingReplayDirector", "iRacingReplayDirector.csproj", "{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -148,6 +150,12 @@ Global
 		{F49DAE6F-321E-45A8-B9B4-23475A3F6080}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F49DAE6F-321E-45A8-B9B4-23475A3F6080}.Release|x64.ActiveCfg = Release|Any CPU
 		{F49DAE6F-321E-45A8-B9B4-23475A3F6080}.Release|x64.Build.0 = Release|Any CPU
+		{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}.Debug|x64.ActiveCfg = Debug|x64
+		{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}.Debug|x64.Build.0 = Debug|x64
+		{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}.Release|Any CPU.ActiveCfg = Release|x64
+		{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}.Release|x64.ActiveCfg = Release|x64
+		{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/iRacingSDK.Net b/iRacingSDK.Net
diff --git a/packages.config b/packages.config
@@ -4,10 +4,10 @@
   <package id="AWSSDK.Core" version="3.1.4.0" targetFramework="net40-client" requireReinstallation="true" />
   <package id="ILMerge" version="2.14.1208" targetFramework="net451" />
   <package id="iRacingDirector.Plugin" version="1.0.0.5" targetFramework="net40-client" />
-  <package id="iRacingSDK" version="1.0.0.36" targetFramework="net40-client" />
+  <package id="iRacingSDK" version="1.0.0.40" targetFramework="net45" />
   <package id="MediaFoundation.Net" version="2.0.0.32" targetFramework="net40-client" />
   <package id="Newtonsoft.Json" version="4.0.5" targetFramework="net451" />
   <package id="Octokit" version="0.17.0" targetFramework="net45" />
   <package id="secure-file" version="1.0.31" targetFramework="net40-client" />
-  <package id="YamlDotNet" version="5.3.0" targetFramework="net45" />
+  <package id="YamlDotNet" version="8.1.1" targetFramework="net45" />
 </packages>
diff --git a/plugins/iRacingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.csproj b/plugins/iRacingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.csproj
@@ -70,8 +70,8 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\YamlDotNet.5.3.0\lib\net45\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=8.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\YamlDotNet.8.1.1\lib\net45\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/plugins/iRacingDirector.Plugin.Tester/packages.config b/plugins/iRacingDirector.Plugin.Tester/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="iRacingSDK" version="1.0.0.36" targetFramework="net40-client" />
-  <package id="YamlDotNet" version="5.3.0" targetFramework="net45" />
+  <package id="YamlDotNet" version="8.1.1" targetFramework="net45" />
 </packages>