Skip to content

Commit

Permalink
Updated to .NET 4.5. Switched tests to XUnit. Enabled for Autofac 4 c…
Browse files Browse the repository at this point in the history
…ompatibility.
  • Loading branch information
tillig committed Jan 12, 2016
1 parent c227fea commit d00c65d
Show file tree
Hide file tree
Showing 17 changed files with 544 additions and 460 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
6 changes: 3 additions & 3 deletions Autofac.Web.sln
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@

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.Integration.Web", "src\Autofac.Integration.Web\Autofac.Integration.Web.csproj", "{4BDD9D14-BACA-416C-919E-E9FF100F8F5D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Tests.Integration.Web", "tests\Autofac.Tests.Integration.Web\Autofac.Tests.Integration.Web.csproj", "{929BAA80-5ED7-484B-81C8-A4ACC9FF2009}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Integration.Web.Test", "test\Autofac.Integration.Web.Test\Autofac.Integration.Web.Test.csproj", "{929BAA80-5ED7-484B-81C8-A4ACC9FF2009}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
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>
13 changes: 10 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# Autofac.Web
ASP.NET WebForms integration for Autofac
#Autofac.Web

[![Build status](https://ci.appveyor.com/api/projects/status/m440xdhvmm15iiw0?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-web)
ASP.NET web forms integration for [Autofac](http://autofac.org).

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

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

- [Documentation](http://autofac.readthedocs.org/en/latest/integration/webforms.html)
- [NuGet](https://www.nuget.org/packages/Autofac.Web/)
- [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.2.0.{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.2.0.0"
assembly_file_version: "{version}"
assembly_informational_version: "3.2.0-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 d00c65d

Please sign in to comment.