diff --git a/.gitignore b/.gitignore index fd5204b..d61be7b 100644 --- a/.gitignore +++ b/.gitignore @@ -133,7 +133,7 @@ publish/ # 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/ # If using the old MSBuild-Integrated Package Restore, uncomment this: diff --git a/Autofac.Web.sln b/Autofac.Web.sln new file mode 100644 index 0000000..07cee51 --- /dev/null +++ b/Autofac.Web.sln @@ -0,0 +1,28 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.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}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {4BDD9D14-BACA-416C-919E-E9FF100F8F5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4BDD9D14-BACA-416C-919E-E9FF100F8F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4BDD9D14-BACA-416C-919E-E9FF100F8F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4BDD9D14-BACA-416C-919E-E9FF100F8F5D}.Release|Any CPU.Build.0 = Release|Any CPU + {929BAA80-5ED7-484B-81C8-A4ACC9FF2009}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {929BAA80-5ED7-484B-81C8-A4ACC9FF2009}.Debug|Any CPU.Build.0 = Debug|Any CPU + {929BAA80-5ED7-484B-81C8-A4ACC9FF2009}.Release|Any CPU.ActiveCfg = Release|Any CPU + {929BAA80-5ED7-484B-81C8-A4ACC9FF2009}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Autofac.snk b/Autofac.snk new file mode 100644 index 0000000..8c803ff Binary files /dev/null and b/Autofac.snk differ diff --git a/CodeAnalysisDictionary.xml b/CodeAnalysisDictionary.xml new file mode 100644 index 0000000..e15c3b3 --- /dev/null +++ b/CodeAnalysisDictionary.xml @@ -0,0 +1,47 @@ + + + + + + + + Api + Autofac + autowired + autowiring + composable + configurator + Ioc + Mef + Moq + multitenancy + Mvc + Mvx + Mvvm + startable + Owin + + + + + diff --git a/Full.ruleset b/Full.ruleset new file mode 100644 index 0000000..417a489 --- /dev/null +++ b/Full.ruleset @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 7080406..4925cc6 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # Autofac.Web ASP.NET WebForms integration for Autofac + +[![Build status](https://ci.appveyor.com/api/projects/status/m440xdhvmm15iiw0?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-web) \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..b52c4e5 --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,24 @@ +version: 3.2.0.{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}" + +configuration: Release + +before_build: nuget restore + +build: + verbosity: minimal + publish_nuget: true + publish_nuget_symbols: true + +deploy: +- provider: NuGet + server: https://www.myget.org/F/autofac/ + api_key: + secure: N4KZCRegcmenMoJ0peZfQwDzqq+Wt4oxGzNTgvkrDxgWyZhw7hNwKmd4n2AsNKQX + symbol_server: https://nuget.symbolsource.org/MyGet/autofac \ No newline at end of file diff --git a/src/Autofac.Integration.Web/Autofac.Integration.Web.csproj b/src/Autofac.Integration.Web/Autofac.Integration.Web.csproj index cc63a5f..54b4555 100644 --- a/src/Autofac.Integration.Web/Autofac.Integration.Web.csproj +++ b/src/Autofac.Integration.Web/Autofac.Integration.Web.csproj @@ -13,7 +13,7 @@ v4.0 512 true - ..\..\..\Build\SharedKey.snk + ..\..\Autofac.snk @@ -24,7 +24,7 @@ DEBUG;TRACE prompt 4 - ..\..\..\Build\Full.ruleset + ..\..\Full.ruleset true bin\Debug\Autofac.Integration.Web.xml @@ -35,27 +35,21 @@ TRACE prompt 4 - ..\..\..\Build\Full.ruleset + ..\..\Full.ruleset true bin\Release\Autofac.Integration.Web.xml False - ..\..\..\packages\Autofac.3.4.0\lib\net40\Autofac.dll + ..\..\packages\Autofac.3.4.0\lib\net40\Autofac.dll - - Properties\GlobalAssemblyInfo.cs - - - Properties\ProductAssemblyInfo.cs - - + CodeAnalysisDictionary.xml @@ -85,7 +79,6 @@ - @@ -121,6 +114,7 @@ + diff --git a/src/Autofac.Integration.Web/Autofac.Integration.Web.nuspec b/src/Autofac.Integration.Web/Autofac.Integration.Web.nuspec new file mode 100644 index 0000000..6c4ad8c --- /dev/null +++ b/src/Autofac.Integration.Web/Autofac.Integration.Web.nuspec @@ -0,0 +1,19 @@ + + + + Autofac.Web + $version$ + Autofac Contributors + http://www.opensource.org/licenses/mit-license.php + false + ASP.NET WebForms integration for Autofac + Provides dependency management and property injection for ASP.NET WebForms Pages. + en-US + Autofac WebForms Integration + http://autofac.org + http://code.google.com/p/autofac/logo + + + + + \ No newline at end of file diff --git a/src/Autofac.Integration.Web/Properties/AssemblyInfo.cs b/src/Autofac.Integration.Web/Properties/AssemblyInfo.cs index cc834a6..15b7f65 100644 --- a/src/Autofac.Integration.Web/Properties/AssemblyInfo.cs +++ b/src/Autofac.Integration.Web/Properties/AssemblyInfo.cs @@ -1,9 +1,23 @@ using System; using System.Reflection; +using System.Resources; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; [assembly: AssemblyTitle("Autofac.Integration.Web")] [assembly: InternalsVisibleTo("Autofac.Tests.Integration.Web, PublicKey=00240000048000009400000006020000002400005253413100040000010001008728425885ef385e049261b18878327dfaaf0d666dea3bd2b0e4f18b33929ad4e5fbc9087e7eda3c1291d2de579206d9b4292456abffbe8be6c7060b36da0c33b883e3878eaf7c89fddf29e6e27d24588e81e86f3a22dd7b1a296b5f06fbfb500bbd7410faa7213ef4e2ce7622aefc03169b0324bcd30ccfe9ac8204e4960be6")] [assembly: ComVisible(false)] -[assembly: CLSCompliant(true)] \ No newline at end of file +[assembly: CLSCompliant(true)] + +[assembly: AssemblyCompany("Autofac Project - http://autofac.org")] +[assembly: AssemblyProduct("Autofac")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: NeutralResourcesLanguage("en")] + +[assembly: AssemblyVersion("0.0.0.0")] +[assembly: AssemblyFileVersion("0.0.0.0")] +[assembly: AssemblyInformationalVersion("0.0.0")] +[assembly: AssemblyConfiguration("Release")] +[assembly: AssemblyCopyright("Copyright © 2014 Autofac Contributors")] +[assembly: AssemblyDescription("Autofac ASP.NET WebForms Integration")] \ No newline at end of file diff --git a/src/Autofac.Integration.Web/Properties/VersionAssemblyInfo.cs b/src/Autofac.Integration.Web/Properties/VersionAssemblyInfo.cs deleted file mode 100644 index 426a0d6..0000000 --- a/src/Autofac.Integration.Web/Properties/VersionAssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Runtime Version:4.0.30319.34003 -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; -using System.Resources; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -[assembly: AssemblyVersion("3.0.0.0")] -[assembly: AssemblyFileVersion("3.1.0.0")] -[assembly: AssemblyConfiguration("Release built on 2014-01-07 21:40")] -[assembly: AssemblyCopyright("Copyright © 2014 Autofac Contributors")] -[assembly: AssemblyDescription("Autofac.Web 3.1.0")] - - diff --git a/tests/Autofac.Tests.Integration.Web/Autofac.Tests.Integration.Web.csproj b/tests/Autofac.Tests.Integration.Web/Autofac.Tests.Integration.Web.csproj index 5be8570..4cab511 100644 --- a/tests/Autofac.Tests.Integration.Web/Autofac.Tests.Integration.Web.csproj +++ b/tests/Autofac.Tests.Integration.Web/Autofac.Tests.Integration.Web.csproj @@ -13,7 +13,7 @@ v4.0 512 true - ..\..\..\Build\SharedKey.snk + ..\..\Autofac.snk 3.5 @@ -59,10 +59,10 @@ False - ..\..\..\packages\Autofac.3.4.0\lib\net40\Autofac.dll + ..\..\packages\Autofac.3.4.0\lib\net40\Autofac.dll - ..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll @@ -79,17 +79,11 @@ - - Properties\GlobalAssemblyInfo.cs - - - Properties\VersionAssemblyInfo.cs - - + {4BDD9D14-BACA-416C-919E-E9FF100F8F5D} Autofac.Integration.Web