Skip to content

Commit

Permalink
added skip version option for updater
Browse files Browse the repository at this point in the history
  • Loading branch information
Aytackydln committed Dec 10, 2022
1 parent f0b0bd1 commit fc087a3
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 90 deletions.
2 changes: 1 addition & 1 deletion Project-Aurora/Aurora-Updater/Aurora-Updater.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
<Version>2.0.1</Version>
</PackageReference>
<PackageReference Include="SemanticVersioning">
<Version>1.3.0</Version>
<Version>2.0.2</Version>
</PackageReference>
</ItemGroup>

Expand Down
11 changes: 10 additions & 1 deletion Project-Aurora/Aurora-Updater/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
using System.Windows.Forms;
using System.Linq;
using System.Reflection;
using Version = SemVer.Version;
using SemanticVersioning;
using Version = SemanticVersioning.Version;

namespace Aurora_Updater
{
Expand Down Expand Up @@ -116,6 +117,14 @@ static void Main(string[] args)
else
{
Version latestV = new Version(StaticStorage.Manager.LatestRelease.TagName.TrimStart('v') + ".0.0", true);
if (File.Exists("skipversion.txt"))
{
var skippedVersion = Version.Parse(File.ReadAllText("skipversion.txt"), true);
if (skippedVersion >= latestV)
{
return;
}
}

if (latestV > versionMajor)
{
Expand Down
79 changes: 53 additions & 26 deletions Project-Aurora/Aurora-Updater/UpdateInfoForm.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Project-Aurora/Aurora-Updater/UpdateInfoForm.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System;
using System.IO;
using System.Windows.Forms;

namespace Aurora_Updater
Expand Down Expand Up @@ -70,5 +71,12 @@ static string SizeSuffix(Int64 value, int decimalPlaces = 1)
adjustedSize,
SizeSuffixes[mag]);
}

private void skipButton_Click(object sender, EventArgs e)
{
File.WriteAllText("skipversion.txt", updateVersion);
this.DialogResult = DialogResult.Cancel;
this.Close();
}
}
}
62 changes: 1 addition & 61 deletions Project-Aurora/Aurora-Updater/UpdateInfoForm.resx
Original file line number Diff line number Diff line change
@@ -1,64 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<root>
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
Expand Down
3 changes: 2 additions & 1 deletion Project-Aurora/Aurora-Updater/UpdateManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
using System.Net;
using System.Windows.Forms;
using Octokit;
using Version = SemVer.Version;

using Version = SemanticVersioning.Version;

namespace Aurora_Updater
{
Expand Down

0 comments on commit fc087a3

Please sign in to comment.