Remove installer, and switch to Assembly-based versioning

AaronC81 · Jun 19, 2018 · 671558b · 671558b
1 parent d7d1b8a
commit 671558b
Show file tree

Hide file tree

Showing 8 changed files with 48 additions and 1,492 deletions.
diff --git a/Disintegrate.Setup/Disintegrate.Setup.vdproj b/Disintegrate.Setup/Disintegrate.Setup.vdproj
diff --git a/Disintegrate.Setup/MIT.rtf b/Disintegrate.Setup/MIT.rtf
diff --git a/Disintegrate.UI/App.config b/Disintegrate.UI/App.config
@@ -1,6 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-11.0.0.0" newVersion="11.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>
diff --git a/Disintegrate.UI/Disintegrate.UI.csproj b/Disintegrate.UI/Disintegrate.UI.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <LangVersion>7.2</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,6 +36,33 @@
     <ApplicationIcon>Resources\Icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="DeltaCompressionDotNet, Version=1.1.0.0, Culture=neutral, PublicKeyToken=1d14d6e5194e7f4a, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.dll</HintPath>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.MsDelta, Version=1.1.0.0, Culture=neutral, PublicKeyToken=46b2138a390abf55, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.MsDelta.dll</HintPath>
+    </Reference>
+    <Reference Include="DeltaCompressionDotNet.PatchApi, Version=1.1.0.0, Culture=neutral, PublicKeyToken=3e8888ee913ed789, processorArchitecture=MSIL">
+      <HintPath>..\packages\DeltaCompressionDotNet.1.1.0\lib\net20\DeltaCompressionDotNet.PatchApi.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll</HintPath>
+    </Reference>
+    <Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <HintPath>..\packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll</HintPath>
+    </Reference>
+    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
+    </Reference>
+    <Reference Include="Splat, Version=1.6.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Splat.1.6.2\lib\Net45\Splat.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -79,6 +107,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

diff --git a/Disintegrate.UI/Menu.cs b/Disintegrate.UI/Menu.cs
@@ -9,6 +9,7 @@
 using System.Windows.Forms;
 using Disintegrate.Configuration.Configurators;
 using Disintegrate.Configuration;
+using System.Reflection;
 
 namespace Disintegrate.UI
 {
@@ -32,7 +33,8 @@ private void ReloadGames()
 
         private void Menu_Load(object sender, EventArgs _)
         {
-            versionLabel.Text = $"Version {Info.Version}";
+            var version = Assembly.GetEntryAssembly().GetName().Version;
+            versionLabel.Text = $"Version {version}";
 
             foreach (var configurator in _configurators)
             {

diff --git a/Disintegrate.UI/Program.cs b/Disintegrate.UI/Program.cs
@@ -17,16 +17,6 @@ static class Program
         [STAThread]
         static void Main(string[] args)
         {
-            if (args.Contains("installer"))
-            {
-                // This has just been installed
-                // Running it normally would 'block' the installer
-                // Instead, relaunch this as a background process
-                Process.Start(Application.ExecutablePath, "show");
-
-                return;
-            }
-
             PresenceManager.Index<Providers.Dota2PresenceProvider>();
             PresenceManager.Index<Providers.GlobalOffensivePresenceProvider>();
             PresenceManager.Start();

diff --git a/Disintegrate.UI/packages.config b/Disintegrate.UI/packages.config
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="DeltaCompressionDotNet" version="1.1.0" targetFramework="net461" />
+  <package id="Mono.Cecil" version="0.9.6.1" targetFramework="net461" />
+  <package id="SharpCompress" version="0.17.1" targetFramework="net461" />
+  <package id="Splat" version="1.6.2" targetFramework="net461" />
+</packages>
diff --git a/Disintegrate.sln b/Disintegrate.sln
@@ -7,8 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Disintegrate", "Disintegrat
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Disintegrate.UI", "Disintegrate.UI\Disintegrate.UI.csproj", "{2D8C7267-45B6-4466-8F69-57F6F8A60B34}"
 EndProject
-Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Disintegrate.Setup", "Disintegrate.Setup\Disintegrate.Setup.vdproj", "{7A2F2ABB-053F-42A7-B936-0C6292A5C8A6}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,9 +21,6 @@ Global
 		{2D8C7267-45B6-4466-8F69-57F6F8A60B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{2D8C7267-45B6-4466-8F69-57F6F8A60B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{2D8C7267-45B6-4466-8F69-57F6F8A60B34}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7A2F2ABB-053F-42A7-B936-0C6292A5C8A6}.Debug|Any CPU.ActiveCfg = Debug
-		{7A2F2ABB-053F-42A7-B936-0C6292A5C8A6}.Debug|Any CPU.Build.0 = Debug
-		{7A2F2ABB-053F-42A7-B936-0C6292A5C8A6}.Release|Any CPU.ActiveCfg = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE