NETCore作为主力分支

.editorconfig

@@ -1,4 +1,4 @@
-# EditorConfig is awesome:http://EditorConfig.org
+# EditorConfig is awesome:http://EditorConfig.org
 # https://docs.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
 
 # top-most EditorConfig file
@@ -43,7 +43,7 @@ csharp_indent_labels = flush_left
 #csharp_space_between_method_call_parameter_list_parentheses = true
 #csharp_space_between_parentheses = control_flow_statements, type_casts
 
-# 单行放置代码
+# 单行放置代码
 csharp_preserve_single_line_statements = true
 csharp_preserve_single_line_blocks = true
 
@@ -96,7 +96,7 @@ csharp_style_pattern_local_over_anonymous_function = true:suggestion
 csharp_style_throw_expression = true:suggestion
 csharp_style_conditional_delegate_call = true:suggestion
 
-# 单行不需要大括号
+# 单行不需要大括号
 csharp_prefer_braces = false:suggestion
 
 # Newline settings

.gitattributes

@@ -1,63 +0,0 @@
-###############################################################################
-# Set default behavior to automatically normalize line endings.
-###############################################################################
-* text=auto
-
-###############################################################################
-# Set default behavior for command prompt diff.
-#
-# This is need for earlier builds of msysgit that does not have it on by
-# default for csharp files.
-# Note: This is only used by command line
-###############################################################################
-#*.cs     diff=csharp
-
-###############################################################################
-# Set the merge driver for project and solution files
-#
-# Merging from the command prompt will add diff markers to the files if there
-# are conflicts (Merging from VS is not affected by the settings below, in VS
-# the diff markers are never inserted). Diff markers may cause the following 
-# file extensions to fail to load in VS. An alternative would be to treat
-# these files as binary and thus will always conflict and require user
-# intervention with every merge. To do so, just uncomment the entries below
-###############################################################################
-#*.sln       merge=binary
-#*.csproj    merge=binary
-#*.vbproj    merge=binary
-#*.vcxproj   merge=binary
-#*.vcproj    merge=binary
-#*.dbproj    merge=binary
-#*.fsproj    merge=binary
-#*.lsproj    merge=binary
-#*.wixproj   merge=binary
-#*.modelproj merge=binary
-#*.sqlproj   merge=binary
-#*.wwaproj   merge=binary
-
-###############################################################################
-# behavior for image files
-#
-# image files are treated as binary by default.
-###############################################################################
-#*.jpg   binary
-#*.png   binary
-#*.gif   binary
-
-###############################################################################
-# diff behavior for common document formats
-# 
-# Convert binary document formats to text before diffing them. This feature
-# is only available from the command line. Turn it on by uncommenting the 
-# entries below.
-###############################################################################
-#*.doc   diff=astextplain
-#*.DOC   diff=astextplain
-#*.docx  diff=astextplain
-#*.DOCX  diff=astextplain
-#*.dot   diff=astextplain
-#*.DOT   diff=astextplain
-#*.pdf   diff=astextplain
-#*.PDF   diff=astextplain
-#*.rtf   diff=astextplain
-#*.RTF   diff=astextplain

.gitignore

@@ -17,26 +17,15 @@ bld/
 *.user
 /Data
 /Log
-/NewLife.Cube/Config
-/NewLife.Cube/Plugins
 *.log
 *.htm
 *.nuspec
 *.nupkg
-/NewLife.Core.Core/project.lock.json
-/Backup
-/ConsoleApp1
-/NewLife.Cube4/Config
-/NewLife.Cube4/Content
-/NewLife.Cube4/Plugins
 /XCode/Membership/Config
 /XCode/Sharding/Config
 /XCode/Demo/Config
 /XCode/Membership
 /Keys
 /Avatars
-/XCode/Extension/Config
-/TestST/Properties/PublishProfiles
-/NewLife.Cube/.vs
 /BinSamples
 /Samples/SplitTableOrDatabase/Config

Readme.MD

@@ -1,13 +1,13 @@
 ![XCode](https://www.newlifex.com/logo.png)
 新生命团队基础框架X组件，包括`算法、日志、数据库、网络、RPC、序列化、缓存、Windows服务、多线程`等模块，支持`.Net Framework/.netstandard/Mono`。
 
-2002~2019，成千上万兄弟姐妹们努力的见证！  
+2002~2020，成千上万兄弟姐妹们努力的见证！  
 
 国内文档中心：[http://doc.newlifex.com/](http://doc.newlifex.com/)  
 国外文档中心：[https://newlifex.github.io/XDoc/](https://newlifex.github.io/XDoc/)  
 
 ## 新生命开源项目矩阵
-各项目默认支持net4.5/net4.0/netstandard2.0  
+各项目默认支持netstandard2.0/net4.5/net4.0/  
 
 |                               项目                               | 年份  |  状态  | .NET Core | 说明                                               |
 | :--------------------------------------------------------------: | :---: | :----: | :-------: | -------------------------------------------------- |

azure-pipelines.yml

@@ -1,17 +0,0 @@
-# ASP.NET Core
-# Build and test ASP.NET Core projects targeting .NET Core.
-# Add steps that run tests, create a NuGet package, deploy, and more:
-# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core
-
-trigger:
-- master
-
-pool:
-  vmImage: 'vs2017-win2016'
-
-variables:
-  buildConfiguration: 'Release'
-
-steps:
-- script: dotnet build --configuration $(buildConfiguration) ./XCode/XCode.csproj
-  displayName: 'dotnet build $(buildConfiguration)'