Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
alexmg committed May 4, 2015
2 parents f3c40b9 + e416881 commit c9b56b7
Show file tree
Hide file tree
Showing 210 changed files with 1,174 additions and 3,430 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ ClientBin/
node_modules/
bower_components/
wwwroot/
project.lock.json

# RIA/Silverlight projects
Generated_Code/
Expand Down
52 changes: 6 additions & 46 deletions Autofac.sln
Original file line number Diff line number Diff line change
@@ -1,27 +1,21 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
VisualStudioVersion = 14.0.22609.0
VisualStudioVersion = 14.0.22823.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac", "src\Autofac\Autofac.kproj", "{198CE8BE-0C4A-4DA6-8FFE-C5F949B2BBBF}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac", "src\Autofac\Autofac.xproj", "{198CE8BE-0C4A-4DA6-8FFE-C5F949B2BBBF}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{5A54DF18-E3F3-4929-876D-00650A15763E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DEA4A8C6-DE56-4359-A87C-472FB34132E7}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Test", "test\Autofac.Test\Autofac.Test.kproj", "{48EC73A9-9AA0-4063-9FEE-AE5BB43C66B0}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Test", "test\Autofac.Test\Autofac.Test.xproj", "{48EC73A9-9AA0-4063-9FEE-AE5BB43C66B0}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Test.Scenarios.ScannedAssembly", "test\Autofac.Test.Scenarios.ScannedAssembly\Autofac.Test.Scenarios.ScannedAssembly.kproj", "{376ADF06-0774-4C00-AE45-4B0DF63779B2}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Test.Scenarios.ScannedAssembly", "test\Autofac.Test.Scenarios.ScannedAssembly\Autofac.Test.Scenarios.ScannedAssembly.xproj", "{376ADF06-0774-4C00-AE45-4B0DF63779B2}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F3C8D3C7-793A-4578-BBF1-421E94375DF7}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Dnx", "src\Autofac.Dnx\Autofac.Dnx.xproj", "{513C7F7A-A758-4D48-94F4-891A00F63DA1}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Dnx", "src\Autofac.Dnx\Autofac.Dnx.kproj", "{513C7F7A-A758-4D48-94F4-891A00F63DA1}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutofacWebApiSample", "samples\AutofacWebApiSample\AutofacWebApiSample.kproj", "{4F4B332C-2089-4CE2-8C24-37A2016B0974}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AutofacWebApplicationSample", "samples\AutofacWebApplicationSample\AutofacWebApplicationSample.kproj", "{7018E664-6F39-415E-BB85-43496836A8B2}"
EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Dnx.Test", "test\Autofac.Dnx.Test\Autofac.Dnx.Test.kproj", "{911AA52A-4E68-41C5-AB24-D1618AFDF753}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Autofac.Dnx.Test", "test\Autofac.Dnx.Test\Autofac.Dnx.Test.xproj", "{911AA52A-4E68-41C5-AB24-D1618AFDF753}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -99,38 +93,6 @@ Global
{513C7F7A-A758-4D48-94F4-891A00F63DA1}.Release|x64.Build.0 = Release|Any CPU
{513C7F7A-A758-4D48-94F4-891A00F63DA1}.Release|x86.ActiveCfg = Release|Any CPU
{513C7F7A-A758-4D48-94F4-891A00F63DA1}.Release|x86.Build.0 = Release|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Debug|ARM.ActiveCfg = Debug|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Debug|ARM.Build.0 = Debug|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Debug|x64.ActiveCfg = Debug|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Debug|x64.Build.0 = Debug|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Debug|x86.ActiveCfg = Debug|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Debug|x86.Build.0 = Debug|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Release|Any CPU.Build.0 = Release|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Release|ARM.ActiveCfg = Release|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Release|ARM.Build.0 = Release|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Release|x64.ActiveCfg = Release|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Release|x64.Build.0 = Release|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Release|x86.ActiveCfg = Release|Any CPU
{4F4B332C-2089-4CE2-8C24-37A2016B0974}.Release|x86.Build.0 = Release|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Debug|ARM.ActiveCfg = Debug|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Debug|ARM.Build.0 = Debug|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Debug|x64.ActiveCfg = Debug|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Debug|x64.Build.0 = Debug|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Debug|x86.ActiveCfg = Debug|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Debug|x86.Build.0 = Debug|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Release|Any CPU.Build.0 = Release|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Release|ARM.ActiveCfg = Release|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Release|ARM.Build.0 = Release|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Release|x64.ActiveCfg = Release|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Release|x64.Build.0 = Release|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Release|x86.ActiveCfg = Release|Any CPU
{7018E664-6F39-415E-BB85-43496836A8B2}.Release|x86.Build.0 = Release|Any CPU
{911AA52A-4E68-41C5-AB24-D1618AFDF753}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{911AA52A-4E68-41C5-AB24-D1618AFDF753}.Debug|Any CPU.Build.0 = Debug|Any CPU
{911AA52A-4E68-41C5-AB24-D1618AFDF753}.Debug|ARM.ActiveCfg = Debug|Any CPU
Expand All @@ -156,8 +118,6 @@ Global
{48EC73A9-9AA0-4063-9FEE-AE5BB43C66B0} = {DEA4A8C6-DE56-4359-A87C-472FB34132E7}
{376ADF06-0774-4C00-AE45-4B0DF63779B2} = {DEA4A8C6-DE56-4359-A87C-472FB34132E7}
{513C7F7A-A758-4D48-94F4-891A00F63DA1} = {5A54DF18-E3F3-4929-876D-00650A15763E}
{4F4B332C-2089-4CE2-8C24-37A2016B0974} = {F3C8D3C7-793A-4578-BBF1-421E94375DF7}
{7018E664-6F39-415E-BB85-43496836A8B2} = {F3C8D3C7-793A-4578-BBF1-421E94375DF7}
{911AA52A-4E68-41C5-AB24-D1618AFDF753} = {DEA4A8C6-DE56-4359-A87C-472FB34132E7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
Expand Down
1 change: 1 addition & 0 deletions Autofac.sln.DotSettings
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileEB16E81C9EAE5B4B93A37F0642E441EE/RelativePriority/@EntryValue">2</s:Double>
<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File_003A_003AD_003A_005CDevelopment_005COSS_005CAutofac_005CAutofac_002Esln_002EDotSettings/@KeyIndexDefined">True</s:Boolean>
<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=File_003A_003AD_003A_005CDevelopment_005COSS_005CAutofac_005CAutofac_002Esln_002EDotSettings/RelativePriority/@EntryValue">1</s:Double>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EAddAccessorOwnerDeclarationBracesMigration/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateThisQualifierSettings/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
2 changes: 1 addition & 1 deletion NuGet.Config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="AspNetRelease" value="https://www.myget.org/F/aspnetrelease/api/v2" />
<add key="NuGet.org" value="https://nuget.org/api/v2/" />
<add key="CI Builds (xunit)" value="https://www.myget.org/F/xunit/" />
</packageSources>
</configuration>
10 changes: 9 additions & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,21 @@ configuration: Release
nuget:
disable_publish_on_pr: true

clone_depth: 1

test: off

build_script:
- build.cmd

artifacts:
- path: artifacts\packages\**\*.nupkg
name: MyGet

deploy:
- provider: NuGet
server: https://www.myget.org/F/autofac/
api_key:
secure: N4KZCRegcmenMoJ0peZfQwDzqq+Wt4oxGzNTgvkrDxgWyZhw7hNwKmd4n2AsNKQX
symbol_server: https://nuget.symbolsource.org/MyGet/autofac
artifact: Autofac\..*\.nupkg
artifact: MyGet
74 changes: 53 additions & 21 deletions build.cmd
Original file line number Diff line number Diff line change
@@ -1,28 +1,60 @@
@echo off
cd %~dp0
@ECHO OFF

SETLOCAL
SET CACHED_NUGET=%LocalAppData%\NuGet\NuGet.exe
PUSHD %~dp0

IF EXIST %CACHED_NUGET% goto copynuget
echo Downloading latest version of NuGet.exe...
IF NOT EXIST %LocalAppData%\NuGet md %LocalAppData%\NuGet
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "$ProgressPreference = 'SilentlyContinue'; Invoke-WebRequest 'https://www.nuget.org/nuget.exe' -OutFile '%CACHED_NUGET%'"
:dnvminstall
SETLOCAL EnableDelayedExpansion
where dnvm
IF %ERRORLEVEL% neq 0 (
@powershell -NoProfile -ExecutionPolicy unrestricted -Command "&{$Branch='dev';iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/aspnet/Home/dev/dnvminstall.ps1'))}"
SET PATH=!PATH!;!userprofile!\.dnx\bin
SET DNX_HOME=!USERPROFILE!\.dnx
GOTO install
)

:copynuget
IF EXIST .nuget\nuget.exe goto restore
md .nuget
copy %CACHED_NUGET% .nuget\nuget.exe > nul
:install
CALL dnvm install 1.0.0-beta4 -r CoreCLR
CALL dnvm install 1.0.0-beta4 -r CLR
CALL dnvm use 1.0.0-beta4 -r CLR

:restore
IF EXIST packages\KoreBuild goto run
.nuget\NuGet.exe install KoreBuild -ExcludeVersion -o packages -nocache -pre
.nuget\NuGet.exe install Sake -version 0.2 -o packages -ExcludeVersion
CALL dnu restore src\Autofac
IF %errorlevel% neq 0 EXIT /b %errorlevel%

IF "%SKIP_KRE_INSTALL%"=="1" goto run
CALL packages\KoreBuild\build\kvm upgrade -runtime CLR -x86
CALL packages\KoreBuild\build\kvm install default -runtime CoreCLR -x86
CALL dnu restore src\Autofac.Dnx
IF %errorlevel% neq 0 EXIT /b %errorlevel%

:run
CALL packages\KoreBuild\build\kvm use default -runtime CLR -x86
packages\Sake\tools\Sake.exe -I packages\KoreBuild\build -f makefile.shade %*
CALL dnu restore test\Autofac.Test
IF %errorlevel% neq 0 EXIT /b %errorlevel%

CALL dnu restore test\Autofac.Dnx.Test
IF %errorlevel% neq 0 EXIT /b %errorlevel%

:pack
SETLOCAL ENABLEEXTENSIONS
IF ERRORLEVEL 1 ECHO Unable to enable extensions
IF DEFINED APPVEYOR_BUILD_NUMBER (SET DNX_BUILD_VERSION=%APPVEYOR_BUILD_NUMBER%) ELSE (SET DNX_BUILD_VERSION=1)
ECHO DNX_BUILD_VERSION=%DNX_BUILD_VERSION%

CALL dnu pack src\Autofac --configuration Release --out artifacts\packages
IF %errorlevel% neq 0 EXIT /b %errorlevel%

CALL dnu pack src\Autofac.Dnx --configuration Release --out artifacts\packages
IF %errorlevel% neq 0 EXIT /b %errorlevel%

:test
CALL dnx test\Autofac.Test test
IF %errorlevel% neq 0 EXIT /b %errorlevel%

CALL dnx test\Autofac.Dnx.Test test
IF %errorlevel% neq 0 EXIT /b %errorlevel%

CALL dnvm use 1.0.0-beta4 -r CoreCLR

CALL dnx test\Autofac.Test test
IF %errorlevel% neq 0 EXIT /b %errorlevel%

CALL dnx test\Autofac.Dnx.Test test
IF %errorlevel% neq 0 EXIT /b %errorlevel%

POPD
38 changes: 0 additions & 38 deletions build.sh

This file was deleted.

1 change: 1 addition & 0 deletions docs/integration/mvc.rst
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ When using the web forms view engine you set the ``Inherits`` attribute on the `

<%@ Page Language="C#" MasterPageFile="~/Views/Shared/Site.Master" Inherits="Example.Views.Shared.CustomViewPage"%>

**Due to an issue with ASP.NET MVC internals, dependency injection is not available for Razor layout pages.** Razor views will work, but layout pages won't. `See issue #349 for more information. <https://github.com/autofac/Autofac/issues/349#issuecomment-33025529>`_

Enable Property Injection for Action Filters
============================================
Expand Down
3 changes: 2 additions & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"sources": ["src"]
"sdk": { "version": "1.0.0-beta4" },
"sources": ["src", "test"]
}
9 changes: 0 additions & 9 deletions go.cmd

This file was deleted.

7 changes: 0 additions & 7 deletions makefile.shade

This file was deleted.

19 changes: 0 additions & 19 deletions samples/AutofacWebApiSample/AutofacModule.cs

This file was deleted.

19 changes: 0 additions & 19 deletions samples/AutofacWebApiSample/AutofacWebApiSample.kproj

This file was deleted.

16 changes: 0 additions & 16 deletions samples/AutofacWebApiSample/Controllers/HomeController.cs

This file was deleted.

49 changes: 0 additions & 49 deletions samples/AutofacWebApiSample/Controllers/ValuesController.cs

This file was deleted.

Loading

0 comments on commit c9b56b7

Please sign in to comment.