Skip to content

Commit a4063c4

Browse files
alexmgalexmg
committed
Added solution and build configuration.
1 parent 251dc83 commit a4063c4

12 files changed

+165
-49
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ publish/
133133
# NuGet Packages
134134
*.nupkg
135135
# The packages folder can be ignored because of Package Restore
136-
**/packages/*
136+
/packages/*
137137
# except build/, which is used as an MSBuild target.
138138
!**/packages/build/
139139
# If using the old MSBuild-Integrated Package Restore, uncomment this:

‎Autofac.Extras.CommonServiceLocator.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio 2013
4+
VisualStudioVersion = 12.0.31101.0
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Autofac.Extras.CommonServiceLocator", "src\Autofac.Extras.CommonServiceLocator\Autofac.Extras.CommonServiceLocator.csproj", "{7A6DB23D-117E-4742-A9FA-8A6956DF6829}"
7+
EndProject
8+
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}"
9+
EndProject
10+
Global
11+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12+
Debug|Any CPU = Debug|Any CPU
13+
Release|Any CPU = Release|Any CPU
14+
EndGlobalSection
15+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16+
{7A6DB23D-117E-4742-A9FA-8A6956DF6829}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17+
{7A6DB23D-117E-4742-A9FA-8A6956DF6829}.Debug|Any CPU.Build.0 = Debug|Any CPU
18+
{7A6DB23D-117E-4742-A9FA-8A6956DF6829}.Release|Any CPU.ActiveCfg = Release|Any CPU
19+
{7A6DB23D-117E-4742-A9FA-8A6956DF6829}.Release|Any CPU.Build.0 = Release|Any CPU
20+
{304C6D1B-7264-408E-BE9B-4F6E6462CF08}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21+
{304C6D1B-7264-408E-BE9B-4F6E6462CF08}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{304C6D1B-7264-408E-BE9B-4F6E6462CF08}.Release|Any CPU.ActiveCfg = Release|Any CPU
23+
{304C6D1B-7264-408E-BE9B-4F6E6462CF08}.Release|Any CPU.Build.0 = Release|Any CPU
24+
EndGlobalSection
25+
GlobalSection(SolutionProperties) = preSolution
26+
HideSolutionNode = FALSE
27+
EndGlobalSection
28+
EndGlobal

‎Autofac.snk

596 Bytes
Binary file not shown.

‎CodeAnalysisDictionary.xml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<!-- Dictionary format defined here: http://msdn.microsoft.com/en-us/library/bb514188.aspx -->
3+
<Dictionary>
4+
<Words>
5+
<!--
6+
<Unrecognized>
7+
<Word></Word>
8+
</Unrecognized>
9+
-->
10+
<!-- Capitalize proper nouns and acronyms; "regular words" just lowercase. -->
11+
<Recognized>
12+
<Word>Api</Word>
13+
<Word>Autofac</Word>
14+
<Word>autowired</Word>
15+
<Word>autowiring</Word>
16+
<Word>composable</Word>
17+
<Word>configurator</Word>
18+
<Word>Ioc</Word>
19+
<Word>Mef</Word>
20+
<Word>Moq</Word>
21+
<Word>multitenancy</Word>
22+
<Word>Mvc</Word>
23+
<Word>Mvx</Word>
24+
<Word>Mvvm</Word>
25+
<Word>startable</Word>
26+
<Word>Owin</Word>
27+
</Recognized>
28+
<!--
29+
<Deprecated>
30+
<Term PreferredAlternate=""></Term>
31+
</Deprecated>
32+
<Compound>
33+
<Term CompoundAlternate=""></Term>
34+
</Compound>
35+
<DiscreteExceptions>
36+
<Term></Term>
37+
</DiscreteExceptions>
38+
-->
39+
</Words>
40+
<!--
41+
<Acronyms>
42+
<CasingExceptions>
43+
<Acronym></Acronym>
44+
</CasingExceptions>
45+
</Acronyms>
46+
-->
47+
</Dictionary>

‎Portable.ruleset

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<RuleSet Name="Autofac - Portable Class Library Rules" Description="This ruleset is for Autofac assemblies that build as Portable Class Libraries." ToolsVersion="11.0">
3+
<IncludeAll Action="Warning" />
4+
<Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
5+
<Rule Id="CA1004" Action="None" />
6+
<Rule Id="CA1005" Action="None" />
7+
<Rule Id="CA1006" Action="None" />
8+
<Rule Id="CA1016" Action="None" />
9+
<Rule Id="CA1020" Action="None" />
10+
<Rule Id="CA1026" Action="None" />
11+
<Rule Id="CA1032" Action="None" />
12+
<Rule Id="CA1716" Action="None" />
13+
<Rule Id="CA1724" Action="None" />
14+
<Rule Id="CA2000" Action="None" />
15+
</Rules>
16+
</RuleSet>

‎README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@ Autofac.Extras.CommonServiceLocator
22
===================================
33

