Skip to content

Commit

Permalink
Updated to .NET 4.5 and VS 2015.
Browse files Browse the repository at this point in the history
  • Loading branch information
tillig committed Nov 11, 2015
1 parent 3d2d061 commit 53b6d70
Show file tree
Hide file tree
Showing 11 changed files with 246 additions and 126 deletions.
28 changes: 28 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
; EditorConfig to support per-solution formatting.
; Use the EditorConfig VS add-in to make this work.
; http://editorconfig.org/

; This is the default for the codeline.
root = true

[*]
end_of_line = CRLF

[*.{config,cs,json,xml}]
indent_style = space
indent_size = 4
trim_trailing_whitespace = true

[*.{proj,props,sln,targets}]
indent_style = tab
trim_trailing_whitespace = true

[*.{kproj,csproj,ps1,resx,rst}]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true

[NuGet.Config]
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
50 changes: 50 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
*.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

*.jpg binary
*.png binary
*.gif binary

*.cs text=auto diff=csharp
*.vb text=auto
*.resx text=auto
*.c text=auto
*.cpp text=auto
*.cxx text=auto
*.h text=auto
*.hxx text=auto
*.py text=auto
*.rb text=auto
*.java text=auto
*.html text=auto
*.htm text=auto
*.css text=auto
*.scss text=auto
*.sass text=auto
*.less text=auto
*.js text=auto
*.lisp text=auto
*.clj text=auto
*.sql text=auto
*.php text=auto
*.lua text=auto
*.m text=auto
*.asm text=auto
*.erl text=auto
*.fs text=auto
*.fsx text=auto
*.hs text=auto

*.csproj text=auto
*.vbproj text=auto
*.fsproj text=auto
*.dbproj text=auto
*.sln text=auto eol=crlf
24 changes: 21 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,13 @@
# User-specific files
*.suo
*.user
*.sln.docstates
*.docstates
*.cache
*.userprefs
project.lock.json
.vs/
[Ii]ndex.dat
[Ss]torage.dat

# Build results
[Dd]ebug/
Expand All @@ -17,6 +23,7 @@ build/
bld/
[Bb]in/
[Oo]bj/
[Aa]rtifacts/

# Roslyn cache directories
*.ide/
Expand Down Expand Up @@ -65,6 +72,7 @@ _Chutzpah*
# Visual C++ cache files
ipch/
*.aps
*.ipch
*.ncb
*.opensdf
*.sdf
Expand Down Expand Up @@ -98,6 +106,7 @@ _TeamCity*
# NCrunch
_NCrunch_*
.*crunch*.local.xml
*.ncrunchsolution

# MightyMoose
*.mm.*
Expand Down Expand Up @@ -125,19 +134,25 @@ publish/
# Publish Web Output
*.[Pp]ublish.xml
*.azurePubxml
# TODO: Comment the next line if you want to checkin your web deploy settings
[Pp]ublish[Pp]rofiles/
# TODO: Comment the next line if you want to checkin your web deploy settings
# but database connection strings (with potential passwords) will be unencrypted
*.pubxml
*.publishproj

# NuGet Packages
*.nupkg
# The packages folder can be ignored because of Package Restore
/packages/*
**/packages/*
# except build/, which is used as an MSBuild target.
!**/packages/build/
# Don't check in NuGet proper
.nuget/
nuget.exe
# If using the old MSBuild-Integrated Package Restore, uncomment this:
#!**/packages/repositories.config
# Local filesystem/test NuGet
local-nuget/

# Windows Azure Build Output
csx/
Expand Down Expand Up @@ -181,3 +196,6 @@ UpgradeLog*.htm

# Microsoft Fakes
FakesAssemblies/

# Mac OS
*DS_Store
4 changes: 2 additions & 2 deletions Autofac.Extras.NHibernate.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.31101.0
# Visual Studio 14
VisualStudioVersion = 14.0.23107.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Extras.NHibernate", "src\Autofac.Extras.NHibernate\Autofac.Extras.NHibernate.csproj", "{1263412A-440E-41F1-9729-3A2B58B03124}"
EndProject
Expand Down
18 changes: 18 additions & 0 deletions NuGet.Config
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<clear />
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetvnext/api/v2" />
<add key="AspNetMaster" value="https://www.myget.org/F/aspnetmaster/api/v2" />
<add key="Autofac MyGet" value="https://www.myget.org/F/autofac/api/v2" />
<add key="xUnit.net" value="https://www.myget.org/F/xunit/api/v2/" />
<add key="NuGet v2" value="https://www.nuget.org/api/v2" />
<add key="NuGet v3" value="https://api.nuget.org/v3/index.json" />
</packageSources>
<disabledPackageSources>
<add key="AspNetVNext" value="true" />
<add key="AspNetMaster" value="true" />
<add key="Autofac MyGet" value="true" />
<add key="NuGet v3" value="true" />
</disabledPackageSources>
</configuration>
11 changes: 9 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# Autofac.Extras.NHibernate
Autofac implementation of the NHibernate factories that allow for dependency injection into entities and NHibernate objects.
[Autofac](http://autofac.org) implementation of the NHibernate factories that allow for dependency injection into entities and NHibernate objects.

[![Build status](https://ci.appveyor.com/api/projects/status/vpkf5dlbw5ehfeng?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-nhibernate)
[![Build status](https://ci.appveyor.com/api/projects/status/vpkf5dlbw5ehfeng?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-nhibernate)

**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.

Please file issues and pull requests for this package in this repository rather than in the Autofac core repo.

- [NuGet](https://www.nuget.org/packages/Autofac.Extras.NHibernate/)
- [Contributing](http://autofac.readthedocs.org/en/latest/contributors.html)
17 changes: 11 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
version: 3.0.1.{build}
environment:
package_semantic_version: 4.0.0
assembly_semantic_version: 4.0.0

version: $(package_semantic_version).{build}

assembly_info:
patch: true
file: AssemblyInfo.cs
assembly_version: "3.0.0.0"
assembly_file_version: "{version}"
assembly_informational_version: "3.0.1-CI-{build}"
file: '**\AssemblyInfo.*'
assembly_version: '$(assembly_semantic_version).0'
assembly_file_version: '$(appveyor_build_version)'
assembly_informational_version: '$(package_semantic_version)-CI-{build}'

configuration: Release

before_build: nuget restore
before_build:
- nuget restore

build:
verbosity: minimal
Expand Down
Loading

0 comments on commit 53b6d70

Please sign in to comment.