commit changes to successfully compile

MerlinCooper · Jun 9, 2020 · 25837d9 · 25837d9
1 parent 86f2ee4
commit 25837d9
Show file tree

Hide file tree

Showing 18 changed files with 52 additions and 59 deletions.
diff --git a/App.config b/App.config
@@ -8,11 +8,11 @@
     </configSections>
     <startup> 
 
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup>
     <userSettings>
         <iRacingReplayOverlay.Settings>
             <setting name="WorkingFolder" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="videoBitRate" serializeAs="String">
                 <value>15</value>
@@ -21,16 +21,16 @@
                 <value>48000</value>
             </setting>
             <setting name="lastSelectedTrackName" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="lastVideoFile" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="CameraStickyPeriod" serializeAs="String">
                 <value>00:00:20</value>
             </setting>
             <setting name="PreferredDriverNames" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="BattleGap" serializeAs="String">
                 <value>00:00:01</value>
@@ -63,7 +63,7 @@
                 <value>False</value>
             </setting>
             <setting name="TrackingID" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="ResultsFlashCardPosition" serializeAs="String">
                 <value>3</value>
@@ -81,10 +81,10 @@
                 <value>False</value>
             </setting>
             <setting name="MainExecPath" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="OverlayPluginId" serializeAs="String">
-                <value/>
+                <value />
             </setting>
         </iRacingReplayOverlay.Settings>
         <iRacingReplayOverlay.Main>

diff --git a/Tester/App.config b/Tester/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
     </startup>
 </configuration>
diff --git a/Tester/Tester.csproj b/Tester/Tester.csproj
@@ -13,7 +13,7 @@
     <TargetFrameworkProfile />
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <Optimize>false</Optimize>

diff --git a/iRacingReplayDirector.csproj b/iRacingReplayDirector.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\ILMerge.3.0.40\build\ILMerge.props" Condition="Exists('packages\ILMerge.3.0.40\build\ILMerge.props')" />
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <AssemblyName Condition=" '$(OverrideAssemblyName)' == '' ">iRacingReplayOverlay</AssemblyName>
@@ -16,14 +15,12 @@
     <SchemaVersion>2.0</SchemaVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <ProductName>iRacing Replay Director</ProductName>
     <PublisherName>Dean Netherton</PublisherName>
     <SuiteName>iRacing Apps</SuiteName>
     <ApplicationRevision>34</ApplicationRevision>
     <ApplicationVersion>1.0.0.34</ApplicationVersion>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <Optimize>false</Optimize>
@@ -327,10 +324,4 @@
       <Name>iRacingSDK</Name>
     </ProjectReference>
   </ItemGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('packages\ILMerge.3.0.40\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILMerge.3.0.40\build\ILMerge.props'))" />
-  </Target>
 </Project>
diff --git a/iRacingReplayOverlay.net.Tests/app.config b/iRacingReplayOverlay.net.Tests/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
+</configuration>
diff --git a/iRacingReplayOverlay.net.Tests/iRacingReplayOverlay.net.Tests.csproj b/iRacingReplayOverlay.net.Tests/iRacingReplayOverlay.net.Tests.csproj
@@ -11,8 +11,7 @@
     <AssemblyName>iRacingReplayOverlay.net.Tests</AssemblyName>
     <StartupObject>
     </StartupObject>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetFrameworkProfile />
+    <TargetFrameworkVersion>v4.5.1</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>

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.1" targetFramework="net472" />
+  <package id="YamlDotNet" version="5.3.1" targetFramework="net451" />
 </packages>
diff --git a/iRacingReplayOverlay.net.csproj b/iRacingReplayOverlay.net.csproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <AssemblyName Condition=" '$(OverrideAssemblyName)' == '' ">iRacingReplayOverlay</AssemblyName>
@@ -15,7 +15,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>

diff --git a/iRacingReplayOverlay.net.sln b/iRacingReplayOverlay.net.sln
@@ -18,6 +18,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tester", "Tester\Tester.csp
 		{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18} = {E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingReplayOverlay.net.Tests", "iRacingReplayOverlay.net.Tests\iRacingReplayOverlay.net.Tests.csproj", "{E4D21BA6-6275-4D46-A1D6-E7D16BF0E5EC}"
+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}"
@@ -90,6 +92,12 @@ Global
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Release|Any CPU.ActiveCfg = Release|x64
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Release|Any CPU.Build.0 = Release|x64
 		{7D205FCC-6CE6-49B3-8012-DC14ED9924D1}.Release|x64.ActiveCfg = Release|x64
+		{E4D21BA6-6275-4D46-A1D6-E7D16BF0E5EC}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{E4D21BA6-6275-4D46-A1D6-E7D16BF0E5EC}.Debug|Any CPU.Build.0 = Debug|x64
+		{E4D21BA6-6275-4D46-A1D6-E7D16BF0E5EC}.Debug|x64.ActiveCfg = Debug|x64
+		{E4D21BA6-6275-4D46-A1D6-E7D16BF0E5EC}.Debug|x64.Build.0 = Debug|x64
+		{E4D21BA6-6275-4D46-A1D6-E7D16BF0E5EC}.Release|Any CPU.ActiveCfg = Release|x64
+		{E4D21BA6-6275-4D46-A1D6-E7D16BF0E5EC}.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

