Skip to content

Commit 726f24e

Browse files
alistairjevansalistairjevans
committed
Merge branch 'develop'
2 parents 81a4b04 + 44862da commit 726f24e

17 files changed

+629
-649
lines changed

‎.gitignore‎

Lines changed: 174 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -1,170 +1,174 @@
1-
## Ignore Visual Studio temporary files, build results, and
2-
## files generated by popular Visual Studio add-ons.
3-
4-
# Project specific files
5-
artifacts/
6-
7-
# User-specific files
8-
*.suo
9-
*.user
10-
*.sln.docstates
11-
*.ide
12-
Index.dat
13-
Storage.dat
14-
15-
# Build results
16-
[Dd]ebug/
17-
[Rr]elease/
18-
x64/
19-
[Bb]in/
20-
[Oo]bj/
21-
22-
# Visual Studio 2015 cache/options directory
23-
.dotnet/
24-
.vs/
25-
.vscode/
26-
.cr/
27-
28-
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
29-
!packages/*/build/
30-
31-
# MSTest test Results
32-
[Tt]est[Rr]esult*/
33-
[Bb]uild[Ll]og.*
34-
*.TestResults.xml
35-
results/
36-
37-
*_i.c
38-
*_p.c
39-
*.ilk
40-
*.meta
41-
*.obj
42-
*.pch
43-
*.pdb
44-
*.pgc
45-
*.pgd
46-
*.rsp
47-
*.sbr
48-
*.tlb
49-
*.tli
50-
*.tlh
51-
*.tmp
52-
*.tmp_proj
53-
*.log
54-
*.vspscc
55-
*.vssscc
56-
.builds
57-
*.pidb
58-
*.log
59-
*.scc
60-
61-
# Visual C++ cache files
62-
ipch/
63-
*.aps
64-
*.ncb
65-
*.opensdf
66-
*.sdf
67-
*.cachefile
68-
69-
# Visual Studio profiler
70-
*.psess
71-
*.vsp
72-
*.vspx
73-
74-
# Guidance Automation Toolkit
75-
*.gpState
76-
77-
# ReSharper is a .NET coding add-in
78-
_ReSharper*/
79-
*.[Rr]e[Ss]harper
80-
81-
# TeamCity is a build add-in
82-
_TeamCity*
83-
84-
# DotCover is a Code Coverage Tool
85-
*.dotCover
86-
87-
# NCrunch
88-
*.ncrunch*
89-
.*crunch*.local.xml
90-
91-
# Installshield output folder
92-
[Ee]xpress/
93-
94-
# DocProject is a documentation generator add-in
95-
DocProject/buildhelp/
96-
DocProject/Help/*.HxT
97-
DocProject/Help/*.HxC
98-
DocProject/Help/*.hhc
99-
DocProject/Help/*.hhk
100-
DocProject/Help/*.hhp
101-
DocProject/Help/Html2
102-
DocProject/Help/html
103-
104-
# Click-Once directory
105-
publish/
106-
107-
# Publish Web Output
108-
*.[Pp]ublish.xml
109-
*.pubxml
110-
111-
# NuGet Packages Directory
112-
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
113-
packages/
114-
115-
# Windows Azure Build Output
116-
csx
117-
*.build.csdef
118-
119-
# Windows Store app package directory
120-
AppPackages/
121-
122-
# Others
123-
sql/
124-
*.Cache
125-
ClientBin/
126-
[Ss]tyle[Cc]op.*
127-
!stylecop.json
128-
~$*
129-
*~
130-
*.dbmdl
131-
*.pfx
132-
*.publishsettings
133-
node_modules/
134-
bower_components/
135-
wwwroot/
136-
project.lock.json
137-
138-
# RIA/Silverlight projects
139-
Generated_Code/
140-
141-
# Backup & report files from converting an old project file to a newer
142-
# Visual Studio version. Backup files are not needed, because we have git ;-)
143-
_UpgradeReport_Files/
144-
Backup*/
145-
UpgradeLog*.XML
146-
UpgradeLog*.htm
147-
148-
# SQL Server files
149-
App_Data/*.mdf
150-
App_Data/*.ldf
151-
152-
# =========================
153-
# Windows detritus
154-
# =========================
155-
156-
# Windows image file caches
157-
Thumbs.db
158-
ehthumbs.db
159-
160-
# Folder config file
161-
Desktop.ini
162-
163-
# Recycle Bin used on file shares
164-
$RECYCLE.BIN/
165-
166-
# Mac crap
167-
.DS_Store
168-
169-
# JetBrains Rider
170-
.idea
1+
## Ignore Visual Studio temporary files, build results, and
2+
## files generated by popular Visual Studio add-ons.
3+
4+
# Project specific files
5+
artifacts/
6+
7+
# User-specific files
8+
*.suo
9+
*.user
10+
*.sln.docstates
11+
*.ide
12+
Index.dat
13+
Storage.dat
14+
15+
# Build results
16+
[Dd]ebug/
17+
[Rr]elease/
18+
x64/
19+
[Bb]in/
20+
[Oo]bj/
21+
22+
# Visual Studio 2015 cache/options directory
23+
.dotnet/
24+
.vs/
25+
.cr/
26+
27+
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
28+
!packages/*/build/
29+
30+
# MSTest test Results
31+
[Tt]est[Rr]esult*/
32+
[Bb]uild[Ll]og.*
33+
*.TestResults.xml
34+
results/
35+
36+
*_i.c
37+
*_p.c
38+
*.ilk
39+
*.meta
40+
*.obj
41+
*.pch
42+
*.pdb
43+
*.pgc
44+
*.pgd
45+
*.rsp
46+
*.sbr
47+
*.tlb
48+
*.tli
49+
*.tlh
50+
*.tmp
51+
*.tmp_proj
52+
*.log
53+
*.vspscc
54+
*.vssscc
55+
.builds
56+
*.pidb
57+
*.log
58+
*.scc
59+
60+
# Visual C++ cache files
61+
ipch/
62+
*.aps
63+
*.ncb
64+
*.opensdf
65+
*.sdf
66+
*.cachefile
67+
68+
# Visual Studio profiler
69+
*.psess
70+
*.vsp
71+
*.vspx
72+
73+
# Guidance Automation Toolkit
74+
*.gpState
75+
76+
# ReSharper is a .NET coding add-in
77+
_ReSharper*/
78+
*.[Rr]e[Ss]harper
79+
80+
# TeamCity is a build add-in
81+
_TeamCity*
82+
83+
# DotCover is a Code Coverage Tool
84+
*.dotCover
85+
86+
# Coverage
87+
coverage.*
88+
codecov.sh
89+
coverage/
90+
91+
# NCrunch
92+
*.ncrunch*
93+
.*crunch*.local.xml
94+
95+
# Installshield output folder
96+
[Ee]xpress/
97+
98+
# DocProject is a documentation generator add-in
99+
DocProject/buildhelp/
100+
DocProject/Help/*.HxT
101+
DocProject/Help/*.HxC
102+
DocProject/Help/*.hhc
103+
DocProject/Help/*.hhk
104+
DocProject/Help/*.hhp
105+
DocProject/Help/Html2
106+
DocProject/Help/html
107+
108+
# Click-Once directory
109+
publish/
110+
111+
# Publish Web Output
112+
*.[Pp]ublish.xml
113+
*.pubxml
114+
115+
# NuGet Packages Directory
116+
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
117+
packages/
118+
119+
# Windows Azure Build Output
120+
csx
121+
*.build.csdef
122+
123+
# Windows Store app package directory
124+
AppPackages/
125+
126+
# Others
127+
sql/
128+
*.Cache
129+
ClientBin/
130+
[Ss]tyle[Cc]op.*
131+
!stylecop.json
132+
~$*
133+
*~
134+
*.dbmdl
135+
*.pfx
136+
*.publishsettings
137+
node_modules/
138+
bower_components/
139+
wwwroot/
140+
project.lock.json
141+
142+
# RIA/Silverlight projects
143+
Generated_Code/
144+
145+
# Backup & report files from converting an old project file to a newer
146+
# Visual Studio version. Backup files are not needed, because we have git ;-)
147+
_UpgradeReport_Files/
148+
Backup*/
149+
UpgradeLog*.XML
150+
UpgradeLog*.htm
151+
152+
# SQL Server files
153+
App_Data/*.mdf
154+
App_Data/*.ldf
155+
156+
# =========================
157+
# Windows detritus
158+
# =========================
159+
160+
# Windows image file caches
161+
Thumbs.db
162+
ehthumbs.db
163+
164+
# Folder config file
165+
Desktop.ini
166+
167+
# Recycle Bin used on file shares
168+
$RECYCLE.BIN/
169+
170+
# Mac crap
171+
.DS_Store
172+
173+
# JetBrains Rider
174+
.idea

‎Autofac.Multitenant.sln‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,24 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.Multitenant.Test",
1313
EndProject
1414
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Autofac.Multitenant.AspNetCore.Test", "test\Autofac.Multitenant.AspNetCore.Test\Autofac.Multitenant.AspNetCore.Test.csproj", "{41D7953E-F018-455A-A669-4E02803800D0}"
1515
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{C52CD612-DF58-4C64-BBF3-194BB3F92B1F}"
17+
ProjectSection(SolutionItems) = preProject
18+
build\CodeAnalysisDictionary.xml = build\CodeAnalysisDictionary.xml
19+
build\Autofac.Build.psm1 = build\Autofac.Build.psm1
20+
build\Autofac.Build.psd1 = build\Autofac.Build.psd1
21+
build\Analyzers.ruleset = build\Analyzers.ruleset
22+
EndProjectSection
23+
EndProject
24+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{815BE18D-02C4-43E5-8DBF-ECDFA838C39E}"
25+
ProjectSection(SolutionItems) = preProject
26+
global.json = global.json
27+
NuGet.Config = NuGet.Config
28+
build.ps1 = build.ps1
29+
README.md = README.md
30+
appveyor.yml = appveyor.yml
31+
codecov.yml = codecov.yml
32+
EndProjectSection
33+
EndProject
1634
Global
1735
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1836
Debug|Any CPU = Debug|Any CPU

0 commit comments

Comments
 (0)