Skip to content

Commit 766de70

Browse files
seayxuseayxu
committed
update csproj
1 parent e7b3e9e commit 766de70

23 files changed

+644
-171
lines changed

‎.gitattributes

+63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto
5+
6+
###############################################################################
7+
# Set default behavior for command prompt diff.
8+
#
9+
# This is need for earlier builds of msysgit that does not have it on by
10+
# default for csharp files.
11+
# Note: This is only used by command line
12+
###############################################################################
13+
#*.cs diff=csharp
14+
15+
###############################################################################
16+
# Set the merge driver for project and solution files
17+
#
18+
# Merging from the command prompt will add diff markers to the files if there
19+
# are conflicts (Merging from VS is not affected by the settings below, in VS
20+
# the diff markers are never inserted). Diff markers may cause the following
21+
# file extensions to fail to load in VS. An alternative would be to treat
22+
# these files as binary and thus will always conflict and require user
23+
# intervention with every merge. To do so, just uncomment the entries below
24+
###############################################################################
25+
#*.sln merge=binary
26+
#*.csproj merge=binary
27+
#*.vbproj merge=binary
28+
#*.vcxproj merge=binary
29+
#*.vcproj merge=binary
30+
#*.dbproj merge=binary
31+
#*.fsproj merge=binary
32+
#*.lsproj merge=binary
33+
#*.wixproj merge=binary
34+
#*.modelproj merge=binary
35+
#*.sqlproj merge=binary
36+
#*.wwaproj merge=binary
37+
38+
###############################################################################
39+
# behavior for image files
40+
#
41+
# image files are treated as binary by default.
42+
###############################################################################
43+
#*.jpg binary
44+
#*.png binary
45+
#*.gif binary
46+
47+
###############################################################################
48+
# diff behavior for common document formats
49+
#
50+
# Convert binary document formats to text before diffing them. This feature
51+
# is only available from the command line. Turn it on by uncommenting the
52+
# entries below.
53+
###############################################################################
54+
#*.doc diff=astextplain
55+
#*.DOC diff=astextplain
56+
#*.docx diff=astextplain
57+
#*.DOCX diff=astextplain
58+
#*.dot diff=astextplain
59+
#*.DOT diff=astextplain
60+
#*.pdf diff=astextplain
61+
#*.PDF diff=astextplain
62+
#*.rtf diff=astextplain
63+
#*.RTF diff=astextplain

‎.gitignore

+32-11
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ x86/
2020
bld/
2121
[Bb]in/
2222
[Oo]bj/
23+
[Ll]og/
2324

2425
# Visual Studio 2015 cache/options directory
2526
.vs/
@@ -41,6 +42,7 @@ dlldata.c
4142

4243
# DNX
4344
project.lock.json
45+
project.fragment.lock.json
4446
artifacts/
4547

4648
*_i.c
@@ -79,6 +81,8 @@ ipch/
7981
*.opensdf
8082
*.sdf
8183
*.cachefile
84+
*.VC.db
85+
*.VC.VC.opendb
8286

8387
# Visual Studio profiler
8488
*.psess
@@ -137,11 +141,16 @@ publish/
137141
# Publish Web Output
138142
*.[Pp]ublish.xml
139143
*.azurePubxml
140-
# TODO: Comment the next line if you want to checkin your web deploy settings
144+
# TODO: Comment the next line if you want to checkin your web deploy settings
141145
# but database connection strings (with potential passwords) will be unencrypted
142-
*.pubxml
146+
#*.pubxml
143147
*.publishproj
144148

149+
# Microsoft Azure Web App publish settings. Comment the next line if you want to
150+
# checkin your Azure Web App publish settings, but sensitive information contained
151+
# in these scripts will be unencrypted
152+
PublishScripts/
153+
145154
# NuGet Packages
146155
*.nupkg
147156
# The packages folder can be ignored because of Package Restore
@@ -162,12 +171,11 @@ csx/
162171
ecf/
163172
rcf/
164173