diff --git a/packages.config b/packages.config
@@ -2,12 +2,12 @@
 <packages>
   <package id="AWSSDK.CloudWatchLogs" version="3.1.2.2" targetFramework="net40-client" requireReinstallation="true" />
   <package id="AWSSDK.Core" version="3.1.4.0" targetFramework="net40-client" requireReinstallation="true" />
-  <package id="ILMerge" version="3.0.40" targetFramework="net472" />
+  <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.42" targetFramework="net45" />
   <package id="MediaFoundation.Net" version="2.0.0.32" targetFramework="net40-client" />
   <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net45" />
   <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.1" targetFramework="net472" />
+  <package id="YamlDotNet" version="5.3.1" targetFramework="net45" />
 </packages>
diff --git a/plugins/NoOverlay/NoOverlay.csproj b/plugins/NoOverlay/NoOverlay.csproj
@@ -9,10 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NoOverlay</RootNamespace>
     <AssemblyName>NoOverlay</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -23,7 +22,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>true</UseVSHostingProcess>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,7 +30,6 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="Exists('.\packages')">
     <PackagesFolder>.\packages\</PackagesFolder>
@@ -60,17 +57,14 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="iRacingSDK, Version=1.0.0.42, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\iRacingSDK.1.0.0.42\lib\net40-client\iRacingSDK.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
+    <Reference Include="iRacingSDK, Version=1.0.0.40, Culture=neutral, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\YamlDotNet.5.3.1\lib\net45\YamlDotNet.dll</HintPath>
+      <HintPath>..\..\packages\YamlDotNet.5.3.1\lib\net35\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/plugins/NoOverlay/packages.config b/plugins/NoOverlay/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="iRacingDirector.Plugin.Support" version="1.0.0.48" targetFramework="net40-client" />
-  <package id="iRacingSDK" version="1.0.0.42" targetFramework="net40-client" />
-  <package id="YamlDotNet" version="5.3.1" targetFramework="net472" />
+  <package id="iRacingSDK" version="1.0.0.40" targetFramework="net40-client" />
+  <package id="YamlDotNet" version="5.3.1" targetFramework="net40-client" />
 </packages>
diff --git a/plugins/iRacingDirector.Plugin.Tester/App.config b/plugins/iRacingDirector.Plugin.Tester/App.config
@@ -1,40 +1,40 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="iRacingDirector.Plugin.Tester.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
-            <section name="iRacingDirector.Plugin.OverlaySupport.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
+            <section name="iRacingDirector.Plugin.Tester.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="iRacingDirector.Plugin.OverlaySupport.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
     </startup>
     <userSettings>
         <iRacingDirector.Plugin.Tester.Properties.Settings>
             <setting name="PluginAssemblyFileName" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="BackgroundTestImageFileName" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="SampleSessionDataFileName" serializeAs="String">
-                <value/>
+                <value />
             </setting>
         </iRacingDirector.Plugin.Tester.Properties.Settings>
         <iRacingDirector.Plugin.OverlaySupport.Properties.Settings>
             <setting name="PluginAssemblyFileName" serializeAs="String">
-                <value/>
+                <value />
             </setting>
             <setting name="BackgroundTestImageFileName" serializeAs="String">
-                <value/>
+                <value />
             </setting>
         </iRacingDirector.Plugin.OverlaySupport.Properties.Settings>
     </userSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0"/>
+        <assemblyIdentity name="YamlDotNet" publicKeyToken="ec19458f3c15af5e" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

diff --git a/plugins/iRacingDirector.Plugin.Tester/Properties/Resources.Designer.cs b/plugins/iRacingDirector.Plugin.Tester/Properties/Resources.Designer.cs
diff --git a/plugins/iRacingDirector.Plugin.Tester/Properties/Settings.Designer.cs b/plugins/iRacingDirector.Plugin.Tester/Properties/Settings.Designer.cs
diff --git a/plugins/iRacingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.csproj b/plugins/iRacingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>iRacingDirector.Plugin.Tester</RootNamespace>
     <AssemblyName>iRacingDirector.Plugin.Tester</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile>

diff --git a/...acingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.previous.nugetreferenceswitcher b/...acingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.previous.nugetreferenceswitcher
@@ -0,0 +1 @@
+iRacingSDK	../../iRacingSDK.Net/iRacingSDK.csproj	../../packages/iRacingSDK.1.0.0.42/lib/net40-client/iRacingSDK.dll
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.42" targetFramework="net45" />
-  <package id="YamlDotNet" version="5.3.1" targetFramework="net472" />
+  <package id="YamlDotNet" version="5.3.1" targetFramework="net45" />
 </packages>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		iRacingSDK ../../iRacingSDK.Net/iRacingSDK.csproj ../../packages/iRacingSDK.1.0.0.42/lib/net40-client/iRacingSDK.dll