44
Common Service Locator implementation for Autofac IoC
5+
6+
[![Build status](https://ci.appveyor.com/api/projects/status/p3hwgqspvxvmhm8n?svg=true)](https://ci.appveyor.com/project/Autofac/autofac-extras-commonservicelocator)

‎appveyor.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
version: 3.2.0.{build}
2+
3+
assembly_info:
4+
patch: true
5+
file: AssemblyInfo.cs
6+
assembly_version: "3.2.0.0"
7+
assembly_file_version: "{version}"
8+
assembly_informational_version: "3.2.0-CI-{build}"
9+
10+
configuration: Release
11+
12+
before_build: nuget restore
13+
14+
build:
15+
verbosity: minimal
16+
publish_nuget: true
17+
publish_nuget_symbols: true
18+
19+
deploy:
20+
- provider: NuGet
21+
server: https://www.myget.org/F/autofac/
22+
api_key:
23+
secure: N4KZCRegcmenMoJ0peZfQwDzqq+Wt4oxGzNTgvkrDxgWyZhw7hNwKmd4n2AsNKQX
24+
symbol_server: https://nuget.symbolsource.org/MyGet/autofac

‎src/Autofac.Extras.CommonServiceLocator/Autofac.Extras.CommonServiceLocator.csproj

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<RootNamespace>Autofac.Extras.CommonServiceLocator</RootNamespace>
1111
<AssemblyName>Autofac.Extras.CommonServiceLocator</AssemblyName>
1212
<SignAssembly>true</SignAssembly>
13-
<AssemblyOriginatorKeyFile>..\..\..\Build\SharedKey.snk</AssemblyOriginatorKeyFile>
13+
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
1414
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1515
<TargetFrameworkProfile>Profile328</TargetFrameworkProfile>
1616
<FileAlignment>512</FileAlignment>
@@ -28,7 +28,7 @@
2828
<ErrorReport>prompt</ErrorReport>
2929
<WarningLevel>4</WarningLevel>
3030
<DocumentationFile>bin\Debug\Autofac.Extras.CommonServiceLocator.xml</DocumentationFile>
31-
<CodeAnalysisRuleSet>..\..\..\Build\Portable.ruleset</CodeAnalysisRuleSet>
31+
<CodeAnalysisRuleSet>..\..\Portable.ruleset</CodeAnalysisRuleSet>
3232
<RunCodeAnalysis>true</RunCodeAnalysis>
3333
</PropertyGroup>
3434
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -38,33 +38,27 @@
3838
<DefineConstants>TRACE</DefineConstants>
3939
<ErrorReport>prompt</ErrorReport>
4040
<WarningLevel>4</WarningLevel>
41-
<CodeAnalysisRuleSet>..\..\..\Build\Portable.ruleset</CodeAnalysisRuleSet>
41+
<CodeAnalysisRuleSet>..\..\Portable.ruleset</CodeAnalysisRuleSet>
4242
<DocumentationFile>bin\Release\Autofac.Extras.CommonServiceLocator.xml</DocumentationFile>
4343
<RunCodeAnalysis>true</RunCodeAnalysis>
4444
</PropertyGroup>
4545
<ItemGroup>
46-
<Compile Include="..\..\..\GlobalAssemblyInfo.cs">
47-
<Link>Properties\GlobalAssemblyInfo.cs</Link>
48-
</Compile>
49-
<Compile Include="..\..\..\ProductAssemblyInfo.cs">
50-
<Link>Properties\ProductAssemblyInfo.cs</Link>
51-
</Compile>
52-
<CodeAnalysisDictionary Include="..\..\..\Build\CodeAnalysisDictionary.xml">
46+
<CodeAnalysisDictionary Include="..\..\CodeAnalysisDictionary.xml">
5347
<Link>CodeAnalysisDictionary.xml</Link>
5448
</CodeAnalysisDictionary>
5549
<Compile Include="AutofacServiceLocator.cs" />
5650
<Compile Include="Properties\AssemblyInfo.cs" />
57-
<Compile Include="Properties\VersionAssemblyInfo.cs" />
5851
</ItemGroup>
5952
<ItemGroup>
6053
<Reference Include="Autofac">
61-
<HintPath>..\..\..\packages\Autofac.3.5.0\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Autofac.dll</HintPath>
54+
<HintPath>..\..\packages\Autofac.3.5.0\lib\portable-net4+sl5+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\Autofac.dll</HintPath>
6255
</Reference>
6356
<Reference Include="Microsoft.Practices.ServiceLocation">
64-
<HintPath>..\..\..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll</HintPath>
57+
<HintPath>..\..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll</HintPath>
6558
</Reference>
6659
</ItemGroup>
6760
<ItemGroup>
61+
<None Include="Autofac.Extras.CommonServiceLocator.nuspec" />
6862
<None Include="packages.config" />
6963
</ItemGroup>
7064
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />

‎src/Autofac.Extras.CommonServiceLocator/Autofac.Extras.CommonServiceLocator.nuspec

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0"?>
2+
<package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
3+
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
4+
<id>Autofac.Extras.CommonServiceLocator</id>
5+
<version>$version$</version>
6+
<authors>Autofac Contributors</authors>
7+
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
8+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
9+
<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>
10+
<summary>Autofac extension for using the Microsoft Enterprise Library Common Service Locator with Autofac.</summary>
11+
<language>en-US</language>
12+
<title>Autofac Extras: Microsoft Common Service Locator Implementation</title>
13+
<projectUrl>http://autofac.org</projectUrl>
14+
<iconUrl>http://code.google.com/p/autofac/logo</iconUrl>
15+
<dependencies>
16+
<dependency id="Autofac" version="[3.5.0,4.0.0)" />
17+
<dependency id="CommonServiceLocator" version="$version_CommonServiceLocator$" />
18+
</dependencies>
19+
</metadata>
20+
</package>

‎src/Autofac.Extras.CommonServiceLocator/Properties/AssemblyInfo.cs

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,19 @@
11
using System;
22
using System.Reflection;
3+
using System.Resources;
34

45
[assembly: AssemblyTitle("Autofac.Extras.CommonServiceLocator")]
5-
[assembly: CLSCompliant(true)]
6+
[assembly: CLSCompliant(true)]
7+
8+
[assembly: AssemblyCompany("Autofac Project - http://autofac.org")]
9+
[assembly: AssemblyProduct("Autofac")]
10+
[assembly: AssemblyTrademark("")]
11+
[assembly: AssemblyCulture("")]
12+
[assembly: NeutralResourcesLanguage("en")]
13+
14+
[assembly: AssemblyVersion("0.0.0.0")]
15+
[assembly: AssemblyFileVersion("0.0.0.0")]
16+
[assembly: AssemblyInformationalVersion("0.0.0")]
17+
[assembly: AssemblyConfiguration("Release")]
18+
[assembly: AssemblyCopyright("Copyright © 2014 Autofac Contributors")]
19+
[assembly: AssemblyDescription("Autofac.Extras.CommonServiceLocator")]

‎src/Autofac.Extras.CommonServiceLocator/Properties/VersionAssemblyInfo.cs

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎test/Autofac.Extras.Tests.CommonServiceLocator/Autofac.Extras.Tests.CommonServiceLocator.csproj

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<UseApplicationTrust>false</UseApplicationTrust>
3232
<BootstrapperEnabled>true</BootstrapperEnabled>
3333
<SignAssembly>true</SignAssembly>
34-
<AssemblyOriginatorKeyFile>..\..\..\Build\SharedKey.snk</AssemblyOriginatorKeyFile>
34+
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
3535
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.0</TargetFrameworkVersion>
3636
<TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">Client</TargetFrameworkProfile>
3737
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
@@ -59,14 +59,14 @@
5959
<ItemGroup>
6060
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
6161
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\..\..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
62+
<HintPath>..\..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6565
<SpecificVersion>False</SpecificVersion>
66-
<HintPath>..\..\..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll</HintPath>
66+
<HintPath>..\..\packages\CommonServiceLocator.1.2\lib\portable-windows8+net40+sl5+windowsphone8\Microsoft.Practices.ServiceLocation.dll</HintPath>
6767
</Reference>
6868
<Reference Include="nunit.framework">
69-
<HintPath>..\..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
69+
<HintPath>..\..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>
7070
</Reference>
7171
<Reference Include="System" />
7272
<Reference Include="System.Core">
@@ -82,12 +82,6 @@
8282
<Reference Include="System.Xml" />
8383
</ItemGroup>
8484
<ItemGroup>
85-
<Compile Include="..\..\..\GlobalAssemblyInfo.cs">
86-
<Link>Properties\GlobalAssemblyInfo.cs</Link>
87-
</Compile>
88-
<Compile Include="..\..\Source\Autofac.Extras.CommonServiceLocator\Properties\VersionAssemblyInfo.cs">
89-
<Link>Properties\VersionAssemblyInfo.cs</Link>
90-
</Compile>
9185
<Compile Include="AutofacServiceLocatorTests.cs" />
9286
<Compile Include="Components\AdvancedLogger.cs" />
9387
<Compile Include="Components\ILogger.cs" />
@@ -113,7 +107,7 @@
113107
</BootstrapperPackage>
114108
</ItemGroup>
115109
<ItemGroup>
116-
<ProjectReference Include="..\..\Source\Autofac.Extras.CommonServiceLocator\Autofac.Extras.CommonServiceLocator.csproj">
110+
<ProjectReference Include="..\..\src\Autofac.Extras.CommonServiceLocator\Autofac.Extras.CommonServiceLocator.csproj">
117111
<Project>{7a6db23d-117e-4742-a9fa-8a6956df6829}</Project>
118112
<Name>Autofac.Extras.CommonServiceLocator</Name>
119113
</ProjectReference>

0 commit comments

Comments
 (0)