224 lines
3.6 KiB
Plaintext
224 lines
3.6 KiB
Plaintext
<<<<<<< HEAD
|
|
/Nirvana.Common/bin
|
|
/Nirvana.Common/obj
|
|
/Nirvana.Data/bin
|
|
/Nirvana.Data/obj
|
|
/YBDevice.Api/bin
|
|
/YBDevice.Api/obj
|
|
/YBDevice.Doc/bin
|
|
/YBDevice.Entity/bin
|
|
/YBDevice.Entity/obj
|
|
/YBDevice.NApi/bin
|
|
/YBDevice.NApi/obj
|
|
/YBDevice.NApi/App_Data
|
|
/YBDevice.NWeb/bin
|
|
/YBDevice.NWeb/obj
|
|
/YBDevice.Service/bin
|
|
/YBDevice.Service/obj
|
|
/YBDevice.Web/bin
|
|
/YBDevice.Web/obj
|
|
/YBDevice.WX/App_Data
|
|
/YBDevice.WX/bin
|
|
/YBDevice.WX/obj
|
|
=======
|
|
## 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/
|
|
[Rr]elease/
|
|
[Rr]eleases/
|
|
x64/
|
|
build/
|
|
bld/
|
|
[Bb]in/
|
|
[Oo]bj/
|
|
|
|
# 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
|
|
*.ilk
|
|
*.meta
|
|
*.obj
|
|
*.pch
|
|
*.pdb
|
|
*.pgc
|
|
*.pgd
|
|
*.rsp
|
|
*.sbr
|
|
*.tlb
|
|
*.tli
|
|
*.tlh
|
|
*.tmp
|
|
*.tmp_proj
|
|
*.log
|
|
*.vspscc
|
|
*.vssscc
|
|
.builds
|
|
*.pidb
|
|
*.svclog
|
|
*.scc
|
|
|
|
# Chutzpah Test files
|
|
_Chutzpah*
|
|
|
|
# Visual C++ cache files
|
|
ipch/
|
|
*.aps
|
|
*.ncb
|
|
*.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
|
|
DocProject/Help/*.HxC
|
|
DocProject/Help/*.hhc
|
|
DocProject/Help/*.hhk
|
|
DocProject/Help/*.hhp
|
|
DocProject/Help/Html2
|
|
DocProject/Help/html
|
|
|
|
# Click-Once directory
|
|
publish/
|
|
|
|
# Publish Web Output
|
|
*.[Pp]ublish.xml
|
|
*.azurePubxml
|
|
## TODO: Comment the next line if you want to checkin your
|
|
## 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
|
|
ClientBin/
|
|
[Ss]tyle[Cc]op.*
|
|
~$*
|
|
*~
|
|
*.dbmdl
|
|
*.dbproj.schemaview
|
|
*.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 ;-)
|
|
_UpgradeReport_Files/
|
|
Backup*/
|
|
UpgradeLog*.XML
|
|
UpgradeLog*.htm
|
|
|
|
# SQL Server files
|
|
*.mdf
|
|
*.ldf
|
|
|
|
# Business Intelligence projects
|
|
*.rdl.data
|
|
*.bim.layout
|
|
*.bim_*.settings
|
|
|
|
# Microsoft Fakes
|
|
FakesAssemblies/
|
|
>>>>>>> e37f36874d81bb4f9280613ff0f61b5f75825c27
|
|
/YBDevice.Doc/obj
|
|
/.vs
|
|
/YBDevice.NWeb/wwwroot/uploadfiles/files/business/20211115
|
|
/YBDevice.NWeb/wwwroot/uploadfiles
|
|
/YBDevice.NWeb/wwwroot/js/index.min.js
|
|
/YBDevice.NWeb/wwwroot/js/login.min.js
|
|
/YBDevice.NWeb/wwwroot/download/device
|
|
/App/DouYin/.hbuilderx
|
|
/App/DouYin/unpackage
|
|
/YBDevice.NApi/wwwroot/uploadfiles/images/share
|
|
/YBDevice.NWeb/wwwroot/css/page.min.css
|
|
/YBDevice.NWeb/wwwroot/js/page.min.js
|
|
/App/zhuangxiang/unpackage
|