Skip to content

Commit 13245ba

Browse files
author
Neil Campbell
committed
Adding support for net40 and net45
1 parent 3a5921b commit 13245ba

File tree

168 files changed

+56054
-195
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+56054
-195
lines changed

‎Build/.nuget/NuGet.Config

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

‎Build/.nuget/NuGet.targets

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

‎Build/Publish-Release.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ $SolutionRoot = Split-Path -Path $BuildRoot -Parent
1414
$NuGetExe = Join-Path $BuildRoot -ChildPath ".nuget\nuget.exe"
1515

1616
# Build the NuGet package
17-
$ProjectPath = Join-Path -Path $SolutionRoot -ChildPath "PactNet\PactNet.csproj"
17+
$ProjectPath = Join-Path -Path $SolutionRoot -ChildPath "PactNet\PactNet.nuspec"
1818
& $NuGetExe pack $ProjectPath -Prop Configuration=Release -OutputDirectory $BuildRoot -Version $ReleaseVersionNumber
1919
if (-not $?)
2020
{

‎PactNet.Tests/PactNet.Tests.csproj

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>PactNet.Tests</RootNamespace>
1111
<AssemblyName>PactNet.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<TargetFrameworkProfile />
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -35,28 +36,49 @@
3536
<HintPath>..\packages\Nancy.0.23.1\lib\net40\Nancy.dll</HintPath>
3637
</Reference>
3738
<Reference Include="Nancy.Hosting.Self, Version=0.23.1.0, Culture=neutral, processorArchitecture=MSIL">
38-
<SpecificVersion>False</SpecificVersion>
3939
<HintPath>..\packages\Nancy.Hosting.Self.0.23.1\lib\net40\Nancy.Hosting.Self.dll</HintPath>
4040
</Reference>
4141
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
4242
<SpecificVersion>False</SpecificVersion>
43-
<HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
43+
<HintPath>..\packages\Newtonsoft.Json.6.0.3\lib\net40\Newtonsoft.Json.dll</HintPath>
4444
</Reference>
45-
<Reference Include="NSubstitute">
46-
<HintPath>..\packages\NSubstitute.1.7.2.0\lib\NET45\NSubstitute.dll</HintPath>
45+
<Reference Include="NSubstitute, Version=1.7.2.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
46+
<SpecificVersion>False</SpecificVersion>
47+
<HintPath>..\packages\NSubstitute.1.7.2.0\lib\NET40\NSubstitute.dll</HintPath>
4748
</Reference>
4849
<Reference Include="System" />
4950
<Reference Include="System.Core" />
50-
<Reference Include="System.IO.Abstractions">
51+
<Reference Include="Microsoft.CSharp" />
52+
<Reference Include="System.IO">
53+
<HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.IO.dll</HintPath>
54+
</Reference>
55+
<Reference Include="System.IO.Abstractions, Version=1.4.0.86, Culture=neutral, PublicKeyToken=d480b5b72fb413da, processorArchitecture=MSIL">
56+
<SpecificVersion>False</SpecificVersion>
5157
<HintPath>..\packages\System.IO.Abstractions.1.4.0.86\lib\net35\System.IO.Abstractions.dll</HintPath>
5258
</Reference>
53-
<Reference Include="System.Net.Http" />
54-
<Reference Include="System.Xml.Linq" />
55-
<Reference Include="System.Data.DataSetExtensions" />
56-
<Reference Include="Microsoft.CSharp" />
57-
<Reference Include="System.Data" />
58-
<Reference Include="System.Xml" />
59-
<Reference Include="xunit">
59+
<Reference Include="System.Net.Http, Version=2.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net40\System.Net.Http.dll</HintPath>
62+
</Reference>
63+
<Reference Include="System.Net.Http.Extensions">
64+
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net40\System.Net.Http.Extensions.dll</HintPath>
65+
</Reference>
66+
<Reference Include="System.Net.Http.Primitives">
67+
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net40\System.Net.Http.Primitives.dll</HintPath>
68+
</Reference>
69+
<Reference Include="System.Net.Http.WebRequest, Version=2.2.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
70+
<SpecificVersion>False</SpecificVersion>
71+
<HintPath>..\packages\Microsoft.Net.Http.2.2.28\lib\net40\System.Net.Http.WebRequest.dll</HintPath>
72+
</Reference>
73+
<Reference Include="System.Runtime">
74+
<HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Runtime.dll</HintPath>
75+
<Private>True</Private>
76+
</Reference>
77+
<Reference Include="System.Threading.Tasks">
78+
<HintPath>..\packages\Microsoft.Bcl.1.1.9\lib\net40\System.Threading.Tasks.dll</HintPath>
79+
</Reference>
80+
<Reference Include="xunit, Version=1.9.2.1705, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
81+
<SpecificVersion>False</SpecificVersion>
6082
<HintPath>..\packages\xunit.1.9.2\lib\net20\xunit.dll</HintPath>
6183
</Reference>
6284
</ItemGroup>
@@ -109,9 +131,6 @@
109131
<Compile Include="Properties\AssemblyInfo.cs" />
110132
<Compile Include="Mocks\MockHttpService\Validators\ProviderServiceValidatorTests.cs" />
111133
</ItemGroup>
112-
<ItemGroup>
113-
<None Include="packages.config" />
114-
</ItemGroup>
115134
<ItemGroup>
116135
<ProjectReference Include="..\PactNet\PactNet.csproj">
117136
<Project>{7024b146-2cb2-4de2-b079-58cf9c44640b}</Project>
@@ -121,8 +140,15 @@
121140
<ItemGroup>
122141
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
123142
</ItemGroup>
124-
<ItemGroup />
143+
<ItemGroup>
144+
<None Include="packages.config" />
145+
</ItemGroup>
125146
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
147+
<Import Project="..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
148+
<Target Name="EnsureBclBuildImported" BeforeTargets="BeforeBuild" Condition="'$(BclBuildImported)' == ''">
149+
<Error Condition="!Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=317567." HelpKeyword="BCLBUILD2001" />
150+
<Error Condition="Exists('..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build. For more information, see http://go.microsoft.com/fwlink/?LinkID=317568." HelpKeyword="BCLBUILD2002" />
151+
</Target>
126152
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
127153
Other similar extension points exist, see Microsoft.Common.targets.
128154
<Target Name="BeforeBuild">

‎PactNet.Tests/packages.config

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Nancy" version="0.23.1" targetFramework="net45" />
4-
<package id="Nancy.Hosting.Self" version="0.23.1" targetFramework="net45" />
5-
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net45" />
6-
<package id="NSubstitute" version="1.7.2.0" targetFramework="net45" />
7-
<package id="System.IO.Abstractions" version="1.4.0.86" targetFramework="net45" />
8-
<package id="xunit" version="1.9.2" targetFramework="net45" />
3+
<package id="Microsoft.Bcl" version="1.1.9" targetFramework="net40" />
4+
<package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net40" />
5+
<package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net40" />
6+
<package id="Nancy" version="0.23.1" targetFramework="net40" />
7+
<package id="Nancy.Hosting.Self" version="0.23.1" targetFramework="net40" />
8+
<package id="Newtonsoft.Json" version="6.0.3" targetFramework="net40" />
9+
<package id="NSubstitute" version="1.7.2.0" targetFramework="net40" />
10+
<package id="System.IO.Abstractions" version="1.4.0.86" targetFramework="net40" />
11+
<package id="xunit" version="1.9.2" targetFramework="net40" />
912
</packages>

0 commit comments

Comments
 (0)