All projects except iRacingReplayOverlay and iRacingReplayOverlay.Tes…

…ter do compile
MerlinCooper · Jun 21, 2020 · 4959f21 · 4959f21
1 parent 8baddb8
commit 4959f21
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 16 deletions.
diff --git a/SuperMFLib/SuperMFLib/SuperMFLib.csproj b/SuperMFLib/SuperMFLib/SuperMFLib.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.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')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -15,6 +16,8 @@
     <SchemaVersion>2.0</SchemaVersion>
     <TargetFrameworkProfile>Client</TargetFrameworkProfile>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <Optimize>false</Optimize>
@@ -127,4 +130,10 @@
     <PreBuildEvent>
     </PreBuildEvent>
   </PropertyGroup>
+  <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/SuperMFLib/SuperMFLib/packages.config b/SuperMFLib/SuperMFLib/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ILMerge" version="2.14.1208" targetFramework="net451" />
+  <package id="ILMerge" version="3.0.40" targetFramework="net35-client" />
 </packages>
diff --git a/iRacingReplayDirector.csproj b/iRacingReplayDirector.csproj
@@ -112,9 +112,6 @@
     <Reference Include="UIAutomationProvider" />
     <Reference Include="WindowsBase" />
     <Reference Include="WindowsFormsIntegration" />
-    <Reference Include="YamlDotNet, Version=5.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\YamlDotNet.5.3.1\lib\net45\YamlDotNet.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AboutBox1.cs">
@@ -321,9 +318,6 @@
     <Content Include="DeploymentSite\index.html" />
     <Content Include="DeploymentSite\xmltojson.js" />
   </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="packages\AWSSDK.CloudWatchLogs.3.1.2.2\analyzers\dotnet\cs\AWSSDK.CloudWatchLogs.CodeAnalysis.dll" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="iRacingSDK.Net\iRacingSDK.csproj">
       <Project>{5422AE20-F220-4BE1-9E61-5296981ABB5C}</Project>
@@ -337,6 +331,18 @@
     <PackageReference Include="AWSSDK.Core">
       <Version>3.1.4</Version>
     </PackageReference>
+    <PackageReference Include="ILMerge">
+      <Version>3.0.40</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Octokit">
+      <Version>0.17.0</Version>
+    </PackageReference>
+    <PackageReference Include="YamlDotNet">
+      <Version>5.3.1</Version>
+    </PackageReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">

diff --git a/iRacingReplayOverlay.net.Tests/iRacingReplayOverlay.net.Tests.csproj b/iRacingReplayOverlay.net.Tests/iRacingReplayOverlay.net.Tests.csproj
@@ -80,4 +80,9 @@
       <Name>iRacingSDK</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Octokit">
+      <Version>0.17.0</Version>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/iRacingReplayOverlay.net.csproj b/iRacingReplayOverlay.net.csproj
@@ -344,11 +344,26 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="AWSSDK">
+      <Version>2.3.55.2</Version>
+    </PackageReference>
     <PackageReference Include="AWSSDK.CloudWatchLogs">
-      <Version>3.1.2.2</Version>
+      <Version>3.3.102.22</Version>
     </PackageReference>
     <PackageReference Include="AWSSDK.Core">
       <Version>3.1.4</Version>
     </PackageReference>
+    <PackageReference Include="ILMerge">
+      <Version>3.0.40</Version>
+    </PackageReference>
+    <PackageReference Include="Newtonsoft.Json">
+      <Version>12.0.3</Version>
+    </PackageReference>
+    <PackageReference Include="Octokit">
+      <Version>0.48.0</Version>
+    </PackageReference>
+    <PackageReference Include="YamlDotNet">
+      <Version>5.3.1</Version>
+    </PackageReference>
   </ItemGroup>
 </Project>
diff --git a/iRacingReplayOverlay.net.sln b/iRacingReplayOverlay.net.sln
@@ -44,6 +44,9 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingDirector.Plugin.Tester", "plugins\iRacingDirector.Plugin.Tester\iRacingDirector.Plugin.Tester.csproj", "{96FA1C80-396C-4792-9E8B-C7CBFC25833D}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JockeOverlays", "plugins\JockeOverlays\JockeOverlays.csproj", "{F49DAE6F-321E-45A8-B9B4-23475A3F6080}"
+	ProjectSection(ProjectDependencies) = postProject
+		{CEC2BB31-324D-41E3-83C8-A5C35C63129B} = {CEC2BB31-324D-41E3-83C8-A5C35C63129B}
+	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRacingReplayDirector", "iRacingReplayDirector.csproj", "{E9EB76FC-CB86-47EA-A1F3-01570C1BBC18}"
 	ProjectSection(ProjectDependencies) = postProject

diff --git a/plugins/JockeOverlays/JockeOverlays.csproj b/plugins/JockeOverlays/JockeOverlays.csproj
@@ -42,14 +42,12 @@
   <PropertyGroup Condition="Exists('.\..\..\packages')">
     <PackagesFolder>.\..\..\packages\</PackagesFolder>
   </PropertyGroup>
-
   <ItemGroup>
     <Reference Include="YamlDotNet, Version=2.0.1.20271, Culture=neutral, PublicKeyToken=2b53052c5884d7a1, processorArchitecture=MSIL">
       <HintPath>$(PackagesFolder)YamlDotNet.3.1.1\lib\net35\YamlDotNet.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
-
   <PropertyGroup>
     <SupportProject Condition="Exists('..\iRacingDirector.Plugin.Support\iRacingDirector.Plugin.Support.csproj')">..\iRacingDirector.Plugin.Support\iRacingDirector.Plugin.Support.csproj</SupportProject>
     <SupportProject Condition="Exists('..\iRacingDirector.Plugin.Support\iRacingDirector.Plugin.Support\iRacingDirector.Plugin.Support.csproj')">..\iRacingDirector.Plugin.Support\iRacingDirector.Plugin.Support\iRacingDirector.Plugin.Support.csproj</SupportProject>
@@ -88,7 +86,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="tools\package.cmd" />
   </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
@@ -50,10 +50,7 @@
       <Project>{0e523573-2972-4dc0-aecb-c4cf746854bb}</Project>
       <Name>iRacingReplayOverlay</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\iRacingSDK.Net\iRacingSDK.csproj">
-      <Project>{5422AE20-F220-4BE1-9E61-5296981ABB5C}</Project>
-      <Name>iRacingSDK</Name>
-    </ProjectReference>
+
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/...acingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.previous.nugetreferenceswitcher b/...acingDirector.Plugin.Tester/iRacingDirector.Plugin.Tester.previous.nugetreferenceswitcher