Remove ILMerge dependancy and fix build

jfoster · Jan 11, 2021 · 39d7b6c · 39d7b6c
1 parent 6b83801
commit 39d7b6c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 97 deletions.
diff --git a/LiveSplit.Notes/ILMerge.props b/LiveSplit.Notes/ILMerge.props
diff --git a/LiveSplit.Notes/ILMergeOrder.txt b/LiveSplit.Notes/ILMergeOrder.txt
diff --git a/LiveSplit.Notes/LiveSplit.Notes.csproj b/LiveSplit.Notes/LiveSplit.Notes.csproj
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props" Condition="Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" />
-  <Import Project="..\packages\ILMerge.3.0.29\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -54,15 +52,15 @@
       <HintPath>G:\Apps\LiveSplit\UpdateManager.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <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 Include="YamlDotNet, Version=9.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>..\packages\YamlDotNet.9.1.1\lib\net45\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="GitVersion.cs" />
     <Compile Include="GraphicsExtensions.cs" />
+    <Compile Include="Note.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SplitNote.cs" />
     <Compile Include="NotesComponent.cs" />
     <Compile Include="NotesFactory.cs" />
     <Compile Include="NotesSettings.cs">
@@ -73,7 +71,6 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="ILMerge.props" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -82,21 +79,21 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="ILMergeOrder.txt" />
+    <BinFiles Include="$(TargetDir)*.dll" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>
+    </PostBuildEvent>
+  </PropertyGroup>
+  <Import Project="..\packages\GitInfo.2.1.2\build\GitInfo.targets" Condition="Exists('..\packages\GitInfo.2.1.2\build\GitInfo.targets')" />
   <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.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
-    <Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.props'))" />
-    <Error Condition="!Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets'))" />
-    <Error Condition="!Exists('..\packages\GitInfo.2.0.26\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitInfo.2.0.26\build\GitInfo.targets'))" />
+    <Error Condition="!Exists('..\packages\GitInfo.2.1.2\build\GitInfo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitInfo.2.1.2\build\GitInfo.targets'))" />
+  </Target>
+  <Target Name="AfterBuild">
+    <Copy SourceFiles="@(BinFiles)" DestinationFolder="G:\Apps\LiveSplit\Components\" SkipUnchangedFiles="true" />
   </Target>
-  <PropertyGroup>
-    <PostBuildEvent>copy /Y "$(TargetDir)$(ProjectName).dll" "G:\Apps\LiveSplit\Components\$(ProjectName).dll"</PostBuildEvent>
-  </PropertyGroup>
-  <Import Project="..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets" Condition="'$(Configuration)'=='Release' AND Exists('..\packages\MSBuild.ILMerge.Task.1.1.3\build\MSBuild.ILMerge.Task.targets')" />
-  <Import Project="..\packages\GitInfo.2.0.26\build\GitInfo.targets" Condition="Exists('..\packages\GitInfo.2.0.26\build\GitInfo.targets')" />
 </Project>
diff --git a/LiveSplit.Notes/NotesComponent.cs b/LiveSplit.Notes/NotesComponent.cs
@@ -20,9 +20,9 @@ class NotesComponent : IComponent
 
         private readonly NotesSettings Settings;
 
-        private Dictionary<string, SplitNote> Notes;
+        private Dictionary<string, Note> Notes;
 
-        private SplitNote CurrentNote;
+        private Note CurrentNote;
         private SimpleLabel Label;
 
         public NotesComponent(IComponentFactory factory, LiveSplitState state)
@@ -32,7 +32,7 @@ public NotesComponent(IComponentFactory factory, LiveSplitState state)
 
             // Creates notes file if it doesn't exit
             Notes = GetNotes((Run)state.Run);
-            CurrentNote = new SplitNote("", ComponentName);
+            CurrentNote = new Note("", ComponentName);
             Label = new SimpleLabel();
 
             state.RunManuallyModified += DoStart;
@@ -62,7 +62,7 @@ private void DoSplit(object sender, EventArgs e)
         private void DoReset(object sender, TimerPhase value)
         {
             LiveSplitState state = (LiveSplitState)sender;
-            CurrentNote = new SplitNote("", ComponentName);
+            CurrentNote = new Note("", ComponentName);
         }
 
         private void Do(LiveSplitState state)
@@ -74,7 +74,7 @@ private void Do(LiveSplitState state)
             }
         }
 
-        private Dictionary<string, SplitNote> GetNotes(Run run)
+        private Dictionary<string, Note> GetNotes(Run run)
         {
             Dictionary<string, string[]> yaml = null;
 
@@ -114,7 +114,7 @@ private Dictionary<string, SplitNote> GetNotes(Run run)
                 s.Serialize(writer, yaml);
             }
 
-            return yaml.ToDictionary(kvp => kvp.Key, kvp => new SplitNote(kvp.Key, kvp.Value)); ;
+            return yaml.ToDictionary(kvp => kvp.Key, kvp => new Note(kvp.Key, kvp.Value)); ;
         }
 
         public string ComponentName => Factory.ComponentName;

diff --git a/LiveSplit.Notes/packages.config b/LiveSplit.Notes/packages.config
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="GitInfo" version="2.0.26" targetFramework="net461" developmentDependency="true" />
-  <package id="ILMerge" version="3.0.29" targetFramework="net461" />
-  <package id="MSBuild.ILMerge.Task" version="1.1.3" targetFramework="net461" />
-  <package id="YamlDotNet" version="8.1.1" targetFramework="net461" />
+  <package id="GitInfo" version="2.1.2" targetFramework="net461" developmentDependency="true" />
+  <package id="YamlDotNet" version="9.1.1" targetFramework="net461" />
 </packages>