From a0bf405dfa29992c7b0ab41c86f30bcc6879560b Mon Sep 17 00:00:00 2001 From: Eric Vasquez Date: Tue, 8 Oct 2024 10:57:26 -0500 Subject: [PATCH 1/3] Display Version Fix - Fixed the About Page Version to match the current version. - Changed from Major.Minor.Build to Major.Minor.Build.Revision --- .../Presenters/Implementation/MainFormPresenter.cs | 2 +- src/Eve-O-Preview/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs b/src/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs index 9996e09..edd7806 100644 --- a/src/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs +++ b/src/Eve-O-Preview/Presenters/Implementation/MainFormPresenter.cs @@ -233,7 +233,7 @@ namespace EveOPreview.Presenters private string GetApplicationVersion() { Version version = System.Reflection.Assembly.GetEntryAssembly().GetName().Version; - return $"{version.Major}.{version.Minor}.{version.Build}"; + return $"{version.Major}.{version.Minor}.{version.Build}.{version.Revision}"; } private void ExitApplication() diff --git a/src/Eve-O-Preview/Properties/AssemblyInfo.cs b/src/Eve-O-Preview/Properties/AssemblyInfo.cs index 7a0d2da..c84e05e 100644 --- a/src/Eve-O-Preview/Properties/AssemblyInfo.cs +++ b/src/Eve-O-Preview/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("04f08f8d-9e98-423b-acdb-4effb31c0d35")] -[assembly: AssemblyVersion("6.0.1.3")] -[assembly: AssemblyFileVersion("6.0.1.3")] +[assembly: AssemblyVersion("6.0.2.0")] +[assembly: AssemblyFileVersion("6.0.2.0")] [assembly: CLSCompliant(false)] \ No newline at end of file From 1a13542b1183f6663bbdeff01a13565e3a62d665 Mon Sep 17 00:00:00 2001 From: Eric Vasquez Date: Tue, 8 Oct 2024 13:11:54 -0500 Subject: [PATCH 2/3] Upgrade from .netfamework31 to .net8 and Framework 4.8 --- src/Eve-O-Preview/Properties/AssemblyInfo.cs | 4 ++-- src/Eve-O-Preview/app.config | 2 +- src/Eve-O-Preview/app.manifest | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Eve-O-Preview/Properties/AssemblyInfo.cs b/src/Eve-O-Preview/Properties/AssemblyInfo.cs index c84e05e..51a6bdd 100644 --- a/src/Eve-O-Preview/Properties/AssemblyInfo.cs +++ b/src/Eve-O-Preview/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] [assembly: Guid("04f08f8d-9e98-423b-acdb-4effb31c0d35")] -[assembly: AssemblyVersion("6.0.2.0")] -[assembly: AssemblyFileVersion("6.0.2.0")] +[assembly: AssemblyVersion("8.0.0.0")] +[assembly: AssemblyFileVersion("8.0.0.0")] [assembly: CLSCompliant(false)] \ No newline at end of file diff --git a/src/Eve-O-Preview/app.config b/src/Eve-O-Preview/app.config index e6ca62e..2c0f559 100644 --- a/src/Eve-O-Preview/app.config +++ b/src/Eve-O-Preview/app.config @@ -1,3 +1,3 @@ - + diff --git a/src/Eve-O-Preview/app.manifest b/src/Eve-O-Preview/app.manifest index cc914b0..d66dad1 100644 --- a/src/Eve-O-Preview/app.manifest +++ b/src/Eve-O-Preview/app.manifest @@ -39,7 +39,7 @@ - + From 8b85ac4315cef9f500d784e4d41c98fc36aa0ab0 Mon Sep 17 00:00:00 2001 From: Eric Vasquez Date: Tue, 8 Oct 2024 13:47:38 -0500 Subject: [PATCH 3/3] Updated .net80 and famework to 4.8 - Added in .gitignore to ignore the .vs folders in ALL subfolders - Upgraded from 4.6.2 to 4.8 framework for .NET Core - Upgraded from netfamework31 to net80 for .net 8.0 and Framework 4.8 - Changed the EXE File name from EVE-O Preview.exe to EVE-O-Preview.exe --- .gitignore | 1 + build/Build.csproj | 6 +++--- src/Eve-O-Preview/Eve-O-Preview.csproj | 29 +++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6358574..69e168f 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ src/.vs/ *.user *.DotSettings build/Fody* +*.vs/ diff --git a/build/Build.csproj b/build/Build.csproj index 9149f8d..2672b77 100644 --- a/build/Build.csproj +++ b/build/Build.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + net8.0 true @@ -25,8 +25,8 @@ - - + + diff --git a/src/Eve-O-Preview/Eve-O-Preview.csproj b/src/Eve-O-Preview/Eve-O-Preview.csproj index 40e61b1..fa051a9 100644 --- a/src/Eve-O-Preview/Eve-O-Preview.csproj +++ b/src/Eve-O-Preview/Eve-O-Preview.csproj @@ -9,11 +9,26 @@ WinExe Properties EveOPreview - EVE-O Preview + EVE-O-Preview v4.6.2 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -248,6 +263,18 @@ 4.5.0 + + + False + Microsoft .NET Framework 4.6.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + +