From 3d899b7e7aa29981f40f3f716a6a0b2b60f0b6f5 Mon Sep 17 00:00:00 2001 From: Travis Illig Date: Mon, 2 Feb 2015 09:41:59 -0800 Subject: [PATCH] Updated codeline for standalone solution. --- .gitignore | 2 +- Autofac.Extras.AggregateService.sln | 28 ++++ build/SharedKey.snk => Autofac.snk | Bin ...ctionary.xml => CodeAnalysisDictionary.xml | 94 ++++++------- build/Full.ruleset => Full.ruleset | 21 +-- README.md | 2 + appveyor.yml | 24 ++++ build/Documentation.proj | 30 ----- build/Documentation.shfbproj | 126 ------------------ build/Portable.ruleset | 16 --- nuspec/NuspecStaging.proj | 57 -------- .../Autofac.Extras.AggregateService.csproj | 32 ++--- .../Autofac.Extras.AggregateService.nuspec | 10 +- .../Properties/AssemblyInfo.cs | 20 ++- .../Properties/VersionAssemblyInfo.cs | 23 ---- ...tofac.Extras.Tests.AggregateService.csproj | 65 +-------- 16 files changed, 152 insertions(+), 398 deletions(-) create mode 100644 Autofac.Extras.AggregateService.sln rename build/SharedKey.snk => Autofac.snk (100%) rename build/CodeAnalysisDictionary.xml => CodeAnalysisDictionary.xml (96%) rename build/Full.ruleset => Full.ruleset (88%) create mode 100644 appveyor.yml delete mode 100644 build/Documentation.proj delete mode 100644 build/Documentation.shfbproj delete mode 100644 build/Portable.ruleset delete mode 100644 nuspec/NuspecStaging.proj rename {nuspec => src/Autofac.Extras.AggregateService}/Autofac.Extras.AggregateService.nuspec (68%) delete mode 100644 src/Autofac.Extras.AggregateService/Properties/VersionAssemblyInfo.cs 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.Extras.AggregateService.sln b/Autofac.Extras.AggregateService.sln new file mode 100644 index 0000000..50668d4 --- /dev/null +++ b/Autofac.Extras.AggregateService.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.Extras.AggregateService", "src\Autofac.Extras.AggregateService\Autofac.Extras.AggregateService.csproj", "{1D24C6ED-9A6E-4082-A79C-A3F5B88FC947}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Extras.Tests.AggregateService", "test\Autofac.Extras.Tests.AggregateService\Autofac.Extras.Tests.AggregateService.csproj", "{4BCA97A6-BF40-4B29-B025-0F53A6E4A682}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1D24C6ED-9A6E-4082-A79C-A3F5B88FC947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1D24C6ED-9A6E-4082-A79C-A3F5B88FC947}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1D24C6ED-9A6E-4082-A79C-A3F5B88FC947}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1D24C6ED-9A6E-4082-A79C-A3F5B88FC947}.Release|Any CPU.Build.0 = Release|Any CPU + {4BCA97A6-BF40-4B29-B025-0F53A6E4A682}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4BCA97A6-BF40-4B29-B025-0F53A6E4A682}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4BCA97A6-BF40-4B29-B025-0F53A6E4A682}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4BCA97A6-BF40-4B29-B025-0F53A6E4A682}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/build/SharedKey.snk b/Autofac.snk similarity index 100% rename from build/SharedKey.snk rename to Autofac.snk diff --git a/build/CodeAnalysisDictionary.xml b/CodeAnalysisDictionary.xml similarity index 96% rename from build/CodeAnalysisDictionary.xml rename to CodeAnalysisDictionary.xml index 2055325..e15c3b3 100644 --- a/build/CodeAnalysisDictionary.xml +++ b/CodeAnalysisDictionary.xml @@ -1,47 +1,47 @@ - - - - - - - - Api - Autofac - autowired - autowiring - composable - configurator - Ioc - Mef - Moq - multitenancy - Mvc - Mvx - Mvvm - startable - Owin - - - - - + + + + + + + + Api + Autofac + autowired + autowiring + composable + configurator + Ioc + Mef + Moq + multitenancy + Mvc + Mvx + Mvvm + startable + Owin + + + + + diff --git a/build/Full.ruleset b/Full.ruleset similarity index 88% rename from build/Full.ruleset rename to Full.ruleset index 786d6dc..417a489 100644 --- a/build/Full.ruleset +++ b/Full.ruleset @@ -1,11 +1,12 @@ - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 2c3538b..c626147 100644 --- a/README.md +++ b/README.md @@ -2,3 +2,5 @@ Autofac.Extras.AggregateService =============================== Dynamic aggregate service implementation generation for Autofac IoC + +[![Build status](https://ci.appveyor.com/api/projects/status/b3gbs0ary7vesd4c?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-aggregateservice) \ No newline at end of file diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 0000000..248fc5d --- /dev/null +++ b/appveyor.yml @@ -0,0 +1,24 @@ +version: 3.0.4.{build} + +assembly_info: + patch: true + file: AssemblyInfo.cs + assembly_version: "3.0.0.0" + assembly_file_version: "{version}" + assembly_informational_version: "3.0.4-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/build/Documentation.proj b/build/Documentation.proj deleted file mode 100644 index d083f77..0000000 --- a/build/Documentation.proj +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/Documentation.shfbproj b/build/Documentation.shfbproj deleted file mode 100644 index 55bd960..0000000 --- a/build/Documentation.shfbproj +++ /dev/null @@ -1,126 +0,0 @@ - - - - - - Debug - AnyCPU - 2.0 - {be97c692-8e51-4279-8cad-332c37a52b26} - 1.9.5.0 - - Documentation - Documentation - Documentation - - ..\build_output\doc\Website - Autofac - en-US - OnlyWarningsAndErrors - MSHelpViewer, Website - False - Silverlight 5 - True - False - False - True - ..\build_output\log\DocumentationBuild.log - CSharp, JavaScript, AspNet - Blank - False - VS2010 - False - HashedMemberName - Autofac .NET Inversion of Control Container - Copyright (c) 2007-2013 Autofac Contributors - http://autofac.org - AboveNamespaces - autofac@googlegroups.com - VisualStudio11 - -1 - 100 - 100 - -1 - Fiserv - Msdn - 100 - VS - Autofac - Attributes, ExplicitInterfaceImplementations, InheritedMembers, InheritedFrameworkMembers, Protected, SealedProtected - Summary, Parameter, Returns, Value, AutoDocumentCtors, TypeParameter, IncludeTargets, AutoDocumentDispose - - - - - - - - - - - - - - - - - - - - - - - - - - - {@HelpFormatOutputPaths} - - - - - - - ..\build_output\doc\temp\ - ..\toolset\thirdparty\sandcastle\ - - True - Autofac - - - - - - - - - - - - - - - - - - - - - diff --git a/build/Portable.ruleset b/build/Portable.ruleset deleted file mode 100644 index 617d68d..0000000 --- a/build/Portable.ruleset +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/nuspec/NuspecStaging.proj b/nuspec/NuspecStaging.proj deleted file mode 100644 index a18dff5..0000000 --- a/nuspec/NuspecStaging.proj +++ /dev/null @@ -1,57 +0,0 @@ - - - - - . - $(MSBuildProjectDirectory)\..\..\..\ - - - - - - - - - - Autofac.Extras.AggregateService - - - @(AutofacProject->WithMetadataValue('PackageName', $(NuspecName))->Metadata('PackageVersion')) - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Autofac.Extras.AggregateService/Autofac.Extras.AggregateService.csproj b/src/Autofac.Extras.AggregateService/Autofac.Extras.AggregateService.csproj index 851a1db..b1f26bc 100644 --- a/src/Autofac.Extras.AggregateService/Autofac.Extras.AggregateService.csproj +++ b/src/Autofac.Extras.AggregateService/Autofac.Extras.AggregateService.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.21022 + 9.0.30729 2.0 {1D24C6ED-9A6E-4082-A79C-A3F5B88FC947} Library @@ -12,11 +12,7 @@ Autofac.Extras.AggregateService 512 true - ..\..\..\Build\SharedKey.snk - v4.0 - Client - ..\..\..\ - true + ..\..\Autofac.snk true @@ -26,7 +22,7 @@ DEBUG;TRACE prompt 4 - ..\..\..\Build\Full.ruleset + ..\..\Full.ruleset bin\Debug\Autofac.Extras.AggregateService.xml true @@ -37,18 +33,18 @@ TRACE prompt 4 - ..\..\..\Build\Full.ruleset + ..\..\Full.ruleset bin\Release\Autofac.Extras.AggregateService.xml true False - ..\..\..\packages\Autofac.3.3.1\lib\net40\Autofac.dll + ..\..\packages\Autofac.3.3.1\lib\net40\Autofac.dll False - ..\..\..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll + ..\..\packages\Castle.Core.3.2.2\lib\net40-client\Castle.Core.dll @@ -58,27 +54,20 @@ - - Properties\GlobalAssemblyInfo.cs - - - Properties\ProductAssemblyInfo.cs - - + CodeAnalysisDictionary.xml - - + - - - - - \ No newline at end of file diff --git a/nuspec/Autofac.Extras.AggregateService.nuspec b/src/Autofac.Extras.AggregateService/Autofac.Extras.AggregateService.nuspec similarity index 68% rename from nuspec/Autofac.Extras.AggregateService.nuspec rename to src/Autofac.Extras.AggregateService/Autofac.Extras.AggregateService.nuspec index 4006064..5304122 100644 --- a/nuspec/Autofac.Extras.AggregateService.nuspec +++ b/src/Autofac.Extras.AggregateService/Autofac.Extras.AggregateService.nuspec @@ -1,8 +1,8 @@ - - - + + + Autofac.Extras.AggregateService - $AFversion_Autofac.Extras.AggregateService$ + $version$ Autofac Contributors http://www.opensource.org/licenses/mit-license.php false @@ -14,7 +14,7 @@ http://code.google.com/p/autofac/logo - + \ No newline at end of file diff --git a/src/Autofac.Extras.AggregateService/Properties/AssemblyInfo.cs b/src/Autofac.Extras.AggregateService/Properties/AssemblyInfo.cs index 539796e..9f607b7 100644 --- a/src/Autofac.Extras.AggregateService/Properties/AssemblyInfo.cs +++ b/src/Autofac.Extras.AggregateService/Properties/AssemblyInfo.cs @@ -1,7 +1,25 @@ using System; using System.Reflection; +using System.Resources; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; +using System.Security; [assembly: AssemblyTitle("Autofac.Extras.AggregateService")] +[assembly: InternalsVisibleTo("Autofac.Tests.Extras.AggregateService, PublicKey=00240000048000009400000006020000002400005253413100040000010001008728425885ef385e049261b18878327dfaaf0d666dea3bd2b0e4f18b33929ad4e5fbc9087e7eda3c1291d2de579206d9b4292456abffbe8be6c7060b36da0c33b883e3878eaf7c89fddf29e6e27d24588e81e86f3a22dd7b1a296b5f06fbfb500bbd7410faa7213ef4e2ce7622aefc03169b0324bcd30ccfe9ac8204e4960be6")] [assembly: ComVisible(false)] -[assembly: CLSCompliant(true)] \ No newline at end of file +[assembly: CLSCompliant(true)] +[assembly: AllowPartiallyTrustedCallers] + +[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 Configuration Support")] \ No newline at end of file diff --git a/src/Autofac.Extras.AggregateService/Properties/VersionAssemblyInfo.cs b/src/Autofac.Extras.AggregateService/Properties/VersionAssemblyInfo.cs deleted file mode 100644 index 8976a8b..0000000 --- a/src/Autofac.Extras.AggregateService/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.0.3.0")] -[assembly: AssemblyConfiguration("Release built on 2014-01-07 21:40")] -[assembly: AssemblyCopyright("Copyright © 2014 Autofac Contributors")] -[assembly: AssemblyDescription("Autofac.Extras.AggregateService 3.0.3")] - - diff --git a/test/Autofac.Extras.Tests.AggregateService/Autofac.Extras.Tests.AggregateService.csproj b/test/Autofac.Extras.Tests.AggregateService/Autofac.Extras.Tests.AggregateService.csproj index 3a2bc63..59d455b 100644 --- a/test/Autofac.Extras.Tests.AggregateService/Autofac.Extras.Tests.AggregateService.csproj +++ b/test/Autofac.Extras.Tests.AggregateService/Autofac.Extras.Tests.AggregateService.csproj @@ -3,7 +3,7 @@ Debug AnyCPU - 9.0.21022 + 9.0.30729 2.0 {4BCA97A6-BF40-4B29-B025-0F53A6E4A682} Library @@ -11,29 +11,8 @@ Autofac.Extras.Tests.AggregateService Autofac.Extras.Tests.AggregateService 512 - - - 2.0 - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true true - ..\..\..\Build\SharedKey.snk - v4.0 - Client + ..\..\Autofac.snk ..\..\..\ true @@ -45,7 +24,6 @@ DEBUG;TRACE prompt 4 - AllRules.ruleset pdbonly @@ -54,18 +32,17 @@ TRACE prompt 4 - AllRules.ruleset False - ..\..\..\packages\Autofac.3.3.1\lib\net40\Autofac.dll + ..\..\packages\Autofac.3.3.1\lib\net40\Autofac.dll - ..\..\..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll + ..\..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll - ..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll + ..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll @@ -75,12 +52,6 @@ - - Properties\GlobalAssemblyInfo.cs - - - Properties\VersionAssemblyInfo.cs - @@ -94,28 +65,11 @@ - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - true - - - False - Windows Installer 3.1 - true - - - + {1d24c6ed-9a6e-4082-a79c-a3f5b88fc947} Autofac.Extras.AggregateService @@ -123,7 +77,7 @@ - + - - - - - \ No newline at end of file