Skip to content

Adapt to .NET Core #35

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

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

Adapt to .NET Core #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
74aff06
Added .NET Core support
UCan927 Jun 17, 2020
717c80e
Handle .NET Core SDK compatibility issues;
UCan927 Jun 18, 2020
aa6660f
Use new syntax to eliminate compilation messages;
UCan927 Jun 19, 2020
29560e8
Fix the problem that UDP does not work in mono
UCan927 Apr 19, 2021
b4905e7
Format carriage return line feed;
UCan927 Jan 19, 2022
58b2e28
Adjust framework compatibility;
UCan927 Jan 19, 2022
0f44b4f
Framework upgrade to net5.0;
UCan927 Jan 21, 2022
65f387e
Update copyright information; update version number;
UCan927 Jan 21, 2022
b13fd25
Update "nuget" packaging instructions; update version number;
UCan927 Jan 21, 2022
cf98060
Rename Icon PSD filename suffix;
UCan927 Jan 24, 2022
42b5e40
Clean up duplicate tags
UCan927 Jan 24, 2022
3067d76
重载SerialEndPoint的ToString方法，便于友好记录日志;
UCan927 Apr 13, 2022
d0b897d
提升版本号；
UCan927 Apr 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<!-- .props 文件在导入顺序的早期导入 -->
<Project>
<PropertyGroup>
<RootDir>$(SolutionDir)</RootDir>
<BinDir>$(SolutionDir)Bin</BinDir>
<CodeDir>$(SolutionDir)Source Code</CodeDir>
<IconDir>$(SolutionDir)Resource\Icon</IconDir>
<ResourceDir>$(SolutionDir)Resource</ResourceDir>
<MainProjectName></MainProjectName>
<ThirdLibDir>$(SolutionDir)Resource\3rdLib</ThirdLibDir>
<PublishDir>$(SolutionDir)Bin\Publish\$(MSBuildProjectName)</PublishDir>
<ImprotDir>$(SolutionDir)Resource\Build Support\CSProj Import</ImprotDir>
<ModulesOutputDir>$(SolutionDir)Bin\$(Configuration)\Modules</ModulesOutputDir>
<LibrariesOutputDir>$(SolutionDir)Bin\$(Configuration)\Libs</LibrariesOutputDir>
<ExeOutputDir>$(SolutionDir)Bin\$(Configuration)\$(MSBuildProjectName)</ExeOutputDir>
<PackingTool>"$(SolutionDir)Resource\Build Support\Tools\Packing Tool\Packing Tool.exe"</PackingTool>
<LibraryOutputDir>$(SolutionDir)Bin\$(Configuration)\Libs\$(MSBuildProjectName)</LibraryOutputDir>
<ModuleOutputDir>$(SolutionDir)Bin\$(Configuration)\Modules\$(MSBuildProjectName)</ModuleOutputDir>
</PropertyGroup>
<PropertyGroup Condition=" '$(SolutionFileName)' == 'Mina.NET.Core.sln' ">
<BaseIntermediateOutputPath>$(BinDir)\#Build#\$(MSBuildProjectName)</BaseIntermediateOutputPath>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<Platforms>AnyCPU;x64;x86</Platforms>
<DefineConstants>NETCore</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(MSBuildProjectName)' != 'Mina.NET.Core' ">
<OutputPath>$(ExeOutputDir)</OutputPath>
</PropertyGroup>
</Project>
17 changes: 17 additions & 0 deletions Directory.Build.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!-- .targets 文件在生成顺序的后期导入 -->
<Project>
<ItemGroup Condition=" '$(SolutionFileName)' == 'Mina.NET.Core.sln' ">
<Compile Remove="obj\**" />
<EmbeddedResource Remove="obj\**" />
<None Remove="obj\**" />
<Compile Remove="Properties\AssemblyInfo.cs" />
<Folder Include="Properties\" />
</ItemGroup>
<Choose>
<When Condition=" '$(MSBuildProjectName)' != 'Mina.NET.Core' ">
<ItemGroup>
<ProjectReference Include="$(SolutionDir)Mina.NET\Mina.NET.Core.csproj" />
</ItemGroup>
</When>
</Choose>
</Project>
Binary file added Icon.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Icon.psd
View file
Open in desktop
Binary file not shown.
9 changes: 9 additions & 0 deletions Mina.Example/Chat/Client/Client.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net5.0-windows</TargetFramework>
<UseWindowsForms>true</UseWindowsForms>
</PropertyGroup>

</Project>
70 changes: 42 additions & 28 deletions Mina.Example/Chat/Client/FormChat.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions Mina.Example/Chat/Server/Server.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<None Include="..\..\Cert\TempCert.cer" Link="TempCert.cer">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

</Project>
8 changes: 8 additions & 0 deletions Mina.Example/EchoServer/EchoServer.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions Mina.Example/GettingStarted/SerialShell/SerialShell.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions Mina.Example/GettingStarted/TimeServer/TimeServer.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions Mina.Example/Haiku/Haiku.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions Mina.Example/MulticastUDP/MulticastUDP.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions Mina.Example/NetCat/NetCat.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions Mina.Example/Reverser/Reverser.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
9 changes: 9 additions & 0 deletions Mina.Example/SumUp/SumUp.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<StartupObject>Mina.Example.SumUp.Client</StartupObject>
</PropertyGroup>

</Project>
8 changes: 8 additions & 0 deletions Mina.Example/Tennis/Tennis.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
</PropertyGroup>

</Project>
9 changes: 9 additions & 0 deletions Mina.Example/Udp/Udp.NET.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<StartupObject>Mina.Example.Udp.MemoryMonitor</StartupObject>
</PropertyGroup>

</Project>
Loading