aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md5
-rw-r--r--ShiftOS/ShiftOS/Properties/AssemblyInfo.cs25
-rw-r--r--ShiftOS/ShiftOS/ShiftOS.csproj162
-rw-r--r--ShiftOS/ShiftOS/packages.config5
4 files changed, 57 insertions, 140 deletions
diff --git a/README.md b/README.md
index 4dd71c3..626137f 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,5 @@
-# shiftos-challenge
+# shiftos-challenge-netcore
+
Can I rewrite ShiftOS in under a week?
+
+# Ported to .NET Core 3.0 by Alee and originally developed by Alkaline Thunder. \ No newline at end of file
diff --git a/ShiftOS/ShiftOS/Properties/AssemblyInfo.cs b/ShiftOS/ShiftOS/Properties/AssemblyInfo.cs
index 2dea309..33b9cf0 100644
--- a/ShiftOS/ShiftOS/Properties/AssemblyInfo.cs
+++ b/ShiftOS/ShiftOS/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("WindowsFormsApp1")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WindowsFormsApp1")]
-[assembly: AssemblyCopyright("Copyright © 2018")]
-[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("18e84df0-695c-4d78-be74-0d2c203469a6")]
-
-// 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/ShiftOS/ShiftOS/ShiftOS.csproj b/ShiftOS/ShiftOS/ShiftOS.csproj
index 8f9265d..eeeabae 100644
--- a/ShiftOS/ShiftOS/ShiftOS.csproj
+++ b/ShiftOS/ShiftOS/ShiftOS.csproj
@@ -1,217 +1,157 @@
-<?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>{18E84DF0-695C-4D78-BE74-0D2C203469A6}</ProjectGuid>
<OutputType>Exe</OutputType>
- <RootNamespace>ShiftOS</RootNamespace>
- <AssemblyName>ShiftOS</AssemblyName>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
+ <TargetFrameworks>netcoreapp3.0;net461</TargetFrameworks>
+ <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+ <UseWindowsForms>true</UseWindowsForms>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
- <Deterministic>true</Deterministic>
+ <AssemblyTitle>WindowsFormsApp1</AssemblyTitle>
+ <Product>WindowsFormsApp1</Product>
+ <Copyright>Copyright © 2018</Copyright>
+ <OutputPath>bin\$(Configuration)\</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
- <Reference Include="DocoptNet, Version=0.0.0.0, Culture=neutral, PublicKeyToken=7a38c71da49a547e, processorArchitecture=MSIL">
- <HintPath>..\packages\docopt.net.0.6.1.10\lib\net40\DocoptNet.dll</HintPath>
- </Reference>
- <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- <Reference Include="System.Core" />
- <Reference Include="System.Xml.Linq" />
- <Reference Include="System.Data.DataSetExtensions" />
- <Reference Include="Microsoft.CSharp" />
- <Reference Include="System.Data" />
- <Reference Include="System.Deployment" />
- <Reference Include="System.Drawing" />
- <Reference Include="System.Net.Http" />
- <Reference Include="System.Windows.Forms" />
- <Reference Include="System.Xml" />
+ <Compile Include ="..\ShiftOS\**\*.cs" />
</ItemGroup>
<ItemGroup>
- <Compile Include="Commands\Cheat.cs" />
- <Compile Include="Commands\Clear.cs" />
- <Compile Include="Commands\Clock.cs" />
- <Compile Include="Commands\Codepoints.cs" />
- <Compile Include="Commands\Help.cs" />
- <Compile Include="Commands\IConsoleContext.cs" />
- <Compile Include="Commands\Minimize.cs" />
- <Compile Include="Commands\Move.cs" />
- <Compile Include="Commands\Open.cs" />
- <Compile Include="Commands\Set.cs" />
- <Compile Include="Commands\Shutdown.cs" />
- <Compile Include="Commands\TerminalCommand.cs" />
- <Compile Include="Desktop.cs">
+ <Compile Update="Desktop.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Desktop.Designer.cs">
+ <Compile Update="Desktop.Designer.cs">
<DependentUpon>Desktop.cs</DependentUpon>
</Compile>
- <Compile Include="FilesystemContext.cs" />
- <Compile Include="Metadata\AppLauncherRequirementAttribute.cs" />
- <Compile Include="Metadata\ProgramAttribute.cs" />
- <Compile Include="Metadata\RequiresAttribute.cs" />
- <Compile Include="PanelButton.cs">
+ <Compile Update="PanelButton.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Include="PanelButton.Designer.cs">
+ <Compile Update="PanelButton.Designer.cs">
<DependentUpon>PanelButton.cs</DependentUpon>
</Compile>
- <Compile Include="Program.cs" />
- <Compile Include="Programs\Clock.cs">
+ <Compile Update="Programs\Clock.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\Clock.Designer.cs">
+ <Compile Update="Programs\Clock.Designer.cs">
<DependentUpon>Clock.cs</DependentUpon>
</Compile>
- <Compile Include="Programs\ColorPicker.cs">
+ <Compile Update="Programs\ColorPicker.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\ColorPicker.Designer.cs">
+ <Compile Update="Programs\ColorPicker.Designer.cs">
<DependentUpon>ColorPicker.cs</DependentUpon>
</Compile>
- <Compile Include="Programs\FileSkimmer.cs">
+ <Compile Update="Programs\FileSkimmer.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\FileSkimmer.Designer.cs">
+ <Compile Update="Programs\FileSkimmer.Designer.cs">
<DependentUpon>FileSkimmer.cs</DependentUpon>
</Compile>
- <Compile Include="Programs\GraphicPicker.cs">
+ <Compile Update="Programs\GraphicPicker.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\GraphicPicker.Designer.cs">
+ <Compile Update="Programs\GraphicPicker.Designer.cs">
<DependentUpon>GraphicPicker.cs</DependentUpon>
</Compile>
- <Compile Include="Programs\Infobox.cs">
+ <Compile Update="Programs\Infobox.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\Infobox.Designer.cs">
+ <Compile Update="Programs\Infobox.Designer.cs">
<DependentUpon>Infobox.cs</DependentUpon>
</Compile>
- <Compile Include="Programs\Shifter.cs">
+ <Compile Update="Programs\Shifter.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\Shifter.Designer.cs">
+ <Compile Update="Programs\Shifter.Designer.cs">
<DependentUpon>Shifter.cs</DependentUpon>
</Compile>
- <Compile Include="Programs\Shiftorium.cs">
+ <Compile Update="Programs\Shiftorium.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\Shiftorium.Designer.cs">
+ <Compile Update="Programs\Shiftorium.Designer.cs">
<DependentUpon>Shiftorium.cs</DependentUpon>
</Compile>
- <Compile Include="Programs\Terminal.cs">
+ <Compile Update="Programs\Terminal.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\Terminal.Designer.cs">
+ <Compile Update="Programs\Terminal.Designer.cs">
<DependentUpon>Terminal.cs</DependentUpon>
</Compile>
- <Compile Include="Programs\TextPad.cs">
+ <Compile Update="Programs\TextPad.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Programs\TextPad.Designer.cs">
+ <Compile Update="Programs\TextPad.Designer.cs">
<DependentUpon>TextPad.cs</DependentUpon>
</Compile>
- <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
+ <Compile Update="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
- <Compile Include="Skin.cs" />
- <Compile Include="SkinContext.cs" />
- <Compile Include="SystemContext.cs" />
- <Compile Include="ToolStripSkinRenderer.cs" />
- <Compile Include="UnrealObjectExtensions.cs" />
- <Compile Include="Upgrade.cs" />
- <Compile Include="Windowing\Window.cs">
+ <Compile Update="Windowing\Window.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Include="Windowing\Window.Designer.cs">
+ <Compile Update="Windowing\Window.Designer.cs">
<DependentUpon>Window.cs</DependentUpon>
</Compile>
- <EmbeddedResource Include="Desktop.resx">
+ <EmbeddedResource Update="Desktop.resx">
<DependentUpon>Desktop.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="PanelButton.resx">
+ <EmbeddedResource Update="PanelButton.resx">
<DependentUpon>PanelButton.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\Clock.resx">
+ <EmbeddedResource Update="Programs\Clock.resx">
<DependentUpon>Clock.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\ColorPicker.resx">
+ <EmbeddedResource Update="Programs\ColorPicker.resx">
<DependentUpon>ColorPicker.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\FileSkimmer.resx">
+ <EmbeddedResource Update="Programs\FileSkimmer.resx">
<DependentUpon>FileSkimmer.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\GraphicPicker.resx">
+ <EmbeddedResource Update="Programs\GraphicPicker.resx">
<DependentUpon>GraphicPicker.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\Infobox.resx">
+ <EmbeddedResource Update="Programs\Infobox.resx">
<DependentUpon>Infobox.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\Shifter.resx">
+ <EmbeddedResource Update="Programs\Shifter.resx">
<DependentUpon>Shifter.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\Shiftorium.resx">
+ <EmbeddedResource Update="Programs\Shiftorium.resx">
<DependentUpon>Shiftorium.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\Terminal.resx">
+ <EmbeddedResource Update="Programs\Terminal.resx">
<DependentUpon>Terminal.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Programs\TextPad.resx">
+ <EmbeddedResource Update="Programs\TextPad.resx">
<DependentUpon>TextPad.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Properties\Resources.resx">
+ <EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
- <EmbeddedResource Include="Windowing\Window.resx">
+ <EmbeddedResource Update="Windowing\Window.resx">
<DependentUpon>Window.cs</DependentUpon>
</EmbeddedResource>
- <None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
- <Compile Include="Properties\Settings.Designer.cs">
+ <Compile Update="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
</ItemGroup>
<ItemGroup>
- <None Include="App.config" />
- </ItemGroup>
- <ItemGroup>
<None Include="Resources\Industrial.skn" />
<None Include="Resources\Linux Mint 7.skn" />
<None Include="Resources\UpgradeDatabase.json" />
@@ -550,5 +490,9 @@
<None Include="Resources\anycolourshade.png" />
<None Include="Resources\3beepvirus.wav" />
</ItemGroup>
- <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <PackageReference Include="docopt.net" Version="0.6.1.10" />
+ <PackageReference Include="Microsoft.Windows.Compatibility" Version="3.0.0" />
+ <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+ </ItemGroup>
</Project> \ No newline at end of file
diff --git a/ShiftOS/ShiftOS/packages.config b/ShiftOS/ShiftOS/packages.config
deleted file mode 100644
index 864ec30..0000000
--- a/ShiftOS/ShiftOS/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
- <package id="docopt.net" version="0.6.1.10" targetFramework="net461" />
- <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
-</packages> \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2026-06-04 05:06:41 +0000