Skip to content

Commit 444943e

Browse files
tilligtillig
authored
Merge pull request #8 from alistairjevans/develop
Autofac v5 Upgrade
2 parents 23de9e7 + 891e9a6 commit 444943e

File tree

6 files changed

+52
-134
lines changed

6 files changed

+52
-134
lines changed

‎appveyor.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
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
44

55
version: $(package_semantic_version).{build}
66

7+
image: Visual Studio 2019
8+
79
assembly_info:
810
patch: true
911
file: '**\AssemblyInfo.*'

‎src/Autofac.Integration.WebApi.Owin/Autofac.Integration.WebApi.Owin.csproj‎

Lines changed: 18 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Autofac.Integration.WebApi.Owin</RootNamespace>
1111
<AssemblyName>Autofac.Integration.WebApi.Owin</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
@@ -46,43 +46,9 @@
4646
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
4747
</PropertyGroup>
4848
<ItemGroup>
49-
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
52-
</Reference>
53-
<Reference Include="Autofac.Integration.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
54-
<HintPath>..\..\packages\Autofac.Owin.4.0.0\lib\net45\Autofac.Integration.Owin.dll</HintPath>
55-
<Private>True</Private>
56-
</Reference>
57-
<Reference Include="Autofac.Integration.WebApi">
58-
<HintPath>..\..\packages\Autofac.WebApi2.3.4.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
59-
</Reference>
60-
<Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
61-
<SpecificVersion>False</SpecificVersion>
62-
<HintPath>..\..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll</HintPath>
63-
</Reference>
64-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
66-
</Reference>
67-
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
68-
<SpecificVersion>False</SpecificVersion>
69-
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
70-
</Reference>
7149
<Reference Include="System" />
7250
<Reference Include="System.Core" />
7351
<Reference Include="System.Net.Http" />
74-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
77-
</Reference>
78-
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
81-
</Reference>
82-
<Reference Include="System.Web.Http.Owin, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
83-
<SpecificVersion>False</SpecificVersion>
84-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.0\lib\net45\System.Web.Http.Owin.dll</HintPath>
85-
</Reference>
8652
<Reference Include="System.Xml.Linq" />
8753
<Reference Include="System.Data.DataSetExtensions" />
8854
<Reference Include="Microsoft.CSharp" />
@@ -97,16 +63,30 @@
9763
<ItemGroup>
9864
<None Include="app.config" />
9965
<None Include="Autofac.Integration.WebApi.Owin.nuspec" />
100-
<None Include="packages.config">
101-
<SubType>Designer</SubType>
102-
</None>
10366
</ItemGroup>
10467
<ItemGroup>
10568
<CodeAnalysisDictionary Include="..\..\CodeAnalysisDictionary.xml">
10669
<Link>CodeAnalysisDictionary.xml</Link>
10770
<SubType>Designer</SubType>
10871
</CodeAnalysisDictionary>
10972
</ItemGroup>
73+
<ItemGroup>
74+
<PackageReference Include="Autofac">
75+
<Version>5.0.0</Version>
76+
</PackageReference>
77+
<PackageReference Include="Autofac.Owin">
78+
<Version>5.0.1</Version>
79+
</PackageReference>
80+
<PackageReference Include="Autofac.WebApi2">
81+
<Version>5.0.0</Version>
82+
</PackageReference>
83+
<PackageReference Include="Microsoft.AspNet.WebApi.Owin">
84+
<Version>5.2.0</Version>
85+
</PackageReference>
86+
<PackageReference Include="Newtonsoft.Json">
87+
<Version>5.0.8</Version>
88+
</PackageReference>
89+
</ItemGroup>
11090
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
11191
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
11292
Other similar extension points exist, see Microsoft.Common.targets.

‎src/Autofac.Integration.WebApi.Owin/Autofac.Integration.WebApi.Owin.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.WebApi.Owin/releases</releaseNotes>
1616
<dependencies>
17-
<dependency id="Autofac" version="[3.5.0,5.0.0)" />
18-
<dependency id="Autofac.WebApi2" version="[3.4.0,5.0.0)" />
19-
<dependency id="Autofac.Owin" version="[4.0.0,5.0.0)" />
17+
<dependency id="Autofac" version="[5.0.0,6.0.0)" />
18+
<dependency id="Autofac.WebApi2" version="[5.0.0,6.0.0)" />
19+
<dependency id="Autofac.Owin" version="[5.0.1,6.0.0)" />
2020
</dependencies>
2121
</metadata>
2222
</package>

‎src/Autofac.Integration.WebApi.Owin/packages.config‎

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

‎test/Autofac.Integration.WebApi.Owin.Test/Autofac.Integration.WebApi.Owin.Test.csproj‎

