Skip to content

Commit 53b6d70

Browse files
tilligtillig
committed
Updated to .NET 4.5 and VS 2015.
1 parent 3d2d061 commit 53b6d70

File tree

11 files changed

+246
-126
lines changed

11 files changed

+246
-126
lines changed

‎.editorconfig‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
; EditorConfig to support per-solution formatting.
2+
; Use the EditorConfig VS add-in to make this work.
3+
; http://editorconfig.org/
4+
5+
; This is the default for the codeline.
6+
root = true
7+
8+
[*]
9+
end_of_line = CRLF
10+
11+
[*.{config,cs,json,xml}]
12+
indent_style = space
13+
indent_size = 4
14+
trim_trailing_whitespace = true
15+
16+
[*.{proj,props,sln,targets}]
17+
indent_style = tab
18+
trim_trailing_whitespace = true
19+
20+
[*.{kproj,csproj,ps1,resx,rst}]
21+
indent_style = space
22+
indent_size = 2
23+
trim_trailing_whitespace = true
24+
25+
[NuGet.Config]
26+
indent_style = space
27+
indent_size = 2
28+
trim_trailing_whitespace = true

‎.gitattributes‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
*.doc diff=astextplain
2+
*.DOC diff=astextplain
3+
*.docx diff=astextplain
4+
*.DOCX diff=astextplain
5+
*.dot diff=astextplain
6+
*.DOT diff=astextplain
7+
*.pdf diff=astextplain
8+
*.PDF diff=astextplain
9+
*.rtf diff=astextplain
10+
*.RTF diff=astextplain
11+
12+
*.jpg binary
13+
*.png binary
14+
*.gif binary
15+
16+
*.cs text=auto diff=csharp
17+
*.vb text=auto
18+
*.resx text=auto
19+
*.c text=auto
20+
*.cpp text=auto
21+
*.cxx text=auto
22+
*.h text=auto
23+
*.hxx text=auto
24+
*.py text=auto
25+
*.rb text=auto
26+
*.java text=auto
27+
*.html text=auto
28+
*.htm text=auto
29+
*.css text=auto
30+
*.scss text=auto
31+
*.sass text=auto
32+
*.less text=auto
33+
*.js text=auto
34+
*.lisp text=auto
35+
*.clj text=auto
36+
*.sql text=auto
37+
*.php text=auto
38+
*.lua text=auto
39+
*.m text=auto
40+
*.asm text=auto
41+
*.erl text=auto
42+
*.fs text=auto
43+
*.fsx text=auto
44+
*.hs text=auto
45+
46+
*.csproj text=auto
47+
*.vbproj text=auto
48+
*.fsproj text=auto
49+
*.dbproj text=auto
50+
*.sln text=auto eol=crlf

‎.gitignore‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,13 @@
44
# User-specific files
55
*.suo
66
*.user
7-
*.sln.docstates
7+
*.docstates
8+
*.cache
9+
*.userprefs
10+
project.lock.json
11+
.vs/
12+
[Ii]ndex.dat
13+
[Ss]torage.dat
814

915
# Build results
1016
[Dd]ebug/
@@ -17,6 +23,7 @@ build/
1723
bld/
1824
[Bb]in/
1925
[Oo]bj/
26+
[Aa]rtifacts/
2027

2128
# Roslyn cache directories
2229
*.ide/
@@ -65,6 +72,7 @@ _Chutzpah*
6572
# Visual C++ cache files
6673
ipch/
6774
*.aps
75+
*.ipch
6876
*.ncb
6977
*.opensdf
7078
*.sdf
@@ -98,6 +106,7 @@ _TeamCity*
98106
# NCrunch
99107
_NCrunch_*
100108
.*crunch*.local.xml
109+
*.ncrunchsolution
101110

102111
# MightyMoose
103112
*.mm.*
@@ -125,19 +134,25 @@ publish/
125134
# Publish Web Output
126135
*.[Pp]ublish.xml
127136
*.azurePubxml
128-
# TODO: Comment the next line if you want to checkin your web deploy settings
137+
[Pp]ublish[Pp]rofiles/
138+
# TODO: Comment the next line if you want to checkin your web deploy settings
129139
# but database connection strings (with potential passwords) will be unencrypted
130140
*.pubxml
131141
*.publishproj
132142