165-
# Microsoft Azure ApplicationInsights config file
166-
ApplicationInsights.config
167-
168-
# Windows Store app package directory
174+
# Windows Store app package directories and files
169175
AppPackages/
170176
BundleArtifacts/
177+
Package.StoreAssociation.xml
178+
_pkginfo.txt
171179

172180
# Visual Studio cache files
173181
# files ending in .cache can be ignored
@@ -181,11 +189,16 @@ ClientBin/
181189
*~
182190
*.dbmdl
183191
*.dbproj.schemaview
192+
*.jfm
184193
*.pfx
185194
*.publishsettings
186195
node_modules/
187196
orleans.codegen.cs
188197

198+
# Since there are multiple workflows, uncomment next line to ignore bower_components
199+
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
200+
#bower_components/
201+
189202
# RIA/Silverlight projects
190203
Generated_Code/
191204

@@ -231,12 +244,20 @@ _Pvt_Extensions
231244

232245
# Paket dependency manager
233246
.paket/paket.exe
247+
paket-files/
234248

235249
# FAKE - F# Make
236250
.fake/
237251

238-
# Custom
239-
src/GodSharp.*/pack.bat
240-
/sample
241-
/src/GodSharp.Socket/Internal/Listener/ListenerCollection.cs
242-
/src/GodSharp.Socket/Base/SenderCollection.cs
252+
# JetBrains Rider
253+
.idea/
254+
*.sln.iml
255+
256+
# CodeRush
257+
.cr/
258+
259+
# Python Tools for Visual Studio (PTVS)
260+
__pycache__/
261+
*.pyc
262+
263+
output/

‎GodSharp.Socket.sln

