Skip to content

Commit b52e891

Browse files
tilligtillig
authored
Merge pull request #1 from alistairjevans/develop
Upgrading to 5.0 compatibility
2 parents 72e2b35 + 2078d3a commit b52e891

File tree

9 files changed

+68
-104
lines changed

9 files changed

+68
-104
lines changed

‎appveyor.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
environment:
2-
package_semantic_version: 4.0.0
3-
assembly_semantic_version: 4.0.0
2+
package_semantic_version: 5.0.0
3+
assembly_semantic_version: 5.0.0
4+
5+
image: Visual Studio 2019
46

57
version: $(package_semantic_version).{build}
68

‎src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.csproj‎

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<FileAlignment>512</FileAlignment>
1414
<SignAssembly>true</SignAssembly>
1515
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
16-
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.5.1</TargetFrameworkVersion>
16+
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.6.1</TargetFrameworkVersion>
1717
<TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">
1818
</TargetFrameworkProfile>
1919
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
@@ -46,22 +46,6 @@
4646
<Prefer32Bit>false</Prefer32Bit>
4747
</PropertyGroup>
4848
<ItemGroup>
49-
<Reference Include="Autofac, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
50-
<HintPath>..\..\packages\Autofac.4.0.0\lib\net451\Autofac.dll</HintPath>
51-
<Private>True</Private>
52-
</Reference>
53-
<Reference Include="Autofac.Integration.Wcf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Autofac.Wcf.4.0.0\lib\net45\Autofac.Integration.Wcf.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="Autofac.Multitenant, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
58-
<HintPath>..\..\packages\Autofac.Multitenant.4.0.0\lib\net451\Autofac.Multitenant.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
63-
<HintPath>..\..\packages\Castle.Core.3.2.2\lib\net45\Castle.Core.dll</HintPath>
64-
</Reference>
6549
<Reference Include="System" />
6650
<Reference Include="System.ComponentModel.Composition" />
6751
<Reference Include="System.Core" />
@@ -111,7 +95,20 @@
11195
<ItemGroup>
11296
<None Include="app.config" />
11397
<None Include="Autofac.Multitenant.Wcf.nuspec" />
114-
<None Include="packages.config" />
98+
</ItemGroup>
99+
<ItemGroup>
100+
<PackageReference Include="Autofac">
101+
<Version>5.1.1</Version>
102+
</PackageReference>
103+
<PackageReference Include="Autofac.Multitenant">
104+
<Version>5.0.0</Version>
105+
</PackageReference>
106+
<PackageReference Include="Autofac.Wcf">
107+
<Version>5.0.0</Version>
108+
</PackageReference>
109+
<PackageReference Include="Castle.Core">
110+
<Version>3.2.2</Version>
111+
</PackageReference>
115112
</ItemGroup>
116113
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
117114
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

‎src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
<iconUrl>https://cloud.githubusercontent.com/assets/1156571/13684110/16b8f152-e6bf-11e5-84ae-22c66c6d351a.png</iconUrl>
1515
<releaseNotes>Release notes are at https://github.com/autofac/Autofac.Multitenant.Wcf/releases</releaseNotes>
1616
<dependencies>
17-
<dependency id="Autofac" version="[4.0.0,5.0.0)" />
18-
<dependency id="Autofac.Multitenant" version="[4.0.0,5.0.0)" />
19-
<dependency id="Autofac.Wcf" version="[4.0.0,5.0.0)" />
17+
<dependency id="Autofac" version="[5.1.1,6.0.0)" />
18+
<dependency id="Autofac.Multitenant" version="[5.0.0,6.0.0)" />
19+
<dependency id="Autofac.Wcf" version="[5.0.0,6.0.0)" />
2020
<dependency id="Castle.Core" version="3.2.2" />
2121
</dependencies>
2222
</metadata>

‎src/Autofac.Multitenant.Wcf/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Autofac.Multitenant.Wcf/app.config‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
8-
</dependentAssembly>
9-
</assemblyBinding>
10-
</runtime>
11-
</configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
<startup>
12+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
13+
</startup>
14+
</configuration>

‎src/Autofac.Multitenant.Wcf/packages.config‎

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

‎test/Autofac.Multitenant.Wcf.Test/Autofac.Multitenant.Wcf.Test.csproj‎

