-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10 from dotnet-campus/t/walterlv/new
全新设计的日志系统
- Loading branch information
Showing
77 changed files
with
3,129 additions
and
561 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,63 +1,57 @@ | ||
| ############################################################################### | ||
| # 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 | ||
| # Auto detect text files and perform LF normalization | ||
| * text=false | ||
|
|
||
| # Custom for Visual Studio | ||
| *.cs diff=csharp | ||
| *.sln merge=text | ||
| *.csproj merge=text | ||
| *.vbproj merge=text | ||
| *.fsproj merge=text | ||
| *.dbproj merge=text | ||
|
|
||
| # Standard to msysgit | ||
| *.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 | ||
|
|
||
| # ignore file | ||
|
|
||
| *.mp3 -diff | ||
| *.wav -diff | ||
| *.enas -diff | ||
| *.png -diff | ||
| *.jpg -diff | ||
| *.psd -diff | ||
| *.gif -diff | ||
|
|
||
| # binary | ||
| *.avi binary | ||
| *.bmp binary | ||
| *.exr binary | ||
| *.ico binary | ||
| *.jpeg binary | ||
| *.jpg binary | ||
| *.png binary | ||
|
|
||
| *.a binary | ||
| *.so binary | ||
| *.dll binary | ||
| *.jar binary | ||
|
|
||
| *.pdf binary | ||
| *.pbxproj binary | ||
| *.vec binary | ||
| *.doc binary | ||
| *.dia binary | ||
|
|
||
| # CR/LF | ||
|
|
||
| *.bat text eol=crlf | ||
| *.sh text eol=lf |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,24 @@ | ||
| <Project> | ||
|
|
||
| <Import Project="build\Version.props" /> | ||
|
|
||
| <!-- 框架和语言信息 --> | ||
| <PropertyGroup> | ||
| <LangVersion>latest</LangVersion> | ||
| <Nullable>enable</Nullable> | ||
| <PackageOutputPath>$(MSBuildThisFileDirectory)bin\$(Configuration)</PackageOutputPath> | ||
| <Company>dotnet campus（.NET 职业技术学院）</Company> | ||
|
|
||
| <!-- 替换下面信息 --> | ||
| <ArtifactsPath>$(MSBuildThisFileDirectory)artifacts</ArtifactsPath> | ||
| <RepositoryRoot>$(MSBuildThisFileDirectory)</RepositoryRoot> | ||
| </PropertyGroup> | ||
|
|
||
| <!--库信息 --> | ||
| <PropertyGroup> | ||
| <Description>提供统一的日志记录方法。使用源生成器允许库的作者在不依赖本日志库的情况下完成日志的记录，并且还能对接到产品中完成日志的统一输出。</Description> | ||
| <Authors>dotnet-campus</Authors> | ||
| <Company>dotnet campus（.NET 职业技术学院）</Company> | ||
| <Copyright>Copyright 2020-$([System.DateTime]::Now.ToString(`yyyy`)) © dotnet campus, All Rights Reserved.</Copyright> | ||
| <RepositoryType>git</RepositoryType> | ||
| <RepositoryUrl>https://github.com/dotnet-campus/dotnetCampus.Logger</RepositoryUrl> | ||
| <PackageProjectUrl>https://github.com/dotnet-campus/dotnetCampus.Logger</PackageProjectUrl> | ||
| <Description>提供统一的日志记录方法，并附带各种各样的实现。</Description> | ||
|
|
||
| <RepositoryType>git</RepositoryType> | ||
| <Copyright>Copyright © 2020 dotnet campus, All Rights Reserved.</Copyright> | ||
| </PropertyGroup> | ||
| </Project> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <Version>0.1.0-alpha</Version> | ||
| <Version>0.1.0-alpha01</Version> | ||
| </PropertyGroup> | ||
| </Project> | ||
| </Project> |
Oops, something went wrong.