+15-22
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.12
4+
VisualStudioVersion = 15.0.27130.2010
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2D285DE6-8FC0-4FB6-A438-EA2AD5FEA561}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{D2FB2A10-BA9D-41F8-9D8F-9F8945F39FA6}"
9-
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.Socket", "src\GodSharp.Socket\GodSharp.Socket.csproj", "{877E1AA2-7EAE-40FC-AB49-C52262F09D9D}"
11-
EndProject
128
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{677097FA-DFF0-4DEF-BFF6-3D2EF8510769}"
139
ProjectSection(SolutionItems) = preProject
1410
.gitignore = .gitignore
@@ -21,32 +17,31 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample", "sample", "{56DB72
2117
EndProject
2218
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Console", "Console", "{169FDBD0-1C98-4A7E-B8B6-1023B73624F0}"
2319
EndProject
20+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsForms", "WindowsForms", "{43852E3B-E5B7-4A54-B450-4B48F6C3F025}"
21+
EndProject
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{3E90692F-1C39-4244-88E3-EEA2B02FE7E7}"
23+
ProjectSection(SolutionItems) = preProject
24+
build\version.props = build\version.props
25+
EndProjectSection
26+
EndProject
2427
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.SocketServerSample", "sample\Console\GodSharp.SocketServerSample\GodSharp.SocketServerSample.csproj", "{8F3CAA2A-6DC3-46D5-ABE6-3850F29FFF75}"
2528
EndProject
2629
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.SocketClientSapmle", "sample\Console\GodSharp.SocketClientSapmle\GodSharp.SocketClientSapmle.csproj", "{DA03E415-51BC-4223-B8C8-E2ABFF1F77AF}"
2730
EndProject
28-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WindowsForms", "WindowsForms", "{43852E3B-E5B7-4A54-B450-4B48F6C3F025}"
29-
EndProject
3031
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.ChatClient", "sample\WindowsForms\GodSharp.ChatClient\GodSharp.ChatClient.csproj", "{B1EFC930-1A12-4FA6-9BDA-EC27E477528B}"
3132
EndProject
3233
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.ChatServer", "sample\WindowsForms\GodSharp.ChatServer\GodSharp.ChatServer.csproj", "{5DD72AA1-F791-446C-9939-0CB1C5483D04}"
3334
EndProject
3435
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.Chat", "sample\WindowsForms\GodSharp.Chat\GodSharp.Chat.csproj", "{D556F994-9A72-4F30-8B55-9D9FAA14C5FE}"
3536
EndProject
36-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{603D2C45-7DDB-43C5-8D0A-B379E54186B2}"
37-
EndProject
38-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GodSharp.Socket.Test", "test\GodSharp.Socket.Test\GodSharp.Socket.Test.csproj", "{BD2FD84D-386E-4F99-923B-45431727E479}"
37+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GodSharp.Socket", "src\GodSharp.Socket\GodSharp.Socket.csproj", "{06BBFBF4-9958-42CB-9920-3CF516773368}"
3938
EndProject
4039
Global
4140
GlobalSection(SolutionConfigurationPlatforms) = preSolution
4241
Debug|Any CPU = Debug|Any CPU
4342
Release|Any CPU = Release|Any CPU
4443
EndGlobalSection
4544
GlobalSection(ProjectConfigurationPlatforms) = postSolution
46-
{877E1AA2-7EAE-40FC-AB49-C52262F09D9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47-
{877E1AA2-7EAE-40FC-AB49-C52262F09D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{877E1AA2-7EAE-40FC-AB49-C52262F09D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU
49-
{877E1AA2-7EAE-40FC-AB49-C52262F09D9D}.Release|Any CPU.Build.0 = Release|Any CPU
5045
{8F3CAA2A-6DC3-46D5-ABE6-3850F29FFF75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5146
{8F3CAA2A-6DC3-46D5-ABE6-3850F29FFF75}.Debug|Any CPU.Build.0 = Debug|Any CPU
5247
{8F3CAA2A-6DC3-46D5-ABE6-3850F29FFF75}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -67,25 +62,23 @@ Global
6762
{D556F994-9A72-4F30-8B55-9D9FAA14C5FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
6863
{D556F994-9A72-4F30-8B55-9D9FAA14C5FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
6964
{D556F994-9A72-4F30-8B55-9D9FAA14C5FE}.Release|Any CPU.Build.0 = Release|Any CPU
70-
{BD2FD84D-386E-4F99-923B-45431727E479}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71-
{BD2FD84D-386E-4F99-923B-45431727E479}.Debug|Any CPU.Build.0 = Debug|Any CPU
72-
{BD2FD84D-386E-4F99-923B-45431727E479}.Release|Any CPU.ActiveCfg = Release|Any CPU
73-
{BD2FD84D-386E-4F99-923B-45431727E479}.Release|Any CPU.Build.0 = Release|Any CPU
65+
{06BBFBF4-9958-42CB-9920-3CF516773368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
66+
{06BBFBF4-9958-42CB-9920-3CF516773368}.Debug|Any CPU.Build.0 = Debug|Any CPU
67+
{06BBFBF4-9958-42CB-9920-3CF516773368}.Release|Any CPU.ActiveCfg = Release|Any CPU
68+
{06BBFBF4-9958-42CB-9920-3CF516773368}.Release|Any CPU.Build.0 = Release|Any CPU
7469
EndGlobalSection
7570
GlobalSection(SolutionProperties) = preSolution
7671
HideSolutionNode = FALSE
7772
EndGlobalSection
7873
GlobalSection(NestedProjects) = preSolution
79-
{D2FB2A10-BA9D-41F8-9D8F-9F8945F39FA6} = {2D285DE6-8FC0-4FB6-A438-EA2AD5FEA561}
80-
{877E1AA2-7EAE-40FC-AB49-C52262F09D9D} = {2D285DE6-8FC0-4FB6-A438-EA2AD5FEA561}
8174
{169FDBD0-1C98-4A7E-B8B6-1023B73624F0} = {56DB72CA-6C54-4BEC-956C-60CAE3828741}
75+
{43852E3B-E5B7-4A54-B450-4B48F6C3F025} = {56DB72CA-6C54-4BEC-956C-60CAE3828741}
8276
{8F3CAA2A-6DC3-46D5-ABE6-3850F29FFF75} = {169FDBD0-1C98-4A7E-B8B6-1023B73624F0}
8377
{DA03E415-51BC-4223-B8C8-E2ABFF1F77AF} = {169FDBD0-1C98-4A7E-B8B6-1023B73624F0}
84-
{43852E3B-E5B7-4A54-B450-4B48F6C3F025} = {56DB72CA-6C54-4BEC-956C-60CAE3828741}
8578
{B1EFC930-1A12-4FA6-9BDA-EC27E477528B} = {43852E3B-E5B7-4A54-B450-4B48F6C3F025}
8679
{5DD72AA1-F791-446C-9939-0CB1C5483D04} = {43852E3B-E5B7-4A54-B450-4B48F6C3F025}
8780
{D556F994-9A72-4F30-8B55-9D9FAA14C5FE} = {43852E3B-E5B7-4A54-B450-4B48F6C3F025}
88-
{BD2FD84D-386E-4F99-923B-45431727E479} = {603D2C45-7DDB-43C5-8D0A-B379E54186B2}
81+
{06BBFBF4-9958-42CB-9920-3CF516773368} = {2D285DE6-8FC0-4FB6-A438-EA2AD5FEA561}
8982
EndGlobalSection
9083
GlobalSection(ExtensibilityGlobals) = postSolution
9184
SolutionGuid = {68DFC265-6267-4153-8375-A35F8E5CD820}

‎appveyor.yml

+23-13
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,44 @@
11
version: 1.0.1.{build}
2+
branches:
3+
only:
4+
- master
5+
- release
6+
- dev
7+
skip_branch_with_pr: true
28
image: Visual Studio 2017
39
configuration: Release
410
platform: Any CPU
511
clone_folder: c:\projects\GodSharp.Socket
6-
nuget:
7-
account_feed: true
8-
project_feed: true
9-
disable_publish_on_pr: true
12+
install:
13+
- cmd: nuget restore
1014
build:
11-
project: src\GodSharp.Socket\GodSharp.Socket.csproj
12-
publish_nuget: true
15+
project: GodSharp.Socket.sln
16+
publish_nuget: false
1317
include_nuget_references: true
1418
verbosity: minimal
19+
artifacts:
20+
- path: '**\*.nupkg'
1521
test: off
1622
deploy:
1723
- provider: NuGet
1824
server: https://www.nuget.org/api/v2/package
1925
api_key:
2026
secure: s388/c8yQWnGyZ9v9cUDfBe4ud6MFl/ouUEEBruiN5j5+LjSQ4giGKMKuLuvglS1
21-
skip_symbols: true
2227
artifact: /.*\.nupkg/
2328
on:
24-
branch: master
25-
APPVEYOR_REPO_TAG: true
29+
branch: /(release)|(dev)/
2630
- provider: NuGet
27-
server: https://www.myget.org/F/seay/api/v2/package
31+
server: https://www.myget.org/F/godsharp/api/v2/package
2832
api_key:
2933
secure: CKm5m2qGYNYnh5yDUE2zKfN+JKBmO5xmtG80AP0yni9yPBqDOaRQ48Y/4k8KGo2y
30-
skip_symbols: true
3134
artifact: /.*\.nupkg/
3235
on:
33-
branch: master
34-
APPVEYOR_REPO_TAG: true
36+
branch: /(release)|(dev)/
37+
- provider: GitHub
38+
auth_token:
39+
secure: uCHTzET52dtiexqTKhgQmup+EBGZs1Afw6eBMfvN4PbQ720YaybNd890Y96ISZ0T
40+
artifact: /.*\.nupkg/
41+
draft: true
42+
force_update: true
43+
on:
44+
branch: /(release)|(dev)/

‎build/common.props

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
<Project>
2+
3+
<Import Project=".\version.props" />
4+
5+
<PropertyGroup>
6+
<RootNamespace>GodSharp.Socket</RootNamespace>
7+
<Company>GodSharp</Company>
8+
<Authors>seayxu</Authors>
9+
<RepositoryType>git</RepositoryType>
10+
<RepositoryUrl>https://github.com/godsharp/GodSharp.Logging.git</RepositoryUrl>
11+
<PackageProjectUrl>https://github.com/godsharp/GodSharp.Logging</PackageProjectUrl>
12+
<PackageIconUrl>https://avatars3.githubusercontent.com/u/26563296</PackageIconUrl>
13+
<PackageLicenseUrl>https://github.com/godsharp/GodSharp.Logging/blob/master/LICENSE</PackageLicenseUrl>
14+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
15+
<Copyright>Copyright © GodSharp 2017</Copyright>
16+
<NeutralLanguage>en-US</NeutralLanguage>
17+
<TargetFrameworks Condition="'$(LibraryFrameworks)'==''">net35;net40;net45;net46;net47;netstandard2.0;</TargetFrameworks>
18+
<TargetFrameworks Condition="'$(LibraryFrameworks)'!=''">$(LibraryFrameworks)</TargetFrameworks>
19+
<OutputPath>$(SolutionDir)\output\$(AssemblyName)</OutputPath>
20+
</PropertyGroup>
21+
22+
<PropertyGroup Condition="'$(TargetFramework)'=='net35'">
23+
<DefineConstants>NFX;NET35;$(AdditionalConstants)</DefineConstants>
24+
</PropertyGroup>
25+
<PropertyGroup Condition="'$(TargetFramework)'=='net40'">
26+
<DefineConstants>NFX;NET40;$(AdditionalConstants)</DefineConstants>
27+
</PropertyGroup>
28+
<PropertyGroup Condition="'$(TargetFramework)'=='net45'">
29+
<DefineConstants>NFX;NET45;$(AdditionalConstants)</DefineConstants>
30+
</PropertyGroup>
31+
<PropertyGroup Condition="'$(TargetFramework)'=='net46'">
32+
<DefineConstants>NFX;NET46;$(AdditionalConstants)</DefineConstants>
33+
</PropertyGroup>
34+
<PropertyGroup Condition="'$(TargetFramework)'=='net47'">
35+
<DefineConstants>NFX;NET47;$(AdditionalConstants)</DefineConstants>
36+
</PropertyGroup>
37+
<PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
38+
<DefineConstants>CFX;NETSTANDARD2_0;$(AdditionalConstants)</DefineConstants>
39+
</PropertyGroup>
40+
</Project>

‎build/version.props

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<PropertyGroup Condition="'$(AssemblyName)'=='GodSharp.Socket'">
3+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
4+
<Version>1.0.2-preview1</Version>
5+
</PropertyGroup>
6+
</Project>

‎sample/Console/GodSharp.SocketClientSapmle/GodSharp.SocketClientSapmle.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<ItemGroup>
4242
<ProjectReference Include="..\..\..\src\GodSharp.Socket\GodSharp.Socket.csproj">
43-
<Project>{877e1aa2-7eae-40fc-ab49-c52262f09d9d}</Project>
43+
<Project>{06bbfbf4-9958-42cb-9920-3cf516773368}</Project>
4444
<Name>GodSharp.Socket</Name>
4545
</ProjectReference>
4646
</ItemGroup>

‎sample/Console/GodSharp.SocketServerSample/GodSharp.SocketServerSample.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</ItemGroup>
4141
<ItemGroup>
4242
<ProjectReference Include="..\..\..\src\GodSharp.Socket\GodSharp.Socket.csproj">
43-
<Project>{877e1aa2-7eae-40fc-ab49-c52262f09d9d}</Project>
43+
<Project>{06bbfbf4-9958-42cb-9920-3cf516773368}</Project>
4444
<Name>GodSharp.Socket</Name>
4545
</ProjectReference>
4646
</ItemGroup>

‎sample/WindowsForms/GodSharp.Chat/Enum/SocketType.cs

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace GodSharp.Chat.Enum
2+
{
3+
public enum SocketType
4+
{
5+
Server,
6+
Client
7+
}
8+
}

0 commit comments

Comments
 (0)