Skip to content

Commit 328d189

Browse files
ToddButler93ToddButler93
authored
Merge pull request #4 from ToddButler93/master
Read-only workaround.
2 parents 34feedd + 2b2b8c2 commit 328d189

9 files changed

Lines changed: 41 additions & 25 deletions

‎App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
55
</startup>
66
</configuration>

‎Config.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,6 @@ public bool PromptForUbermenu
299299
}
300300

301301
private static ISerializer serializer = new SerializerBuilder()
302-
.EmitDefaults()
303302
.Build();
304303
private static IDeserializer deserializer = new DeserializerBuilder()
305304
.WithNamingConvention(new PascalCaseNamingConvention())

‎MainWindow.xaml.cs‎

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ private void InitInfoRichTextBox()
459459

460460
var devPara = new Paragraph(new Run("Launcher developed by mcoot"));
461461

462-
var reportPara = new Paragraph(new Run("Please report bugs via Discord (mcoot#7419) or Reddit (/u/avianistheterm)"));
462+
var reportPara = new Paragraph(new Run("Please report bugs via Discord (mcoot#7419)/(Dodge#3156) or Reddit (/u/avianistheterm)"));
463463

464464
var linksPara = new Paragraph(new Run("Information about TAMods and community servers can be found at:"));
465465

@@ -469,26 +469,38 @@ private void InitInfoRichTextBox()
469469
linkTamodsOrg.NavigateUri = new Uri("https://www.tamods.org");
470470
linksList.ListItems.Add(new ListItem(new Paragraph(linkTamodsOrg)));
471471

472-
var linkTAServerGithub = new Hyperlink(new Run("TAServer on GitHub"));
473-
linkTAServerGithub.NavigateUri = new Uri("https://github.com/Griffon26/taserver/");
474-
linksList.ListItems.Add(new ListItem(new Paragraph(linkTAServerGithub)));
475-
476-
var linkTAServerDiscord = new Hyperlink(new Run("TAServer Discord"));
477-
linkTAServerDiscord.NavigateUri = new Uri("https://discordapp.com/invite/8enekHQ");
478-
linksList.ListItems.Add(new ListItem(new Paragraph(linkTAServerDiscord)));
472+
var linkNADiscord = new Hyperlink(new Run("NA Tribes Discord"));
473+
linkNADiscord.NavigateUri = new Uri("https://discord.gg/gyWew2jHBx");
474+
linksList.ListItems.Add(new ListItem(new Paragraph(linkNADiscord)));
479475

480476
var linkAUDiscord = new Hyperlink(new Run("Australian Tribes Discord"));
481-
linkAUDiscord.NavigateUri = new Uri("https://discord.gg/sWybn3v");
477+
linkAUDiscord.NavigateUri = new Uri("https://discord.gg/3uS5yYD5jc");
482478
linksList.ListItems.Add(new ListItem(new Paragraph(linkAUDiscord)));
483479

484480
var linkEUDiscord = new Hyperlink(new Run("EU GOTY Tribes Discord"));
485481
linkEUDiscord.NavigateUri = new Uri("https://discord.gg/e7T8Pxs");
486482
linksList.ListItems.Add(new ListItem(new Paragraph(linkEUDiscord)));
487483

484+
var linkTAServerDiscord = new Hyperlink(new Run("TAServer Discord"));
485+
linkTAServerDiscord.NavigateUri = new Uri("https://discordapp.com/invite/8enekHQ");
486+
linksList.ListItems.Add(new ListItem(new Paragraph(linkTAServerDiscord)));
487+
488+
var linkTAServerGithub = new Hyperlink(new Run("TAServer on GitHub"));
489+
linkTAServerGithub.NavigateUri = new Uri("https://github.com/Griffon26/taserver/");
490+
linksList.ListItems.Add(new ListItem(new Paragraph(linkTAServerGithub)));
491+
488492
var linkReddit = new Hyperlink(new Run("Tribes Subreddit"));
489493
linkReddit.NavigateUri = new Uri("https://www.reddit.com/r/Tribes/");
490494
linksList.ListItems.Add(new ListItem(new Paragraph(linkReddit)));
491495

