Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to .NET Standard 2.0 #17

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Upgrade to .NET Standard 2.0 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f7cc6b9
Update .gitignore
kekonn Sep 24, 2020
9cb783a
Update .gitignore
kekonn Sep 24, 2020
a350290
Update core projects to new format
kekonn Sep 24, 2020
3a4f4cf
Update the demo projects to latest .net version
kekonn Sep 24, 2020
8991a78
Convert core projects to .net standard 2.0
kekonn Sep 24, 2020
b3f91fe
Update demoes to build against .net standard
kekonn Sep 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
563 changes: 560 additions & 3 deletions .gitignore
View file
Open in desktop

Large diffs are not rendered by default.

40 changes: 5 additions & 35 deletions CursesSharp.Demo/Demo.CursesSharp.Firework/Demo.Firework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net471</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{31EDB3C5-A819-4F8F-9316-0EBC1184418B}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>FireworkDemo</RootNamespace>
<AssemblyName>FireworkDemo</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
<TargetFrameworkSubset></TargetFrameworkSubset>
<StartupObject>FireworkDemo.Program</StartupObject>
<ReleaseVersion>1.1</ReleaseVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<Optimize>false</Optimize>
<OutputPath>bin\x64\Debug</OutputPath>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DefineConstants>DEBUG;</DefineConstants>
<EnvironmentVariables>
<EnvironmentVariables>
Expand All @@ -31,10 +22,7 @@
<Externalconsole>true</Externalconsole>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<Optimize>true</Optimize>
<OutputPath>bin\x64\Release</OutputPath>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<ConsolePause>false</ConsolePause>
<Externalconsole>true</Externalconsole>
<EnvironmentVariables>
Expand All @@ -45,24 +33,6 @@
</EnvironmentVariables>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj">
<Project>{2FEF4990-95CB-42DF-984C-EFBA070652BF}</Project>
<Name>CursesSharp</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
37 changes: 5 additions & 32 deletions CursesSharp.Demo/Demo.CursesSharp.Gui.HelloWorld/Demo.Gui.HelloWorld.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net471</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{50D897CD-B369-4ABF-BC1F-049CA2B612CF}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>Gui.FrameWork.Demo</RootNamespace>
<AssemblyName>Gui.FrameWork.Demo</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<ReleaseVersion>1.1</ReleaseVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\x64\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x64</PlatformTarget>
<EnvironmentVariables>
<EnvironmentVariables>
<Variable name="LD_LIBRARY_PATH" value="$(PWD)/../../../../../CursesSharp.Native/bin/Debug:$LD_LIBRARY_PATH" />
</EnvironmentVariables>
</EnvironmentVariables>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\x64\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x64</PlatformTarget>
<EnvironmentVariables>
<EnvironmentVariables>
<Variable name="LD_LIBRARY_PATH" value="LD_LIBRARY_PATH" />
</EnvironmentVariables>
</EnvironmentVariables>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\CursesSharp.Gui\CursesSharp.Gui.csproj">
<Project>{E3AF7818-CA6E-4833-B807-3077251D2DCD}</Project>
<Name>CursesSharp.Gui</Name>
</ProjectReference>
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj">
<Project>{2FEF4990-95CB-42DF-984C-EFBA070652BF}</Project>
<Name>CursesSharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\CursesSharp.Gui\CursesSharp.Gui.csproj" />
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj" />
</ItemGroup>
</Project>
32 changes: 4 additions & 28 deletions CursesSharp.Demo/Demo.CursesSharp.HelloWorld/Demo.HelloWorld.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net471</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{41EBEEA0-E056-4540-99DF-2F7882D8152D}</ProjectGuid>
<OutputType>Exe</OutputType>
<RootNamespace>HelloWorldDemo</RootNamespace>
<AssemblyName>HelloWorldDemo</AssemblyName>
<ReleaseVersion>1.1</ReleaseVersion>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\x64\Debug</OutputPath>
<DefineConstants>DEBUG;</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x64</PlatformTarget>
<EnvironmentVariables>
<EnvironmentVariables>
<Variable name="LD_LIBRARY_PATH" value="$(PWD)/../../../../../CursesSharp.Native/bin/Debug:$LD_LIBRARY_PATH" />
Expand All @@ -28,13 +20,8 @@
</EnvironmentVariables>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<DebugType>full</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\x64\Release</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Externalconsole>true</Externalconsole>
<PlatformTarget>x64</PlatformTarget>
<EnvironmentVariables>
<EnvironmentVariables>
<Variable name="DYLD_FALLBACK_LIBRARY_PATH" value="$(PWD)/../../../../../CursesSharp.Native/bin/Debug:$DYLD_FALLBACK_LIBRARY_PATH" />
Expand All @@ -43,17 +30,6 @@
</EnvironmentVariables>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj">
<Project>{2FEF4990-95CB-42DF-984C-EFBA070652BF}</Project>
<Name>CursesSharp</Name>
</ProjectReference>
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj" />
</ItemGroup>
</Project>
40 changes: 5 additions & 35 deletions CursesSharp.Demo/Demo.CursesSharp.Rain/Demo.Rain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net471</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{40A9C7A5-DB28-49DB-927B-19F96EABE237}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>RainDemo</RootNamespace>
<AssemblyName>RainDemo</AssemblyName>
<FileAlignment>512</FileAlignment>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
<TargetFrameworkSubset></TargetFrameworkSubset>
<StartupObject>RainDemo.Program</StartupObject>
<ReleaseVersion>1.1</ReleaseVersion>
<EnvironmentVariables>
Expand All @@ -20,14 +15,10 @@
</EnvironmentVariables>
<ConsolePause>false</ConsolePause>
<Externalconsole>true</Externalconsole>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<Optimize>false</Optimize>
<OutputPath>bin\x64\Debug</OutputPath>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DefineConstants>DEBUG;</DefineConstants>
<EnvironmentVariables>
<EnvironmentVariables>
Expand All @@ -37,10 +28,7 @@
<ConsolePause>true</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<Optimize>true</Optimize>
<OutputPath>bin\x64\Release</OutputPath>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<EnvironmentVariables>
<EnvironmentVariables>
<Variable name="LD_LIBRARY_PATH" value="$(PWD)/../../../../../CursesSharp.Native/bin/Release:$LD_LIBRARY_PATH" />
Expand All @@ -49,24 +37,6 @@
<ConsolePause>true</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj">
<Project>{2FEF4990-95CB-42DF-984C-EFBA070652BF}</Project>
<Name>CursesSharp</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
40 changes: 5 additions & 35 deletions CursesSharp.Demo/Demo.CursesSharp.Unicode/Demo.Unicode.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<TargetFramework>net471</TargetFramework>
<Platform Condition=" '$(Platform)' == '' ">x64</Platform>
<ProjectGuid>{DF0FF602-9AEB-45C0-BCB4-E188560F7361}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UnicodeDemo</RootNamespace>
<AssemblyName>UnicodeDemo</AssemblyName>
<FileAlignment>512</FileAlignment>
<StartupObject>UnicodeDemo.Program</StartupObject>
<TargetFrameworkSubset>
</TargetFrameworkSubset>
<TargetFrameworkSubset></TargetFrameworkSubset>
<ReleaseVersion>1.1</ReleaseVersion>
<EnvironmentVariables>
<EnvironmentVariables>
Expand All @@ -20,14 +15,10 @@
</EnvironmentVariables>
<ConsolePause>false</ConsolePause>
<Externalconsole>true</Externalconsole>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
<Optimize>false</Optimize>
<OutputPath>bin\x64\Debug</OutputPath>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DefineConstants>DEBUG;</DefineConstants>
<EnvironmentVariables>
<EnvironmentVariables>
Expand All @@ -37,10 +28,7 @@
<ConsolePause>true</ConsolePause>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
<Optimize>true</Optimize>
<OutputPath>bin\x64\Release</OutputPath>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget>
<EnvironmentVariables>
<EnvironmentVariables>
<Variable name="LD_LIBRARY_PATH" value="$(PWD)/../../../../../CursesSharp.Native/bin/Debug:$LD_LIBRARY_PATH" />
Expand All @@ -49,24 +37,6 @@
<ConsolePause>true</ConsolePause>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\CursesSharp\CursesSharp.csproj">
<Project>{2FEF4990-95CB-42DF-984C-EFBA070652BF}</Project>
<Name>CursesSharp</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>