Skip to content

Commit 91faa53

Browse files
WumboSpasmWumboSpasm
committed
Update dependencies, remove support for extras
1 parent d8cbd16 commit 91faa53

5 files changed

Lines changed: 49 additions & 64 deletions

File tree

‎FlashpointManager.csproj‎

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -94,16 +94,16 @@
9494
<Reference Include="Costura, Version=5.7.0.0, Culture=neutral, processorArchitecture=MSIL">
9595
<HintPath>packages\Costura.Fody.5.7.0\lib\netstandard1.0\Costura.dll</HintPath>
9696
</Reference>
97-
<Reference Include="Downloader, Version=2.4.1.0, Culture=neutral, PublicKeyToken=844973e732f6cdf4, processorArchitecture=MSIL">
98-
<HintPath>packages\Downloader.2.4.1\lib\net452\Downloader.dll</HintPath>
97+
<Reference Include="Downloader, Version=3.0.1.0, Culture=neutral, PublicKeyToken=844973e732f6cdf4, processorArchitecture=MSIL">
98+
<HintPath>packages\Downloader.3.0.1\lib\net452\Downloader.dll</HintPath>
9999
</Reference>
100100
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
101101
<HintPath>packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
102102
<Private>True</Private>
103103
<Private>True</Private>
104104
</Reference>
105105
<Reference Include="Microsoft.WindowsAPICodePack, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
106-
<HintPath>packages\Microsoft.WindowsAPICodePack-Core.1.1.0.0\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
106+
<HintPath>packages\Microsoft.WindowsAPICodePack-Core.1.1.0.2\lib\Microsoft.WindowsAPICodePack.dll</HintPath>
107107
</Reference>
108108
<Reference Include="Microsoft.WindowsAPICodePack.Shell, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
109109
<HintPath>packages\Microsoft.WindowsAPICodePack-Shell.1.1.0.0\lib\Microsoft.WindowsAPICodePack.Shell.dll</HintPath>
@@ -124,14 +124,14 @@
124124
<HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
125125
</Reference>
126126
<Reference Include="System.ComponentModel.Composition" />
127-
<Reference Include="System.Console, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
128-
<HintPath>packages\System.Console.4.3.0\lib\net46\System.Console.dll</HintPath>
127+
<Reference Include="System.Console, Version=4.0.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
128+
<HintPath>packages\System.Console.4.3.1\lib\net46\System.Console.dll</HintPath>
129129
<Private>True</Private>
130130
<Private>True</Private>
131131
</Reference>
132132
<Reference Include="System.Core" />
133-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
134-
<HintPath>packages\System.Diagnostics.DiagnosticSource.4.3.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
133+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
134+
<HintPath>packages\System.Diagnostics.DiagnosticSource.7.0.0\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
135135
</Reference>
136136
<Reference Include="System.Diagnostics.Tracing, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
137137
<HintPath>packages\System.Diagnostics.Tracing.4.3.0\lib\net462\System.Diagnostics.Tracing.dll</HintPath>
@@ -182,8 +182,8 @@
182182
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
183183
<HintPath>packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
184184
</Reference>
185-
<Reference Include="System.Net.Http, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
186-
<HintPath>packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll</HintPath>
185+
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
186+
<HintPath>packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
187187
<Private>True</Private>
188188
<Private>True</Private>
189189
</Reference>
@@ -201,16 +201,16 @@
201201
<Private>True</Private>
202202
<Private>True</Private>
203203
</Reference>
204-
<Reference Include="System.Runtime, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
205-
<HintPath>packages\System.Runtime.4.3.0\lib\net462\System.Runtime.dll</HintPath>
204+
<Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
205+
<HintPath>packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
206206
<Private>True</Private>
207207
<Private>True</Private>
208208
</Reference>
209209
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
210210
<HintPath>packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
211211
</Reference>
212-
<Reference Include="System.Runtime.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
213-
<HintPath>packages\System.Runtime.Extensions.4.3.0\lib\net462\System.Runtime.Extensions.dll</HintPath>
212+
<Reference Include="System.Runtime.Extensions, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
213+
<HintPath>packages\System.Runtime.Extensions.4.3.1\lib\net462\System.Runtime.Extensions.dll</HintPath>
214214
<Private>True</Private>
215215
<Private>True</Private>
216216
</Reference>
@@ -225,7 +225,7 @@
225225
<Private>True</Private>
226226
</Reference>
227227
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
228-
<HintPath>packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
228+
<HintPath>packages\System.Security.Cryptography.Algorithms.4.3.1\lib\net463\System.Security.Cryptography.Algorithms.dll</HintPath>
229229
<Private>True</Private>
230230
<Private>True</Private>
231231
</Reference>
@@ -239,16 +239,16 @@
239239
<Private>True</Private>
240240
<Private>True</Private>
241241
</Reference>
242-
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
243-
<HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
242+
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
243+
<HintPath>packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
244244
<Private>True</Private>
245245
<Private>True</Private>
246246
</Reference>
247-
<Reference Include="System.Text.Encoding.CodePages, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
248-
<HintPath>packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
247+
<Reference Include="System.Text.Encoding.CodePages, Version=7.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
248+
<HintPath>packages\System.Text.Encoding.CodePages.7.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
249249
</Reference>
250250
<Reference Include="System.Text.RegularExpressions, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
251-
<HintPath>packages\System.Text.RegularExpressions.4.3.0\lib\net463\System.Text.RegularExpressions.dll</HintPath>
251+
<HintPath>packages\System.Text.RegularExpressions.4.3.1\lib\net463\System.Text.RegularExpressions.dll</HintPath>
252252
<Private>True</Private>
253253
<Private>True</Private>
254254
</Reference>
@@ -261,7 +261,7 @@
261261
<Reference Include="System.Windows.Forms" />
262262
<Reference Include="System.Xml" />
263263
<Reference Include="System.Xml.ReaderWriter, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
264-
<HintPath>packages\System.Xml.ReaderWriter.4.3.0\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
264+
<HintPath>packages\System.Xml.ReaderWriter.4.3.1\lib\net46\System.Xml.ReaderWriter.dll</HintPath>
265265
<Private>True</Private>
266266
<Private>True</Private>
267267
</Reference>
@@ -366,14 +366,16 @@
366366
<Content Include="FlashpointManager.ico" />
367367
</ItemGroup>
368368
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
369-
<Import Project="packages\Fody.6.5.5\build\Fody.targets" Condition="Exists('packages\Fody.6.5.5\build\Fody.targets')" />
370369
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
371370
<PropertyGroup>
372371
<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>
373372
</PropertyGroup>
374-
<Error Condition="!Exists('packages\Fody.6.5.5\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.5.5\build\Fody.targets'))" />
375373
<Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.props'))" />
376374
<Error Condition="!Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Costura.Fody.5.7.0\build\Costura.Fody.targets'))" />
375+
<Error Condition="!Exists('packages\Fody.6.6.4\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.6.4\build\Fody.targets'))" />
376+
<Error Condition="!Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
377377
</Target>
378378
<Import Project="packages\Costura.Fody.5.7.0\build\Costura.Fody.targets" Condition="Exists('packages\Costura.Fody.5.7.0\build\Costura.Fody.targets')" />
379+
<Import Project="packages\Fody.6.6.4\build\Fody.targets" Condition="Exists('packages\Fody.6.6.4\build\Fody.targets')" />
380+
<Import Project="packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
379381
</Project>

