diff options
| author | Alex-TIMEHACK <[email protected]> | 2017-11-18 16:29:54 +0000 |
|---|---|---|
| committer | Alex-TIMEHACK <[email protected]> | 2017-11-18 16:29:54 +0000 |
| commit | 4037be53b29a122732cfc10693e9c0027f606bb0 (patch) | |
| tree | 8533ea9ee0ac8f5f7f696b85cb039f783657ada0 /ShiftOS.Main/ShiftOS.Main.csproj | |
| parent | 65b7ac2b8cbc4478f6d31a21f106048aeb075078 (diff) | |
| parent | 97722fbe9d474adffbba0b92e9727c48a8205234 (diff) | |
| download | shiftos-rewind-4037be53b29a122732cfc10693e9c0027f606bb0.tar.gz shiftos-rewind-4037be53b29a122732cfc10693e9c0027f606bb0.tar.bz2 shiftos-rewind-4037be53b29a122732cfc10693e9c0027f606bb0.zip | |
Updated my fork!
Conflicts:
ShiftOS.Engine/ShiftOS.Engine.csproj
ShiftOS.Engine/Terminal/Commands/Hello.cs
ShiftOS.Engine/Terminal/TerminalBackend.cs
ShiftOS.Engine/Terminal/TerminalCommand.cs
ShiftOS.Main/ShiftOS.Main.csproj
ShiftOS.Main/ShiftOS/Apps/Terminal.cs
ShiftOS.Main/ShiftOS/Desktop.cs
Diffstat (limited to 'ShiftOS.Main/ShiftOS.Main.csproj')
| -rw-r--r-- | ShiftOS.Main/ShiftOS.Main.csproj | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/ShiftOS.Main/ShiftOS.Main.csproj b/ShiftOS.Main/ShiftOS.Main.csproj index b2e9739..f7d8dc0 100644 --- a/ShiftOS.Main/ShiftOS.Main.csproj +++ b/ShiftOS.Main/ShiftOS.Main.csproj @@ -20,6 +20,7 @@ <DefineConstants>DEBUG;TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <LangVersion>latest</LangVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PlatformTarget>AnyCPU</PlatformTarget> @@ -29,8 +30,12 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <LangVersion>latest</LangVersion> </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.Xml.Linq" /> @@ -44,14 +49,14 @@ <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> - <Compile Include="HijackScreen.cs"> - <SubType>Form</SubType> - </Compile> - <Compile Include="HijackScreen.Designer.cs"> - <DependentUpon>HijackScreen.cs</DependentUpon> - </Compile> <Compile Include="Program.cs" /> <Compile Include="Properties\AssemblyInfo.cs" /> + <Compile Include="ShiftOS\Apps\FileSkimmer.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="ShiftOS\Apps\FileSkimmer.Designer.cs"> + <DependentUpon>FileSkimmer.cs</DependentUpon> + </Compile> <Compile Include="ShiftOS\Apps\ShifterStuff\SelectColor.cs"> <SubType>UserControl</SubType> </Compile> @@ -82,6 +87,12 @@ <Compile Include="ShiftOS\Apps\TestForm.Designer.cs"> <DependentUpon>TestForm.cs</DependentUpon> </Compile> + <Compile Include="ShiftOS\Apps\TextPad.cs"> + <SubType>UserControl</SubType> + </Compile> + <Compile Include="ShiftOS\Apps\TextPad.Designer.cs"> + <DependentUpon>TextPad.cs</DependentUpon> + </Compile> <Compile Include="ShiftOS\Desktop.cs"> <SubType>Form</SubType> </Compile> @@ -104,6 +115,9 @@ <DependentUpon>Resources.resx</DependentUpon> <DesignTime>True</DesignTime> </Compile> + <EmbeddedResource Include="ShiftOS\Apps\FileSkimmer.resx"> + <DependentUpon>FileSkimmer.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="ShiftOS\Apps\ShifterStuff\SelectColor.resx"> <DependentUpon>SelectColor.cs</DependentUpon> </EmbeddedResource> @@ -119,9 +133,13 @@ <EmbeddedResource Include="ShiftOS\Apps\TestForm.resx"> <DependentUpon>TestForm.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="ShiftOS\Apps\TextPad.resx"> + <DependentUpon>TextPad.cs</DependentUpon> + </EmbeddedResource> <EmbeddedResource Include="ShiftOS\Desktop.resx"> <DependentUpon>Desktop.cs</DependentUpon> </EmbeddedResource> + <None Include="packages.config" /> <None Include="Properties\Settings.settings"> <Generator>SettingsSingleFileGenerator</Generator> <LastGenOutput>Settings.Designer.cs</LastGenOutput> |