133143
# NuGet Packages
134144
*.nupkg
135145
# The packages folder can be ignored because of Package Restore
136-
/packages/*
146+
**/packages/*
137147
# except build/, which is used as an MSBuild target.
138148
!**/packages/build/
149+
# Don't check in NuGet proper
150+
.nuget/
151+
nuget.exe
139152
# If using the old MSBuild-Integrated Package Restore, uncomment this:
140153
#!**/packages/repositories.config
154+
# Local filesystem/test NuGet
155+
local-nuget/
141156

142157
# Windows Azure Build Output
143158
csx/
@@ -181,3 +196,6 @@ UpgradeLog*.htm
181196

182197
# Microsoft Fakes
183198
FakesAssemblies/
199+
200+
# Mac OS
201+
*DS_Store

‎Autofac.Extras.NHibernate.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.23107.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Extras.NHibernate", "src\Autofac.Extras.NHibernate\Autofac.Extras.NHibernate.csproj", "{1263412A-440E-41F1-9729-3A2B58B03124}"
77
EndProject

‎NuGet.Config‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<packageSources>
4+
<clear />
5+
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
6+
<add key="AspNetMaster" value="https://www.myget.org/F/aspnetmaster/api/v2" />
7+
<add key="Autofac MyGet" value="https://www.myget.org/F/autofac/api/v2" />
8+
<add key="xUnit.net" value="https://www.myget.org/F/xunit/api/v2/" />
9+
<add key="NuGet v2" value="https://www.nuget.org/api/v2" />
10+
<add key="NuGet v3" value="https://api.nuget.org/v3/index.json" />
11+
</packageSources>
12+
<disabledPackageSources>
13+
<add key="AspNetVNext" value="true" />
14+
<add key="AspNetMaster" value="true" />
15+
<add key="Autofac MyGet" value="true" />
16+
<add key="NuGet v3" value="true" />
17+
</disabledPackageSources>
18+
</configuration>

‎README.md‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11
# Autofac.Extras.NHibernate
2-
Autofac implementation of the NHibernate factories that allow for dependency injection into entities and NHibernate objects.
2+
[Autofac](http://autofac.org) implementation of the NHibernate factories that allow for dependency injection into entities and NHibernate objects.
33

4-
[![Build status](https://ci.appveyor.com/api/projects/status/vpkf5dlbw5ehfeng?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-nhibernate)
4+
[![Build status](https://ci.appveyor.com/api/projects/status/vpkf5dlbw5ehfeng?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-nhibernate)
5+
6+
**MAINTENANCE MODE**: This package is in maintenance-only mode. Bug fixes may be addressed and Autofac compatibility may be checked but no new features will be added.
7+
8+
Please file issues and pull requests for this package in this repository rather than in the Autofac core repo.
9+
10+
- [NuGet](https://www.nuget.org/packages/Autofac.Extras.NHibernate/)
11+
- [Contributing](http://autofac.readthedocs.org/en/latest/contributors.html)

‎appveyor.yml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
1-
version: 3.0.1.{build}
1+
environment:
2+
package_semantic_version: 4.0.0
3+
assembly_semantic_version: 4.0.0
4+
5+
version: $(package_semantic_version).{build}
26

37
assembly_info:
48
patch: true
5-
file: AssemblyInfo.cs
6-
assembly_version: "3.0.0.0"
7-
assembly_file_version: "{version}"
8-
assembly_informational_version: "3.0.1-CI-{build}"
9+
file: '**\AssemblyInfo.*'
10+
assembly_version: '$(assembly_semantic_version).0'
11+
assembly_file_version: '$(appveyor_build_version)'
12+
assembly_informational_version: '$(package_semantic_version)-CI-{build}'
913

1014
configuration: Release
1115

12-
before_build: nuget restore
16+
before_build:
17+
- nuget restore
1318

1419
build:
1520
verbosity: minimal

0 commit comments

Comments
 (0)