From 22a2886bed21e86774a8e96f567b1f9acf918a4c Mon Sep 17 00:00:00 2001 From: John Tur Date: Mon, 8 Apr 2019 18:22:18 -0400 Subject: Port to .NET Core --- Histacom2.Engine/Histacom2.Engine.csproj | 321 +--------------------- Histacom2.Engine/Properties/AssemblyInfo.cs | 25 -- Histacom2.Engine/Properties/Resources.Designer.cs | 2 +- Histacom2.Engine/packages.config | 5 - 4 files changed, 13 insertions(+), 340 deletions(-) delete mode 100644 Histacom2.Engine/packages.config (limited to 'Histacom2.Engine') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index 4e444ad..a3e9d22 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -1,324 +1,27 @@ - - - + + - Debug - AnyCPU - {9477B70F-2D32-4E1D-857B-4624A1DEEB1B} - Library - Properties - Histacom2.Engine - Histacom2.Engine - v4.5.2 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - AnyCPU - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + netcoreapp3.0 + true + - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - ..\packages\Whoa.1.5.0\lib\net45\Whoa.dll - + + - - - - - - - - - - UserControl - - - AboutBox98.cs - - - UserControl - - - DropDownItem.cs - - - Form - - - DropDownOverlay.cs - - - Form - - - ResizeOverlay.cs - - - Form - - - Win9XBSOD.cs - - - UserControl - - - AboutBox95.cs - - - UserControl - - - Infobox95.cs - - - Form - - - WinClassic.cs - - - Form - - - WinXP.cs - - - - Component - - - UserControl - - - ClassicDropDown.cs - - - Component - - - Component - - - UserControl - - - ClassicTextBox.cs - - - Component - - - - - - True + True + True Resources.resx + - + PublicResXFileCodeGenerator Resources.Designer.cs - - AboutBox98.cs - - - DropDownItem.cs - - - DropDownOverlay.cs - - - ResizeOverlay.cs - - - Win9XBSOD.cs - - - AboutBox95.cs - - - Infobox95.cs - - - WinClassic.cs - - - WinXP.cs - - - ClassicDropDown.cs - - - ClassicTextBox.cs - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/Histacom2.Engine/Properties/AssemblyInfo.cs b/Histacom2.Engine/Properties/AssemblyInfo.cs index 1ffcdd7..776c7d2 100644 --- a/Histacom2.Engine/Properties/AssemblyInfo.cs +++ b/Histacom2.Engine/Properties/AssemblyInfo.cs @@ -2,18 +2,6 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("Histacom2.Engine")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Histacom2.Engine")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. @@ -21,16 +9,3 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("9477b70f-2d32-4e1d-857b-4624a1deeb1b")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// 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("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/Histacom2.Engine/Properties/Resources.Designer.cs b/Histacom2.Engine/Properties/Resources.Designer.cs index 4815e0b..47e7265 100644 --- a/Histacom2.Engine/Properties/Resources.Designer.cs +++ b/Histacom2.Engine/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Histacom2.Engine.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { diff --git a/Histacom2.Engine/packages.config b/Histacom2.Engine/packages.config deleted file mode 100644 index de52fcd..0000000 --- a/Histacom2.Engine/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file -- cgit v1.2.3 From 86fc6b56d9285975d915646bb3f01b5c4c131caa Mon Sep 17 00:00:00 2001 From: John Tur Date: Mon, 8 Apr 2019 20:09:47 -0400 Subject: Added designer support --- Histacom2.Engine/Histacom2.Engine.csproj | 26 ++++++++------ Histacom2/Histacom2.csproj | 40 +++++++++++++++++++++- Histacom2/OS/Win95/Windows95TaskbarItem.cs | 4 --- .../Win98Apps/WinClassicTimeDistorter2.Designer.cs | 2 +- Histacom2/TitleScreen.cs | 2 +- 5 files changed, 56 insertions(+), 18 deletions(-) (limited to 'Histacom2.Engine') diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index a3e9d22..19ddfd9 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -1,8 +1,11 @@  - netcoreapp3.0 + net472;netcoreapp3.0 true + 2.0.3.0 + Histacom2.Engine + (C) Michael Webb and contributors, 2017-2019 @@ -10,18 +13,19 @@ - - True - True - Resources.resx + + UserControl + + + + Form - - - - PublicResXFileCodeGenerator - Resources.Designer.cs - \ No newline at end of file diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index c7dc951..3744483 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -2,8 +2,11 @@ WinExe - netcoreapp3.0 + net472;netcoreapp3.0 true + 2.0.3.0 + Histacom2.Engine + (C) Michael Webb and contributors, 2017-2019 @@ -15,4 +18,39 @@ ..\PinkieControls.dll + + + + Form + + + + + UserControl + + \ No newline at end of file diff --git a/Histacom2/OS/Win95/Windows95TaskbarItem.cs b/Histacom2/OS/Win95/Windows95TaskbarItem.cs index f5e277d..2ba341f 100644 --- a/Histacom2/OS/Win95/Windows95TaskbarItem.cs +++ b/Histacom2/OS/Win95/Windows95TaskbarItem.cs @@ -1,10 +1,6 @@ using Histacom2.Engine; using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; using System.Drawing; -using System.Text; using System.Windows.Forms; namespace Histacom2.OS.Win95 diff --git a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs index 9db9785..413024e 100644 --- a/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs +++ b/Histacom2/OS/Win98/Win98Apps/WinClassicTimeDistorter2.Designer.cs @@ -123,4 +123,4 @@ private System.Windows.Forms.Timer timer1; public Engine.UI.ClassicLabel classicLabel2; } -} +} \ No newline at end of file diff --git a/Histacom2/TitleScreen.cs b/Histacom2/TitleScreen.cs index 3829d1f..dd1d0a3 100644 --- a/Histacom2/TitleScreen.cs +++ b/Histacom2/TitleScreen.cs @@ -209,7 +209,7 @@ namespace Histacom2 #endregion private void gameversion_MouseHover(object sender, EventArgs e) { - gameversion.Text = "There are no easter eggs here!"; + gameversion.Text = $"Running on {Assembly.GetEntryAssembly().GetCustomAttribute().FrameworkName}"; } private void gameversion_MouseLeave(object sender, EventArgs e) { -- cgit v1.2.3