Skip to content

Commit

Permalink
Added solution and build configuration.
Browse files Browse the repository at this point in the history
  • Loading branch information
alexmg committed Feb 3, 2015
1 parent 251dc83 commit a4063c4
Show file tree
Hide file tree
Showing 12 changed files with 165 additions and 49 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
28 changes: 28 additions & 0 deletions Autofac.Extras.CommonServiceLocator.sln
Original file line number Diff line number Diff line change
@@ -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.CommonServiceLocator", "src\Autofac.Extras.CommonServiceLocator\Autofac.Extras.CommonServiceLocator.csproj", "{7A6DB23D-117E-4742-A9FA-8A6956DF6829}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Extras.Tests.CommonServiceLocator", "test\Autofac.Extras.Tests.CommonServiceLocator\Autofac.Extras.Tests.CommonServiceLocator.csproj", "{304C6D1B-7264-408E-BE9B-4F6E6462CF08}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7A6DB23D-117E-4742-A9FA-8A6956DF6829}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7A6DB23D-117E-4742-A9FA-8A6956DF6829}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7A6DB23D-117E-4742-A9FA-8A6956DF6829}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7A6DB23D-117E-4742-A9FA-8A6956DF6829}.Release|Any CPU.Build.0 = Release|Any CPU
{304C6D1B-7264-408E-BE9B-4F6E6462CF08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{304C6D1B-7264-408E-BE9B-4F6E6462CF08}.Debug|Any CPU.Build.0 = Debug|Any CPU
{304C6D1B-7264-408E-BE9B-4F6E6462CF08}.Release|Any CPU.ActiveCfg = Release|Any CPU
{304C6D1B-7264-408E-BE9B-4F6E6462CF08}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Binary file added Autofac.snk
Binary file not shown.
47 changes: 47 additions & 0 deletions CodeAnalysisDictionary.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- Dictionary format defined here: http://msdn.microsoft.com/en-us/library/bb514188.aspx -->
<Dictionary>
<Words>
<!--
<Unrecognized>
<Word></Word>
</Unrecognized>
-->
<!-- Capitalize proper nouns and acronyms; "regular words" just lowercase. -->
<Recognized>
<Word>Api</Word>
<Word>Autofac</Word>
<Word>autowired</Word>
<Word>autowiring</Word>
<Word>composable</Word>
<Word>configurator</Word>
<Word>Ioc</Word>
<Word>Mef</Word>
<Word>Moq</Word>
<Word>multitenancy</Word>
<Word>Mvc</Word>
<Word>Mvx</Word>
<Word>Mvvm</Word>
<Word>startable</Word>
<Word>Owin</Word>
</Recognized>
<!--
<Deprecated>
<Term PreferredAlternate=""></Term>
</Deprecated>
<Compound>
<Term CompoundAlternate=""></Term>
</Compound>
<DiscreteExceptions>
<Term></Term>
</DiscreteExceptions>
-->
</Words>
<!--
<Acronyms>
<CasingExceptions>
<Acronym></Acronym>
</CasingExceptions>
</Acronyms>
-->
</Dictionary>
16 changes: 16 additions & 0 deletions Portable.ruleset
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<RuleSet Name="Autofac - Portable Class Library Rules" Description="This ruleset is for Autofac assemblies that build as Portable Class Libraries." ToolsVersion="11.0">
<IncludeAll Action="Warning" />
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
<Rule Id="CA1004" Action="None" />
<Rule Id="CA1005" Action="None" />
<Rule Id="CA1006" Action="None" />
<Rule Id="CA1016" Action="None" />
<Rule Id="CA1020" Action="None" />
<Rule Id="CA1026" Action="None" />
<Rule Id="CA1032" Action="None" />
<Rule Id="CA1716" Action="None" />
<Rule Id="CA1724" Action="None" />
<Rule Id="CA2000" Action="None" />
</Rules>
</RuleSet>
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@ Autofac.Extras.CommonServiceLocator
===================================

Common Service Locator implementation for Autofac IoC

[![Build status](https://ci.appveyor.com/api/projects/status/p3hwgqspvxvmhm8n?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-commonservicelocator)
24 changes: 24 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<RootNamespace>Autofac.Extras.CommonServiceLocator</RootNamespace>
<AssemblyName>Autofac.Extras.CommonServiceLocator</AssemblyName>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Build\SharedKey.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile328</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
Expand All @@ -28,7 +28,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<DocumentationFile>bin\Debug\Autofac.Extras.CommonServiceLocator.xml</DocumentationFile>
<CodeAnalysisRuleSet>..\..\..\Build\Portable.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet>..\..\Portable.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
Expand All @@ -38,33 +38,27 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>..\..\..\Build\Portable.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRuleSet>..\..\Portable.ruleset</CodeAnalysisRuleSet>
<DocumentationFile>bin\Release\Autofac.Extras.CommonServiceLocator.xml</DocumentationFile>
<RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\..\..\ProductAssemblyInfo.cs">
<Link>Properties\ProductAssemblyInfo.cs</Link>
</Compile>
<CodeAnalysisDictionary Include="..\..\..\Build\CodeAnalysisDictionary.xml">
<CodeAnalysisDictionary Include="..\..\CodeAnalysisDictionary.xml">
<Link>CodeAnalysisDictionary.xml</Link>
</CodeAnalysisDictionary>
<Compile Include="AutofacServiceLocator.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\VersionAssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="Autofac">
<HintPath>..\..\..\packages\Autofac.3.5.0\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Autofac.dll</HintPath>
<HintPath>..\..\packages\Autofac.3.5.0\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Autofac.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation">
<HintPath>..\..\..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll</HintPath>
<HintPath>..\..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<None Include="Autofac.Extras.CommonServiceLocator.nuspec" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<id>Autofac.Extras.CommonServiceLocator</id>
<version>$version$</version>
<authors>Autofac Contributors</authors>
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>The Microsoft Enterprise Library provides a Common Service Locator for abstracting away IoC containers. This package contains an implementation of the Common Service Locator for use with Autofac.</description>
<summary>Autofac extension for using the Microsoft Enterprise Library Common Service Locator with Autofac.</summary>
<language>en-US</language>
<title>Autofac Extras: Microsoft Common Service Locator Implementation</title>
<projectUrl>http://autofac.org</projectUrl>
<iconUrl>http://code.google.com/p/autofac/logo</iconUrl>
<dependencies>
<dependency id="Autofac" version="[3.5.0,4.0.0)" />
<dependency id="CommonServiceLocator" version="$version_CommonServiceLocator$" />
</dependencies>
</metadata>
</package>
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
using System;
using System.Reflection;
using System.Resources;

[assembly: AssemblyTitle("Autofac.Extras.CommonServiceLocator")]
[assembly: CLSCompliant(true)]
[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.Extras.CommonServiceLocator")]

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\..\Build\SharedKey.snk</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">Client</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
Expand Down Expand Up @@ -59,14 +59,14 @@
<ItemGroup>
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
<HintPath>..\..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll</HintPath>
<HintPath>..\..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="nunit.framework">
<HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand All @@ -82,12 +82,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\..\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\..\Source\Autofac.Extras.CommonServiceLocator\Properties\VersionAssemblyInfo.cs">
<Link>Properties\VersionAssemblyInfo.cs</Link>
</Compile>
<Compile Include="AutofacServiceLocatorTests.cs" />
<Compile Include="Components\AdvancedLogger.cs" />
<Compile Include="Components\ILogger.cs" />
Expand All @@ -113,7 +107,7 @@
</BootstrapperPackage>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Source\Autofac.Extras.CommonServiceLocator\Autofac.Extras.CommonServiceLocator.csproj">
<ProjectReference Include="..\..\src\Autofac.Extras.CommonServiceLocator\Autofac.Extras.CommonServiceLocator.csproj">
<Project>{7a6db23d-117e-4742-a9fa-8a6956df6829}</Project>
<Name>Autofac.Extras.CommonServiceLocator</Name>
</ProjectReference>
Expand Down

0 comments on commit a4063c4

Please sign in to comment.