‎packages.config‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Costura.Fody" version="5.7.0" targetFramework="net472" developmentDependency="true" />
4-
<package id="Downloader" version="2.4.1" targetFramework="net472" />
5-
<package id="Fody" version="6.5.5" targetFramework="net472" developmentDependency="true" />
6-
<package id="Microsoft.NETCore.Platforms" version="1.1.0" targetFramework="net472" />
4+
<package id="Downloader" version="3.0.1" targetFramework="net472" />
5+
<package id="Fody" version="6.6.4" targetFramework="net472" developmentDependency="true" />
6+
<package id="Microsoft.NETCore.Platforms" version="7.0.0" targetFramework="net472" />
77
<package id="Microsoft.Win32.Primitives" version="4.3.0" targetFramework="net472" />
8-
<package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.0" targetFramework="net472" />
8+
<package id="Microsoft.WindowsAPICodePack-Core" version="1.1.0.2" targetFramework="net472" />
99
<package id="Microsoft.WindowsAPICodePack-Shell" version="1.1.0.0" targetFramework="net472" />
10-
<package id="NETStandard.Library" version="1.6.1" targetFramework="net472" />
10+
<package id="NETStandard.Library" version="2.0.3" targetFramework="net472" />
1111
<package id="SharpCompress" version="0.32.2" targetFramework="net472" />
1212
<package id="System.AppContext" version="4.3.0" targetFramework="net472" />
1313
<package id="System.Buffers" version="4.5.1" targetFramework="net472" />
1414
<package id="System.Collections" version="4.3.0" targetFramework="net472" />
1515
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net472" />
16-
<package id="System.Console" version="4.3.0" targetFramework="net472" />
16+
<package id="System.Console" version="4.3.1" targetFramework="net472" />
1717
<package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net472" />
18-
<package id="System.Diagnostics.DiagnosticSource" version="4.3.0" targetFramework="net472" />
18+
<package id="System.Diagnostics.DiagnosticSource" version="7.0.0" targetFramework="net472" />
1919
<package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net472" />
2020
<package id="System.Diagnostics.Tracing" version="4.3.0" targetFramework="net472" />
2121
<package id="System.Globalization" version="4.3.0" targetFramework="net472" />
@@ -28,33 +28,33 @@
2828
<package id="System.Linq" version="4.3.0" targetFramework="net472" />
2929
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net472" />
3030
<package id="System.Memory" version="4.5.5" targetFramework="net472" />
31-
<package id="System.Net.Http" version="4.3.0" targetFramework="net472" />
32-
<package id="System.Net.Primitives" version="4.3.0" targetFramework="net472" />
31+
<package id="System.Net.Http" version="4.3.4" targetFramework="net472" />
32+
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net472" />
3333
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net472" />
3434
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
3535
<package id="System.ObjectModel" version="4.3.0" targetFramework="net472" />
3636
<package id="System.Reflection" version="4.3.0" targetFramework="net472" />
3737
<package id="System.Reflection.Extensions" version="4.3.0" targetFramework="net472" />
3838
<package id="System.Reflection.Primitives" version="4.3.0" targetFramework="net472" />
3939
<package id="System.Resources.ResourceManager" version="4.3.0" targetFramework="net472" />
40-
<package id="System.Runtime" version="4.3.0" targetFramework="net472" />
40+
<package id="System.Runtime" version="4.3.1" targetFramework="net472" />
4141
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
42-
<package id="System.Runtime.Extensions" version="4.3.0" targetFramework="net472" />
42+
<package id="System.Runtime.Extensions" version="4.3.1" targetFramework="net472" />
4343
<package id="System.Runtime.Handles" version="4.3.0" targetFramework="net472" />
4444
<package id="System.Runtime.InteropServices" version="4.3.0" targetFramework="net472" />
4545
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net472" />
4646
<package id="System.Runtime.Numerics" version="4.3.0" targetFramework="net472" />
47-
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net472" />
47+
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net472" />
4848
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
4949
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
50-
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net472" />
50+
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net472" />
5151
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
52-
<package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net472" />
52+
<package id="System.Text.Encoding.CodePages" version="7.0.0" targetFramework="net472" />
5353
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net472" />
54-
<package id="System.Text.RegularExpressions" version="4.3.0" targetFramework="net472" />
54+
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net472" />
5555
<package id="System.Threading" version="4.3.0" targetFramework="net472" />
5656
<package id="System.Threading.Tasks" version="4.3.0" targetFramework="net472" />
5757
<package id="System.Threading.Timer" version="4.3.0" targetFramework="net472" />
58-
<package id="System.Xml.ReaderWriter" version="4.3.0" targetFramework="net472" />
58+
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="net472" />
5959
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="net472" />
6060
</packages>

