Skip to content

Commit

Permalink
Merge pull request #1 from alistairjevans/develop
Browse files Browse the repository at this point in the history 
Upgrading to 5.0 compatibility
  • Loading branch information
@tillig
tillig authored Feb 13, 2020
2 parents 72e2b35 + 2078d3a commit b52e891
Show file tree
Hide file tree
Showing 9 changed files with 68 additions and 104 deletions.
6 changes: 4 additions & 2 deletions appveyor.yml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
environment:
package_semantic_version: 4.0.0
assembly_semantic_version: 4.0.0
package_semantic_version: 5.0.0
assembly_semantic_version: 5.0.0

image: Visual Studio 2019

version: $(package_semantic_version).{build}

Expand Down
33 changes: 15 additions & 18 deletions src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">
</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
Expand Down Expand Up @@ -46,22 +46,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Autofac, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.4.0.0\lib\net451\Autofac.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Autofac.Integration.Wcf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.Wcf.4.0.0\lib\net45\Autofac.Integration.Wcf.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Autofac.Multitenant, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.Multitenant.4.0.0\lib\net451\Autofac.Multitenant.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Castle.Core.3.2.2\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -111,7 +95,20 @@
<ItemGroup>
<None Include="app.config" />
<None Include="Autofac.Multitenant.Wcf.nuspec" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac">
<Version>5.1.1</Version>
</PackageReference>
<PackageReference Include="Autofac.Multitenant">
<Version>5.0.0</Version>
</PackageReference>
<PackageReference Include="Autofac.Wcf">
<Version>5.0.0</Version>
</PackageReference>
<PackageReference Include="Castle.Core">
<Version>3.2.2</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
6 changes: 3 additions & 3 deletions src/Autofac.Multitenant.Wcf/Autofac.Multitenant.Wcf.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<iconUrl>https://cloud.githubusercontent.com/assets/1156571/13684110/16b8f152-e6bf-11e5-84ae-22c66c6d351a.png</iconUrl>
<releaseNotes>Release notes are at https://github.com/autofac/Autofac.Multitenant.Wcf/releases</releaseNotes>
<dependencies>
<dependency id="Autofac" version="[4.0.0,5.0.0)" />
<dependency id="Autofac.Multitenant" version="[4.0.0,5.0.0)" />
<dependency id="Autofac.Wcf" version="[4.0.0,5.0.0)" />
<dependency id="Autofac" version="[5.1.1,6.0.0)" />
<dependency id="Autofac.Multitenant" version="[5.0.0,6.0.0)" />
<dependency id="Autofac.Wcf" version="[5.0.0,6.0.0)" />
<dependency id="Castle.Core" version="3.2.2" />
</dependencies>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion src/Autofac.Multitenant.Wcf/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions src/Autofac.Multitenant.Wcf/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
</configuration>
7 changes: 0 additions & 7 deletions src/Autofac.Multitenant.Wcf/packages.config
View file

This file was deleted.

62 changes: 21 additions & 41 deletions test/Autofac.Multitenant.Wcf.Test/Autofac.Multitenant.Wcf.Test.csproj
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<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')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
Expand All @@ -14,7 +13,7 @@
<FileAlignment>512</FileAlignment>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.5.1</TargetFrameworkVersion>
<TargetFrameworkVersion Condition="$(TargetFrameworkVersion)==''">v4.6.1</TargetFrameworkVersion>
<TargetFrameworkProfile Condition="$(TargetFrameworkVersion)==''">
</TargetFrameworkProfile>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
Expand Down Expand Up @@ -43,22 +42,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Autofac, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.4.0.0\lib\net451\Autofac.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Autofac.Integration.Wcf, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.Wcf.4.0.0\lib\net45\Autofac.Integration.Wcf.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Autofac.Multitenant, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
<HintPath>..\..\packages\Autofac.Multitenant.4.0.0\lib\net451\Autofac.Multitenant.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Castle.Core, Version=3.2.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Castle.Core.3.2.2\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
Expand All @@ -73,22 +56,6 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand All @@ -110,18 +77,31 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Autofac">
<Version>5.1.1</Version>
</PackageReference>
<PackageReference Include="Autofac.Multitenant">
<Version>5.0.0</Version>
</PackageReference>
<PackageReference Include="Autofac.Wcf">
<Version>5.0.0</Version>
</PackageReference>
<PackageReference Include="Castle.Core">
<Version>3.2.2</Version>
</PackageReference>
<PackageReference Include="xunit">
<Version>2.1.0</Version>
</PackageReference>
<PackageReference Include="xunit.runner.visualstudio">
<Version>2.1.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
21 changes: 12 additions & 9 deletions test/Autofac.Multitenant.Wcf.Test/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-5.1.1.0" newVersion="5.1.1.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
</startup>
</configuration>
14 changes: 0 additions & 14 deletions test/Autofac.Multitenant.Wcf.Test/packages.config
View file

This file was deleted.

0 comments on commit b52e891

Please sign in to comment.