496+
var linkDDomain = new Hyperlink(new Run("Dodges Site"));
497+
linkDDomain.NavigateUri = new Uri("https://www.dodgesdomain.com/");
498+
linksList.ListItems.Add(new ListItem(new Paragraph(linkDDomain)));
499+
500+
var linkWildLive = new Hyperlink(new Run("Wilderzone Live"));
501+
linkWildLive.NavigateUri = new Uri("https://wilderzone.live/");
502+
linksList.ListItems.Add(new ListItem(new Paragraph(linkWildLive)));
503+
492504
InfoRichTextBox.Document.Blocks.Add(title);
493505
InfoRichTextBox.Document.Blocks.Add(devPara);
494506
InfoRichTextBox.Document.Blocks.Add(reportPara);

‎Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("2.0.0.0")]
55-
[assembly: AssemblyFileVersion("2.0.0.0")]
54+
[assembly: AssemblyVersion("2.1.0.0")]
55+
[assembly: AssemblyFileVersion("2.1.0.0")]

‎Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎TribesLauncherSharp.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>TribesLauncherSharp</RootNamespace>
1010
<AssemblyName>TribesLauncherSharp</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<WarningLevel>4</WarningLevel>
@@ -57,11 +57,11 @@
5757
<ApplicationManifest>app.manifest</ApplicationManifest>
5858
</PropertyGroup>
5959
<ItemGroup>
60-
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
61-
<HintPath>packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
60+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
61+
<HintPath>packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6262
</Reference>
63-
<Reference Include="NuGet.Versioning, Version=5.9.0.7134, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64-
<HintPath>packages\NuGet.Versioning.5.9.0\lib\net45\NuGet.Versioning.dll</HintPath>
63+
<Reference Include="NuGet.Versioning, Version=6.1.0.106, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
64+
<HintPath>packages\NuGet.Versioning.6.1.0\lib\net472\NuGet.Versioning.dll</HintPath>
6565
</Reference>
6666
<Reference Include="System" />
6767
<Reference Include="System.Data" />
@@ -80,8 +80,8 @@
8080
<Reference Include="WindowsBase" />
8181
<Reference Include="PresentationCore" />
8282
<Reference Include="PresentationFramework" />
83-
<Reference Include="YamlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
84-
<HintPath>packages\YamlDotNet.6.0.0\lib\net45\YamlDotNet.dll</HintPath>
83+
<Reference Include="YamlDotNet, Version=11.0.0.0, Culture=neutral, PublicKeyToken=ec19458f3c15af5e, processorArchitecture=MSIL">
84+
<HintPath>packages\YamlDotNet.11.2.1\lib\net45\YamlDotNet.dll</HintPath>
8585
</Reference>
8686
</ItemGroup>
8787
<ItemGroup>

‎Updater.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,11 @@ private void CopyFile(string relativeFilename, string packageRoot, string localR
288288
string dir = new FileInfo(copyLocation).Directory.FullName;
289289
if (!Directory.Exists(dir)) Directory.CreateDirectory(dir);
290290

291+
// Read-only more like whatever we damn well want
292+
if (File.Exists(copyLocation)) {
293+
File.SetAttributes(copyLocation, FileAttributes.Normal);
294+
}
295+
291296
// Copy the file
292297
File.Copy($"{packageRoot}\\{normalisedRelativeFilename}", copyLocation, true);
293298
}

‎packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="net461" />
4-
<package id="NuGet.Versioning" version="5.9.0" targetFramework="net45" />
5-
<package id="YamlDotNet" version="6.0.0" targetFramework="net461" />
3+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net48" />
4+
<package id="NuGet.Versioning" version="6.1.0" targetFramework="net48" />
5+
<package id="YamlDotNet" version="11.2.1" targetFramework="net48" />
66
</packages>

0 commit comments

Comments
 (0)