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/Histacom2.csproj | 1008 +------------------------------------------- 1 file changed, 10 insertions(+), 998 deletions(-) (limited to 'Histacom2/Histacom2.csproj') diff --git a/Histacom2/Histacom2.csproj b/Histacom2/Histacom2.csproj index 22efe4a..c7dc951 100644 --- a/Histacom2/Histacom2.csproj +++ b/Histacom2/Histacom2.csproj @@ -1,1006 +1,18 @@ - - - + + - Debug - AnyCPU - {B958AA5F-8AED-456C-9C07-9E4C6C027042} WinExe - Properties - Histacom2 - Histacom2 - v4.5.2 - 512 - true - false - C:\Users\lempamo\Desktop\ - true - Disk - false - Foreground - 7 - Days - false - false - false - en - Histacom 2.0 - AJL Games - publish.htm - false - 0 - 2.1.0.0 - true - true - true - false + netcoreapp3.0 + true - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - DEBUG;TRACE - prompt - 4 - - - Histacom2.Program - - - true - bin\x86\Debug\ - DEBUG;TRACE - full - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - bin\x86\Release\ - TRACE - true - pdbonly - x86 - prompt - MinimumRecommendedRules.ruleset - true - - - 1194F9D110CE37E287D2AAE10D81371AB88D31B2 - - - - - - - true - - - false - - - Resources\HistacomIcon.ico - - - false - - - - - - - true - - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - False - ..\PinkieControls.dll - - - - - - - - - - - - - - - - Form - - - AchievementScreen.cs - - - Form - - - AchievementBox.cs - - - UserControl - - - CompletePane.cs - - - UserControl - - - ProgressPane.cs - - - UserControl - - - EULAPane.cs - - - UserControl - - - DirectoryPane.cs - - - UserControl - - - WelcomePane.cs - - - UserControl - - - WinClassicInstaller.cs - - - UserControl - - - SurviveTheDay.cs - - - UserControl - - - ErrorBlaster95.cs - - - UserControl - - - StartRunner95.cs - - - UserControl - - - GuessTheNumber.cs - - - UserControl - - - 12padams1998.cs - - - UserControl - - - GoogleHome.cs - - - UserControl - - - GooglePrototype.cs - - - UserControl - - - IENoPage.cs - - - UserControl - - - IE3Start.cs - - - UserControl - - - CustomMinefield.cs - - - - UserControl - - - MineBestTimes.cs - - - - - - UserControl - - - WinClassicIE3.cs - - - UserControl - - - Win95Installer.cs - - - UserControl - - - WinClassicCalculator.cs - - - UserControl - - - WinClassicFTPClient.cs - - - UserControl - - - WinClassicMinesweeper.cs - - - UserControl - - - WinClassicTerminal.cs - - - UserControl - - - WinClassicThemePanel.cs - - - UserControl - - - Win95Welcome.cs - - - UserControl - - - Win95WindowsExplorer.cs - - - UserControl - - - WinClassicTimeDistorter.cs - - - Form - - - Win98.cs - - - UserControl - - - 12padams1999.cs - - - UserControl - - - IE4HomePage.cs - - - UserControl - - - IENoPage.cs - - - - UserControl - - - WebChat1999.cs - - - UserControl - - - Win98Welcome.cs - - - UserControl - - - WinClassicIE4.cs - - - UserControl - - - WinClassicTimeDistorter2.cs - - - UserControl - - - WinClassicWindowsExplorer.cs - - - Form - - - WinME.cs - - - - Form - - - VirusLabel.cs - - - UserControl - - - WinClassicIE6Bad.cs - - - UserControl - - - WinClassicTimeDistorter3Bad.cs - - - Form - - - WinXPBad.cs - - - True - True - Resources.resx - - - Form - - - LoadGameDialog.cs - - - UserControl - - - LoadGameProfileItem.cs - - - Form - - - NewGameDialog.cs - - - Form - - - Win95.cs - - - UserControl - - - FRMWinClassicAddressBookNewContact.cs - - - UserControl - - - WebChat1998.cs - - - UserControl - - - FRMWinClassicAddressBookNewFolder.cs - - - UserControl - - - WinClassicAddressBook.cs - - - UserControl - - - WinClassicDownloader.cs - - - UserControl - - - WinClassicNotepad.cs - - - UserControl - - - WinClassicWordPad.cs - - - UserControl - - - Win95TaskBarItem.cs - - - - - Form - - - SaveFileTroubleShooter.cs - - - UserControl - - - SeizureWarning.cs - - - Form - - - TitleScreen.cs - - - AchievementScreen.cs - - - AchievementBox.cs - - - CompletePane.cs - - - ProgressPane.cs - - - EULAPane.cs - - - DirectoryPane.cs - - - WelcomePane.cs - - - WinClassicInstaller.cs - - - SurviveTheDay.cs - - - ErrorBlaster95.cs - - - StartRunner95.cs - - - GuessTheNumber.cs - - - 12padams1998.cs - - - GoogleHome.cs - - - GooglePrototype.cs - - - IENoPage.cs - Designer - - - IE3Start.cs - - - CustomMinefield.cs - - - MineBestTimes.cs - - - WinClassicIE3.cs - - - Win95Installer.cs - - - WinClassicCalculator.cs - - - WinClassicFTPClient.cs - - - WinClassicMinesweeper.cs - - - WinClassicTerminal.cs - - - WinClassicThemePanel.cs - - - WinClassicTimeDistorter.cs - - - Win95Welcome.cs - - - Win95WindowsExplorer.cs - Designer - - - Win98.cs - Designer - - - 12padams1999.cs - - - IE4HomePage.cs - - - IENoPage.cs - Designer - - - WebChat1999.cs - - - Win98Welcome.cs - - - WinClassicIE4.cs - - - WinClassicTimeDistorter2.cs - - - WinClassicWindowsExplorer.cs - Designer - - - WinME.cs - Designer - - - VirusLabel.cs - - - WinClassicIE6Bad.cs - - - WinClassicTimeDistorter3Bad.cs - - - WinXPBad.cs - Designer - - - LoadGameDialog.cs - - - LoadGameProfileItem.cs - - - NewGameDialog.cs - - - Win95.cs - Designer - - - FRMWinClassicAddressBookNewContact.cs - - - WebChat1998.cs - Designer - - - FRMWinClassicAddressBookNewFolder.cs - - - WinClassicAddressBook.cs - - - WinClassicDownloader.cs - - - WinClassicNotepad.cs - - - WinClassicWordPad.cs - - - Win95TaskBarItem.cs - - - PublicResXFileCodeGenerator - Designer - Resources1.Designer.cs - - - SaveFileTroubleShooter.cs - - - SeizureWarning.cs - - - TitleScreen.cs - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - - - False - Microsoft .NET Framework 4.5.2 %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - {9477b70f-2d32-4e1d-857b-4624a1deeb1b} - Histacom2.Engine - + + - - - - - + + ..\PinkieControls.dll + - - \ 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/Histacom2.csproj') 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