Merge pull request #4 from ToddButler93/master

Read-only workaround.
mcoot · Mar 14, 2022 · 328d189 · 328d189
2 parents 34feedd + 2b2b8c2
commit 328d189
Show file tree

Hide file tree

Showing 9 changed files with 41 additions and 25 deletions.
diff --git a/App.config b/App.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 </configuration>
diff --git a/Config.cs b/Config.cs
@@ -299,7 +299,6 @@ public bool PromptForUbermenu
         }
 
         private static ISerializer serializer = new SerializerBuilder()
-            .EmitDefaults()
             .Build();
         private static IDeserializer deserializer = new DeserializerBuilder()
             .WithNamingConvention(new PascalCaseNamingConvention())

diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -459,7 +459,7 @@ private void InitInfoRichTextBox()
 
             var devPara = new Paragraph(new Run("Launcher developed by mcoot"));
 
-            var reportPara = new Paragraph(new Run("Please report bugs via Discord (mcoot#7419) or Reddit (/u/avianistheterm)"));
+            var reportPara = new Paragraph(new Run("Please report bugs via Discord (mcoot#7419)/(Dodge#3156) or Reddit (/u/avianistheterm)"));
 
             var linksPara = new Paragraph(new Run("Information about TAMods and community servers can be found at:"));
 
@@ -469,26 +469,38 @@ private void InitInfoRichTextBox()
             linkTamodsOrg.NavigateUri = new Uri("https://www.tamods.org");
             linksList.ListItems.Add(new ListItem(new Paragraph(linkTamodsOrg)));
 
-            var linkTAServerGithub = new Hyperlink(new Run("TAServer on GitHub"));
-            linkTAServerGithub.NavigateUri = new Uri("https://github.com/Griffon26/taserver/");
-            linksList.ListItems.Add(new ListItem(new Paragraph(linkTAServerGithub)));
-
-            var linkTAServerDiscord = new Hyperlink(new Run("TAServer Discord"));
-            linkTAServerDiscord.NavigateUri = new Uri("https://discordapp.com/invite/8enekHQ");
-            linksList.ListItems.Add(new ListItem(new Paragraph(linkTAServerDiscord)));
+            var linkNADiscord = new Hyperlink(new Run("NA Tribes Discord"));
+            linkNADiscord.NavigateUri = new Uri("https://discord.gg/gyWew2jHBx");
+            linksList.ListItems.Add(new ListItem(new Paragraph(linkNADiscord)));
 
             var linkAUDiscord = new Hyperlink(new Run("Australian Tribes Discord"));
-            linkAUDiscord.NavigateUri = new Uri("https://discord.gg/sWybn3v");
+            linkAUDiscord.NavigateUri = new Uri("https://discord.gg/3uS5yYD5jc");
             linksList.ListItems.Add(new ListItem(new Paragraph(linkAUDiscord)));
 
             var linkEUDiscord = new Hyperlink(new Run("EU GOTY Tribes Discord"));
             linkEUDiscord.NavigateUri = new Uri("https://discord.gg/e7T8Pxs");
             linksList.ListItems.Add(new ListItem(new Paragraph(linkEUDiscord)));
 
+            var linkTAServerDiscord = new Hyperlink(new Run("TAServer Discord"));
+            linkTAServerDiscord.NavigateUri = new Uri("https://discordapp.com/invite/8enekHQ");
+            linksList.ListItems.Add(new ListItem(new Paragraph(linkTAServerDiscord)));
+
+            var linkTAServerGithub = new Hyperlink(new Run("TAServer on GitHub"));
+            linkTAServerGithub.NavigateUri = new Uri("https://github.com/Griffon26/taserver/");
+            linksList.ListItems.Add(new ListItem(new Paragraph(linkTAServerGithub)));
+
             var linkReddit = new Hyperlink(new Run("Tribes Subreddit"));
             linkReddit.NavigateUri = new Uri("https://www.reddit.com/r/Tribes/");
             linksList.ListItems.Add(new ListItem(new Paragraph(linkReddit)));
 
+            var linkDDomain = new Hyperlink(new Run("Dodges Site"));
+            linkDDomain.NavigateUri = new Uri("https://www.dodgesdomain.com/");
+            linksList.ListItems.Add(new ListItem(new Paragraph(linkDDomain)));
+
+            var linkWildLive = new Hyperlink(new Run("Wilderzone Live"));
+            linkWildLive.NavigateUri = new Uri("https://wilderzone.live/");
+            linksList.ListItems.Add(new ListItem(new Paragraph(linkWildLive)));
+
             InfoRichTextBox.Document.Blocks.Add(title);
             InfoRichTextBox.Document.Blocks.Add(devPara);
             InfoRichTextBox.Document.Blocks.Add(reportPara);

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyVersion("2.1.0.0")]
+[assembly: AssemblyFileVersion("2.1.0.0")]
diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs
diff --git a/Properties/Settings.Designer.cs b/Properties/Settings.Designer.cs
diff --git a/TribesLauncherSharp.csproj b/TribesLauncherSharp.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>TribesLauncherSharp</RootNamespace>
     <AssemblyName>TribesLauncherSharp</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <WarningLevel>4</WarningLevel>
@@ -57,11 +57,11 @@
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NuGet.Versioning, Version=5.9.0.7134, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\NuGet.Versioning.5.9.0\lib\net45\NuGet.Versioning.dll</HintPath>
+    <Reference Include="NuGet.Versioning, Version=6.1.0.106, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>packages\NuGet.Versioning.6.1.0\lib\net472\NuGet.Versioning.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -80,8 +80,8 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="YamlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
-      <HintPath>packages\YamlDotNet.6.0.0\lib\net45\YamlDotNet.dll</HintPath>
+    <Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
+      <HintPath>packages\YamlDotNet.11.2.1\lib\net45\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/Updater.cs b/Updater.cs
@@ -288,6 +288,11 @@ private void CopyFile(string relativeFilename, string packageRoot, string localR
                 string dir = new FileInfo(copyLocation).Directory.FullName;
                 if (!Directory.Exists(dir)) Directory.CreateDirectory(dir);
 
+                // Read-only more like whatever we damn well want
+                if (File.Exists(copyLocation)) { 
+                    File.SetAttributes(copyLocation, FileAttributes.Normal);
+                }
+
                 // Copy the file
                 File.Copy($"{packageRoot}\\{normalisedRelativeFilename}", copyLocation, true);
             }

diff --git a/packages.config b/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
-  <package id="NuGet.Versioning" version="5.9.0" targetFramework="net45" />
-  <package id="YamlDotNet" version="6.0.0" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
+  <package id="NuGet.Versioning" version="6.1.0" targetFramework="net48" />
+  <package id="YamlDotNet" version="11.2.1" targetFramework="net48" />
 </packages>