Lines changed: 21 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" />
43
<PropertyGroup>
54
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
65
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,7 +13,7 @@
1413
<FileAlignment>512</FileAlignment>
1514
<SignAssembly>true</SignAssembly>
1615
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
17-
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.5.1</TargetFrameworkVersion>
16+
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.6.1</TargetFrameworkVersion>
1817
<TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">
1918
</TargetFrameworkProfile>
2019
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
@@ -43,22 +42,6 @@
4342
<Prefer32Bit>false</Prefer32Bit>
4443
</PropertyGroup>
4544
<ItemGroup>
46-
<Reference Include="Autofac, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
47-
<HintPath>..\..\packages\Autofac.4.0.0\lib\net451\Autofac.dll</HintPath>
48-
<Private>True</Private>
49-
</Reference>
50-
<Reference Include="Autofac.Integration.Wcf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
51-
<HintPath>..\..\packages\Autofac.Wcf.4.0.0\lib\net45\Autofac.Integration.Wcf.dll</HintPath>
52-
<Private>True</Private>
53-
</Reference>
54-
<Reference Include="Autofac.Multitenant, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
55-
<HintPath>..\..\packages\Autofac.Multitenant.4.0.0\lib\net451\Autofac.Multitenant.dll</HintPath>
56-
<Private>True</Private>
57-
</Reference>
58-
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
59-
<SpecificVersion>False</SpecificVersion>
60-
<HintPath>..\..\packages\Castle.Core.3.2.2\lib\net45\Castle.Core.dll</HintPath>
61-
</Reference>
6245
<Reference Include="System" />
6346
<Reference Include="System.ComponentModel.Composition" />
6447
<Reference Include="System.Core" />
@@ -73,22 +56,6 @@
7356
<Reference Include="Microsoft.CSharp" />
7457
<Reference Include="System.Data" />
7558
<Reference Include="System.Xml" />
76-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
78-
<Private>True</Private>
79-
</Reference>
80-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
81-
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
82-
<Private>True</Private>
83-
</Reference>
84-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
85-
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
86-
<Private>True</Private>
87-
</Reference>
88-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
89-
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
90-
<Private>True</Private>
91-
</Reference>
9259
</ItemGroup>
9360
<ItemGroup>
9461
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -110,18 +77,31 @@
11077
</ItemGroup>
11178
<ItemGroup>
11279
<None Include="app.config" />
113-
<None Include="packages.config" />
11480
</ItemGroup>
11581
<ItemGroup>
11682
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
11783
</ItemGroup>
84+
<ItemGroup>
85+
<PackageReference Include="Autofac">
86+
<Version>5.1.1</Version>
87+
</PackageReference>
88+
<PackageReference Include="Autofac.Multitenant">
89+
<Version>5.0.0</Version>
90+
</PackageReference>
91+
<PackageReference Include="Autofac.Wcf">
92+
<Version>5.0.0</Version>
93+
</PackageReference>
94+
<PackageReference Include="Castle.Core">
95+
<Version>3.2.2</Version>
96+
</PackageReference>
97+
<PackageReference Include="xunit">
98+
<Version>2.1.0</Version>
99+
</PackageReference>
100+
<PackageReference Include="xunit.runner.visualstudio">
101+
<Version>2.1.0</Version>
102+
</PackageReference>
103+
</ItemGroup>
118104
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
119-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
120-
<PropertyGroup>
121-
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
122-
</PropertyGroup>
123-
<Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.1.0\build\net20\xunit.runner.visualstudio.props'))" />
124-
</Target>
125105
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
126106
Other similar extension points exist, see Microsoft.Common.targets.
127107
<Target Name="BeforeBuild">

‎test/Autofac.Multitenant.Wcf.Test/app.config‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<runtime>
4-
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5-
<dependentAssembly>
6-
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
8-
</dependentAssembly>
9-
</assemblyBinding>
10-
</runtime>
11-
</configuration>
3+
<runtime>
4+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5+
<dependentAssembly>
6+
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
8+
</dependentAssembly>
9+
</assemblyBinding>
10+
</runtime>
11+
<startup>
12+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
13+
</startup>
14+
</configuration>

‎test/Autofac.Multitenant.Wcf.Test/packages.config‎

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

0 commit comments

Comments
 (0)