From 6ec12a036c96a200fc0a941967d6b4d07592f863 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 17 十二月 2020 14:31:17 +0800
Subject: [PATCH] Merge branch 'tzy' into NewFilePath

---
 .gitignore |   69 ++++++++++++++++++----------------
 1 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c38a68..a2a2b22 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
-
+ 
 # User-specific files
 *.suo
 *.user
 *.sln.docstates
-
+ 
 # Build results
 [Dd]ebug/
 [Dd]ebugPublic/
@@ -16,23 +16,26 @@
 bld/
 [Bb]in/
 [Oo]bj/
-
+.vs/
+.gitignore
+.Dll/
+ 
 # Roslyn cache directories
 *.ide/
-
+ 
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
-
+ 
 #NUNIT
 *.VisualState.xml
 TestResult.xml
-
+ 
 # Build Results of an ATL Project
 [Dd]ebugPS/
 [Rr]eleasePS/
 dlldata.c
-
+ 
 *_i.c
 *_p.c
 *_i.h
@@ -57,10 +60,10 @@
 *.pidb
 *.svclog
 *.scc
-
+ 
 # Chutzpah Test files
 _Chutzpah*
-
+ 
 # Visual C++ cache files
 ipch/
 *.aps
@@ -68,46 +71,46 @@
 *.opensdf
 *.sdf
 *.cachefile
-
+ 
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
-
+ 
 # TFS 2012 Local Workspace
 $tf/
-
+ 
 # Guidance Automation Toolkit
 *.gpState
-
+ 
 # ReSharper is a .NET coding add-in
 _ReSharper*/
 *.[Rr]e[Ss]harper
 *.DotSettings.user
-
+ 
 # JustCode is a .NET coding addin-in
 .JustCode
-
+ 
 # TeamCity is a build add-in
 _TeamCity*
-
+ 
 # DotCover is a Code Coverage Tool
 *.dotCover
-
+ 
 # NCrunch
 _NCrunch_*
 .*crunch*.local.xml
-
+ 
 # MightyMoose
 *.mm.*
 AutoTest.Net/
-
+ 
 # Web workbench (sass)
 .sass-cache/
-
+ 
 # Installshield output folder
 [Ee]xpress/
-
+ 
 # DocProject is a documentation generator add-in
 DocProject/buildhelp/
 DocProject/Help/*.HxT
@@ -117,10 +120,10 @@
 DocProject/Help/*.hhp
 DocProject/Help/Html2
 DocProject/Help/html
-
+ 
 # Click-Once directory
 publish/
-
+ 
 # Publish Web Output
 *.[Pp]ublish.xml
 *.azurePubxml
@@ -128,27 +131,27 @@
 ## web deploy settings but do note that will include unencrypted
 ## passwords
 *.pubxml
-
+ 
 # NuGet Packages
 packages/*
 *.nupkg
 ## TODO: If the tool you use requires repositories.config
 ## uncomment the next line
 #!packages/repositories.config
-
+ 
 # Enable "build/" folder in the NuGet Packages folder since
 # NuGet packages use it for MSBuild targets.
 # This line needs to be after the ignore of the build folder
 # (and the packages folder if the line above has been uncommented)
 !packages/build/
-
+ 
 # Windows Azure Build Output
 csx/
 *.build.csdef
-
+ 
 # Windows Store app package directory
 AppPackages/
-
+ 
 # Others
 sql/
 *.Cache
@@ -161,10 +164,10 @@
 *.pfx
 *.publishsettings
 node_modules/
-
+ 
 # RIA/Silverlight projects
 Generated_Code/
-
+ 
 # Backup & report files from converting an old project file
 # to a newer Visual Studio version. Backup files are not needed,
 # because we have git ;-)
@@ -172,15 +175,15 @@
 Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
-
+ 
 # SQL Server files
 *.mdf
 *.ldf
-
+ 
 # Business Intelligence projects
 *.rdl.data
 *.bim.layout
 *.bim_*.settings
-
+ 
 # Microsoft Fakes
 FakesAssemblies/

--
Gitblit v1.8.0