diff options
Diffstat (limited to 'Histacom2.Engine')
| -rw-r--r-- | Histacom2.Engine/Histacom2.Engine.csproj | 333 | ||||
| -rw-r--r-- | Histacom2.Engine/Properties/AssemblyInfo.cs | 25 | ||||
| -rw-r--r-- | Histacom2.Engine/Properties/Resources.Designer.cs | 2 | ||||
| -rw-r--r-- | Histacom2.Engine/packages.config | 5 |
4 files changed, 21 insertions, 344 deletions
diff --git a/Histacom2.Engine/Histacom2.Engine.csproj b/Histacom2.Engine/Histacom2.Engine.csproj index 4e444ad..19ddfd9 100644 --- a/Histacom2.Engine/Histacom2.Engine.csproj +++ b/Histacom2.Engine/Histacom2.Engine.csproj @@ -1,324 +1,31 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> +<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> + <PropertyGroup> - <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> - <ProjectGuid>{9477B70F-2D32-4E1D-857B-4624A1DEEB1B}</ProjectGuid> - <OutputType>Library</OutputType> - <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>Histacom2.Engine</RootNamespace> - <AssemblyName>Histacom2.Engine</AssemblyName> - <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> - <FileAlignment>512</FileAlignment> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> - <DebugSymbols>true</DebugSymbols> - <DebugType>full</DebugType> - <Optimize>false</Optimize> - <OutputPath>bin\Debug\</OutputPath> - <DefineConstants>DEBUG;TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> - <PlatformTarget>AnyCPU</PlatformTarget> - </PropertyGroup> - <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> - <DebugType>pdbonly</DebugType> - <Optimize>true</Optimize> - <OutputPath>bin\Release\</OutputPath> - <DefineConstants>TRACE</DefineConstants> - <ErrorReport>prompt</ErrorReport> - <WarningLevel>4</WarningLevel> + <TargetFrameworks>net472;netcoreapp3.0</TargetFrameworks> + <UseWindowsForms>true</UseWindowsForms> + <Version>2.0.3.0</Version> + <AssemblyTitle>Histacom2.Engine</AssemblyTitle> + <Copyright>(C) Michael Webb and contributors, 2017-2019</Copyright> </PropertyGroup> + <ItemGroup> - <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> - <HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath> - </Reference> - <Reference Include="System" /> - <Reference Include="System.Core" /> - <Reference Include="System.Drawing" /> - <Reference Include="System.Windows.Forms" /> - <Reference Include="System.Xml.Linq" /> - <Reference Include="System.Data.DataSetExtensions" /> - <Reference Include="Microsoft.CSharp" /> - <Reference Include="System.Data" /> - <Reference Include="System.Net.Http" /> - <Reference Include="System.Xml" /> - <Reference Include="Whoa, Version=1.5.0.0, Culture=neutral, processorArchitecture=MSIL"> - <HintPath>..\packages\Whoa.1.5.0\lib\net45\Whoa.dll</HintPath> - </Reference> + <PackageReference Include="Newtonsoft.Json" Version="12.0.1" /> </ItemGroup> + <ItemGroup> - <Compile Include="BSODCreator.cs" /> - <None Include="packages.config" /> - <None Include="Resources\WinClassic\Window\pjBg6mKP.bin" /> - <Compile Include="DesktopController.cs" /> - <Compile Include="FileDialogBoxManager.cs" /> - <Compile Include="Paintbrush.cs" /> - <Compile Include="SaveSystem.cs" /> - <Compile Include="TaskBarController.cs" /> - <Compile Include="Template\AboutBox98.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Include="Template\AboutBox98.Designer.cs"> - <DependentUpon>AboutBox98.cs</DependentUpon> - </Compile> - <Compile Include="Template\DropDownItem.cs"> + <Compile Update="Template\AboutBox*.cs; + Template\DropDownItem.cs; + Template\Infobox95.cs; + UI\ClassicTextbox.cs; + UI\ClassicDropDown.cs"> <SubType>UserControl</SubType> </Compile> - <Compile Include="Template\DropDownItem.Designer.cs"> - <DependentUpon>DropDownItem.cs</DependentUpon> - </Compile> - <Compile Include="Template\DropDownOverlay.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="Template\DropDownOverlay.Designer.cs"> - <DependentUpon>DropDownOverlay.cs</DependentUpon> - </Compile> - <Compile Include="Template\ResizeOverlay.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="Template\ResizeOverlay.Designer.cs"> - <DependentUpon>ResizeOverlay.cs</DependentUpon> - </Compile> - <Compile Include="Template\Win9XBSOD.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="Template\Win9XBSOD.Designer.cs"> - <DependentUpon>Win9XBSOD.cs</DependentUpon> - </Compile> - <Compile Include="Template\AboutBox95.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Include="Template\AboutBox95.Designer.cs"> - <DependentUpon>AboutBox95.cs</DependentUpon> - </Compile> - <Compile Include="Template\Infobox95.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Include="Template\Infobox95.Designer.cs"> - <DependentUpon>Infobox95.cs</DependentUpon> - </Compile> - <Compile Include="Template\WinClassic.cs"> + + <Compile Update="Template\*Overlay.cs; + Template\Win*.cs"> <SubType>Form</SubType> </Compile> - <Compile Include="Template\WinClassic.Designer.cs"> - <DependentUpon>WinClassic.cs</DependentUpon> - </Compile> - <Compile Include="Template\WinXP.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="Template\WinXP.Designer.cs"> - <DependentUpon>WinXP.cs</DependentUpon> - </Compile> - <Compile Include="Theme.cs" /> - <Compile Include="UI\ClassicButton.cs"> - <SubType>Component</SubType> - </Compile> - <Compile Include="UI\ClassicDropDown.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Include="UI\ClassicDropDown.Designer.cs"> - <DependentUpon>ClassicDropDown.cs</DependentUpon> - </Compile> - <Compile Include="UI\ClassicLabel.cs"> - <SubType>Component</SubType> - </Compile> - <Compile Include="UI\ClassicStartMenuItem.cs"> - <SubType>Component</SubType> - </Compile> - <Compile Include="UI\ClassicTextBox.cs"> - <SubType>UserControl</SubType> - </Compile> - <Compile Include="UI\ClassicTextBox.Designer.cs"> - <DependentUpon>ClassicTextBox.cs</DependentUpon> - </Compile> - <Compile Include="UI\IProgressBar.cs"> - <SubType>Component</SubType> - </Compile> - <Compile Include="WindowManager.cs" /> - <Compile Include="MessageParser.cs" /> - <Compile Include="Properties\AssemblyInfo.cs" /> - <Compile Include="Properties\Resources.Designer.cs"> - <AutoGen>True</AutoGen> - <DesignTime>True</DesignTime> - <DependentUpon>Resources.resx</DependentUpon> - </Compile> - </ItemGroup> - <ItemGroup> - <EmbeddedResource Include="Properties\Resources.resx"> - <Generator>PublicResXFileCodeGenerator</Generator> - <LastGenOutput>Resources.Designer.cs</LastGenOutput> - </EmbeddedResource> - <EmbeddedResource Include="Template\AboutBox98.resx"> - <DependentUpon>AboutBox98.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="Template\DropDownItem.resx"> - <DependentUpon>DropDownItem.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="Template\DropDownOverlay.resx"> - <DependentUpon>DropDownOverlay.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="Template\ResizeOverlay.resx"> - <DependentUpon>ResizeOverlay.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="Template\Win9XBSOD.resx"> - <DependentUpon>Win9XBSOD.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="Template\AboutBox95.resx"> - <DependentUpon>AboutBox95.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="Template\Infobox95.resx"> - <DependentUpon>Infobox95.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="Template\WinClassic.resx"> - <DependentUpon>WinClassic.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="Template\WinXP.resx"> - <DependentUpon>WinXP.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="UI\ClassicDropDown.resx"> - <DependentUpon>ClassicDropDown.cs</DependentUpon> - </EmbeddedResource> - <EmbeddedResource Include="UI\ClassicTextBox.resx"> - <DependentUpon>ClassicTextBox.cs</DependentUpon> - </EmbeddedResource> - </ItemGroup> - <ItemGroup> - <Content Include="Resources\chord.wav" /> - <None Include="Resources\ClassicDropDownButton.png" /> - <Content Include="Resources\Icon128x.ico" /> - <None Include="Resources\WinBadXPStart.wav" /> - <None Include="Resources\WinXPWallpaper.png" /> - <Content Include="Resources\Win95PlusDefaultAstrisk.wav" /> - <Content Include="Resources\Win95PlusDefaultCritStop.wav" /> - <Content Include="Resources\Win95PlusDefaultExclamation.wav" /> - <Content Include="Resources\Win95PlusDefaultProgError.wav" /> - <Content Include="Resources\Win95PlusDefaultQuestion.wav" /> - <Content Include="Resources\Win95PlusDefaultStop.wav" /> - <Content Include="Resources\Win95PlusDefaultWallpaper.jpg" /> - <Content Include="Resources\Win95PlusGoldenEraAstrisk.wav" /> - <Content Include="Resources\Win95PlusGoldenEraCritStop.wav" /> - <Content Include="Resources\Win95PlusGoldenEraExclamation.wav" /> - <Content Include="Resources\Win95PlusGoldenEraProgError.wav" /> - <Content Include="Resources\Win95PlusGoldenEraQuestion.wav" /> - <Content Include="Resources\Win95PlusGoldenEraStart.wav" /> - <Content Include="Resources\Win95PlusGoldenEraStop.wav" /> - <Content Include="Resources\Win95PlusGoldenEraWallpaper.jpg" /> - <Content Include="Resources\Win95PlusInsideComputerCritStop.wav" /> - <Content Include="Resources\Win95PlusInsideComputerExclamation.wav" /> - <Content Include="Resources\Win95PlusInsideComputerProgError.wav" /> - <Content Include="Resources\Win95PlusInsideComputerQuestion.wav" /> - <Content Include="Resources\Win95PlusLeoAsterisk.wav" /> - <Content Include="Resources\Win95PlusLeoCritStop.wav" /> - <Content Include="Resources\Win95PlusLeoExclamation.wav" /> - <Content Include="Resources\Win95PlusLeoProgError.wav" /> - <Content Include="Resources\Win95PlusLeoQuestion.wav" /> - <Content Include="Resources\Win95PlusLeoStart.wav" /> - <Content Include="Resources\Win95PlusLeoWallpaper.jpg" /> - <Content Include="Resources\Win95PlusMoreWin.jpg" /> - <Content Include="Resources\Win95PlusMysteryAstrisk.wav" /> - <Content Include="Resources\Win95PlusMysteryCritStop.wav" /> - <Content Include="Resources\Win95PlusMysteryExclamation.wav" /> - <Content Include="Resources\Win95PlusMysteryProgError.wav" /> - <Content Include="Resources\Win95PlusMysteryQuestion.wav" /> - <Content Include="Resources\Win95PlusMysteryStart.wav" /> - <Content Include="Resources\Win95PlusMysteryStop.wav" /> - <Content Include="Resources\Win95PlusMysteryWallpaper.jpg" /> - <Content Include="Resources\Win95PlusNatureAstrisk.wav" /> - <Content Include="Resources\Win95PlusNatureCritStop.wav" /> - <Content Include="Resources\Win95PlusNatureExclamation.wav" /> - <Content Include="Resources\Win95PlusNatureProgError.wav" /> - <Content Include="Resources\Win95PlusNatureQuestion.wav" /> - <Content Include="Resources\Win95PlusNatureStart.wav" /> - <Content Include="Resources\Win95PlusNatureStop.wav" /> - <Content Include="Resources\Win95PlusNatureWallpaper.jpg" /> - <Content Include="Resources\Win95PlusScienceAsterisk.wav" /> - <Content Include="Resources\Win95PlusScienceCritStop.wav" /> - <Content Include="Resources\Win95PlusScienceExclamation.wav" /> - <Content Include="Resources\Win95PlusScienceProgError.wav" /> - <Content Include="Resources\Win95PlusScienceQuestion.wav" /> - <Content Include="Resources\Win95PlusScienceStart.wav" /> - <Content Include="Resources\Win95PlusScienceStop.wav" /> - <Content Include="Resources\Win95PlusScienceWallpaper.jpg" /> - <Content Include="Resources\Win95PlusSportsAstrisk.wav" /> - <Content Include="Resources\Win95PlusSportsCritStop.wav" /> - <Content Include="Resources\Win95PlusSportsExclamation.wav" /> - <Content Include="Resources\Win95PlusSportsProgError.wav" /> - <Content Include="Resources\Win95PlusSportsQuestion.wav" /> - <Content Include="Resources\Win95PlusSportsStart.wav" /> - <Content Include="Resources\Win95PlusSportsStop.wav" /> - <Content Include="Resources\Win95PlusSportsWallpaper.jpg" /> - <Content Include="Resources\Win95PlusThe60Asterisk.wav" /> - <Content Include="Resources\Win95PlusThe60CritStop.wav" /> - <Content Include="Resources\Win95PlusThe60Exclamation.wav" /> - <Content Include="Resources\Win95PlusThe60ProgError.wav" /> - <Content Include="Resources\Win95PlusThe60Question.wav" /> - <Content Include="Resources\Win95PlusThe60Start.wav" /> - <Content Include="Resources\Win95PlusThe60Stop.wav" /> - <Content Include="Resources\Win95PlusThe60Wallpaper.jpg" /> - <Content Include="Resources\Win95PlusTravelAsterisk.wav" /> - <Content Include="Resources\Win95PlusTravelCritStop.wav" /> - <Content Include="Resources\Win95PlusTravelExclamation.wav" /> - <Content Include="Resources\Win95PlusTravelProgError.wav" /> - <Content Include="Resources\Win95PlusTravelQuestion.wav" /> - <Content Include="Resources\Win95PlusTravelStart.wav" /> - <Content Include="Resources\Win95PlusTravelStop.wav" /> - <Content Include="Resources\Win95PlusTravelWallpaper.jpg" /> - <None Include="Resources\WinXPShutdown.wav" /> - <Content Include="Resources\WinXP\Window\WinXP_Bottom.png" /> - <Content Include="Resources\WinXP\Window\WinXP_Close.png" /> - <None Include="Resources\WinXP\Window\WinXP_CloseHover.png" /> - <None Include="Resources\WinXP\Window\WinXP_ClosePress.png" /> - <Content Include="Resources\WinXP\Window\WinXP_LBCorner.png" /> - <Content Include="Resources\WinXP\Window\WinXP_LeftSide.png" /> - <Content Include="Resources\WinXP\Window\WinXP_Max.png" /> - <Content Include="Resources\WinXP\Window\WinXP_Min.png" /> - <Content Include="Resources\WinXP\Window\WinXP_RBCorner.png" /> - <Content Include="Resources\WinXP\Window\WinXP_Restore.png" /> - <Content Include="Resources\WinXP\Window\WinXP_RightSide.png" /> - <Content Include="Resources\WinXP\Window\WinXP_TLCorner.png" /> - <Content Include="Resources\WinXP\Window\WinXP_TopBar.png" /> - <Content Include="Resources\WinXP\Window\WinXP_TRCorner.png" /> - <None Include="Resources\WinAboutSeparator95.png" /> - <None Include="Resources\Win95PlusDangerousCreaturesStart.WAV" /> - <None Include="Resources\Win95Start.wav" /> - <None Include="Resources\Win95Stop.wav" /> - <None Include="Resources\Win98Start.wav" /> - <None Include="Resources\Win98Stop.WAV" /> - <None Include="Resources\Win95PlusDangerousCreaturesWallpaper.JPG" /> - <None Include="Resources\Win95PlusInsideComputerWallpaper.jpg" /> - <None Include="Resources\Win95PlusInsideComputerStop.wav" /> - <None Include="Resources\Win95PlusInsideComputerStart.wav" /> - <None Include="Resources\Win95PlusDangerousCreaturesAsterisk.wav" /> - <None Include="Resources\Win95PlusDangerousCreaturesCritStop.wav" /> - <None Include="Resources\Win95PlusDangerousCreaturesExclamation.wav" /> - <None Include="Resources\Win95PlusDangerousCreaturesProgError.wav" /> - <None Include="Resources\Win95PlusDangerousCreaturesQuestion.wav" /> - <None Include="Resources\Win95PlusInsideComputerAsterisk.wav" /> - <Content Include="Resources\WinClassic\Window\BottomLeft.png" /> - <Content Include="Resources\WinClassic\Window\BottomRight.png" /> - <Content Include="Resources\WinClassic\Window\BottomSide.png" /> - <Content Include="Resources\WinClassic\Window\LeftSide.png" /> - <Content Include="Resources\WinClassic\Window\nullIcon.png" /> - <Content Include="Resources\WinClassic\Window\RightSide.png" /> - <Content Include="Resources\WinClassic\Window\TopLeft.png" /> - <Content Include="Resources\WinClassic\Window\TopRight.png" /> - <Content Include="Resources\WinClassic\Window\TopSide.png" /> - <None Include="Resources\WinClassic\Window\Win95Info.png" /> - <None Include="Resources\WinClassic\Window\Win95Warning.png" /> - <None Include="Resources\WinClassic\Window\Win95Error.png" /> - <None Include="Resources\WinClassic\Window\Win95Question.png" /> - <Content Include="Resources\WinClassic\Window\WinClassicClose.png" /> - <Content Include="Resources\WinClassic\Window\WinClassicMax.png" /> - <Content Include="Resources\WinClassic\Window\WinClassicMin.png" /> - <Content Include="Resources\WinClassic\Window\WinClassicRestore.png" /> - <Content Include="Resources\WinClassic\Window\WinClassicWarning.png" /> - <None Include="Resources\WinClassic\Window\windows_command_prompt.ttf" /> - </ItemGroup> - <ItemGroup> - <None Include="Resources\WinClassic\Window\LeviWindows.ttf" /> + </ItemGroup> - <ItemGroup /> - <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + </Project>
\ 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" /> - <package id="Whoa" version="1.5.0" targetFramework="net452" /> -</packages>
\ No newline at end of file |