Lines changed: 27 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.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
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
54
<PropertyGroup>
65
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,7 +9,7 @@
109
<AppDesignerFolder>Properties</AppDesignerFolder>
1110
<RootNamespace>Autofac.Integration.WebApi.Owin.Test</RootNamespace>
1211
<AssemblyName>Autofac.Integration.WebApi.Owin.Test</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
1514
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\..\</SolutionDir>
1615
<RestorePackages>true</RestorePackages>
@@ -41,60 +40,10 @@
4140
<AssemblyOriginatorKeyFile>..\..\Autofac.snk</AssemblyOriginatorKeyFile>
4241
</PropertyGroup>
4342
<ItemGroup>
44-
<Reference Include="Autofac, Version=3.5.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
45-
<SpecificVersion>False</SpecificVersion>
46-
<HintPath>..\..\packages\Autofac.3.5.0\lib\net40\Autofac.dll</HintPath>
47-
</Reference>
48-
<Reference Include="Autofac.Integration.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\Autofac.Owin.4.0.0\lib\net45\Autofac.Integration.Owin.dll</HintPath>
50-
<Private>True</Private>
51-
</Reference>
52-
<Reference Include="Autofac.Integration.WebApi">
53-
<HintPath>..\..\packages\Autofac.WebApi2.3.4.0\lib\net45\Autofac.Integration.WebApi.dll</HintPath>
54-
</Reference>
55-
<Reference Include="Microsoft.Owin, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
56-
<SpecificVersion>False</SpecificVersion>
57-
<HintPath>..\..\packages\Microsoft.Owin.3.0.0\lib\net45\Microsoft.Owin.dll</HintPath>
58-
</Reference>
59-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
60-
<HintPath>..\..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
61-
</Reference>
62-
<Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
63-
<SpecificVersion>False</SpecificVersion>
64-
<HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
65-
</Reference>
6643
<Reference Include="System" />
6744
<Reference Include="System.Core" />
6845
<Reference Include="Microsoft.CSharp" />
6946
<Reference Include="System.Net.Http" />
70-
<Reference Include="System.Net.Http.Formatting, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
71-
<SpecificVersion>False</SpecificVersion>
72-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
73-
</Reference>
74-
<Reference Include="System.Web.Http, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
75-
<SpecificVersion>False</SpecificVersion>
76-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.0\lib\net45\System.Web.Http.dll</HintPath>
77-
</Reference>
78-
<Reference Include="System.Web.Http.Owin, Version=5.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<SpecificVersion>False</SpecificVersion>
80-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.0\lib\net45\System.Web.Http.Owin.dll</HintPath>
81-
</Reference>
82-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
83-
<HintPath>..\..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
84-
<Private>True</Private>
85-
</Reference>
86-
<Reference Include="xunit.assert, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
87-
<HintPath>..\..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll</HintPath>
88-
<Private>True</Private>
89-
</Reference>
90-
<Reference Include="xunit.core, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
91-
<HintPath>..\..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll</HintPath>
92-
<Private>True</Private>
93-
</Reference>
94-
<Reference Include="xunit.execution.desktop, Version=2.1.0.3179, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
95-
<HintPath>..\..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
96-
<Private>True</Private>
97-
</Reference>
9847
</ItemGroup>
9948
<ItemGroup>
10049
<Compile Include="Properties\AssemblyInfo.cs" />
@@ -109,18 +58,37 @@
10958
</ItemGroup>
11059
<ItemGroup>
11160
<None Include="App.config" />
112-
<None Include="packages.config" />
11361
</ItemGroup>
11462
<ItemGroup>
11563
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
11664
</ItemGroup>
65+
<ItemGroup>
66+
<PackageReference Include="Autofac">
67+
<Version>5.0.0</Version>
68+
</PackageReference>
69+
<PackageReference Include="Autofac.Owin">
70+
<Version>5.0.1</Version>
71+
</PackageReference>
72+
<PackageReference Include="Autofac.WebApi2">
73+
<Version>5.0.0</Version>
74+
</PackageReference>
75+
<PackageReference Include="Microsoft.AspNet.WebApi.Owin">
76+
<Version>5.2.0</Version>
77+
</PackageReference>
78+
<PackageReference Include="Newtonsoft.Json">
79+
<Version>5.0.8</Version>
80+
</PackageReference>
81+
<PackageReference Include="xunit">
82+
<Version>2.1.0</Version>
83+
</PackageReference>
84+
<PackageReference Include="xunit.runner.console">
85+
<Version>2.1.0</Version>
86+
</PackageReference>
87+
<PackageReference Include="xunit.runner.visualstudio">
88+
<Version>2.1.0</Version>
89+
</PackageReference>
90+
</ItemGroup>
11791
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
118-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
119-
<PropertyGroup>
120-
<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>
121-
</PropertyGroup>
122-
<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'))" />
123-
</Target>
12492
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
12593
Other similar extension points exist, see Microsoft.Common.targets.
12694
<Target Name="BeforeBuild">

‎test/Autofac.Integration.WebApi.Owin.Test/packages.config‎

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

0 commit comments

Comments
 (0)