‎src/Common.cs‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ public class Component : Category
1515
{
1616
public string Hash { get; set; }
1717
public long Size { get; set; }
18-
public string[] Depends { get; set; } = new string[] {};
19-
public bool Extra { get; set; }
18+
public string[] Depends { get; set; } = new string[] { };
2019

2120
public Component(XmlNode node) : base(node)
2221
{
@@ -61,10 +60,6 @@ public Component(XmlNode node) : base(node)
6160
string depends = GetAttribute(node, "depends", false);
6261

6362
if (depends.Length > 0) Depends = depends.Split(' ');
64-
65-
// Extra
66-
67-
Extra = GetAttribute(node, "extra", false) == "true";
6863
}
6964

7065
// Get internet location of component's ZIP archive
@@ -258,7 +253,7 @@ public static TreeNode AddNodeToList(XmlNode child, TreeNodeCollection parent, b
258253

259254
// Initialize checkbox
260255
// (the Checked attribute needs to be explicitly set or else the checkbox won't appear)
261-
listNode.Checked = setCheckState && (child.Name == "component") && !(listNode.Tag as Component).Extra;
256+
listNode.Checked = setCheckState && child.Name == "component";
262257

263258
return listNode;
264259
}
@@ -466,17 +461,17 @@ public static long GetTotalSize(TreeView sourceTree)
466461
// Formats bytes as a human-readable string
467462
public static string GetFormattedBytes(long bytes)
468463
{
469-
if (bytes >= 1000000000000)
464+
if (bytes >= 1000000000)
470465
{
471-
return (Math.Truncate((double)bytes / 100000000000) / 10).ToString("N1") + "TB";
466+
return (Math.Truncate((double)bytes / 100000000) / 10).ToString("N1") + "GB";
472467
}
473-
else if (bytes >= 1000000000)
468+
else if (bytes >= 1000000)
474469
{
475-
return (Math.Truncate((double)bytes / 100000000) / 10).ToString("N1") + "GB";
470+
return (Math.Truncate((double)bytes / 100000) / 10).ToString("N1") + "MB";
476471
}
477472
else
478473
{
479-
return (Math.Truncate((double)bytes / 100000) / 10).ToString("N1") + "MB";
474+
return (Math.Truncate((double)bytes / 100) / 10).ToString("N1") + "KB";
480475
}
481476
}
482477
}

‎src/Forms/MainDownload.cs‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,6 @@ private void DownloadButton_Click(object sender, EventArgs e)
7474

7575
FPM.CheckDependencies(ComponentList);
7676

77-
if (FPM.SizeTracker.ToDownload >= 1000000000000)
78-
{
79-
var terabyteWarning = MessageBox.Show(
80-
"You are about to download OVER A TERABYTE of data. The Complete Offline Archive " +
81-
"component is optional and Flashpoint will work without it. Proceed anyway?",
82-
"Warning", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation
83-
);
84-
85-
if (terabyteWarning == DialogResult.No) return;
86-
}
87-
8877
FPM.OperateMode = 0;
8978

9079
var operationWindow = new Operation();

0 commit comments

Comments
 (0)