Skip to content

Commit fa26495

Browse files
kroniakkroniak
committed
tmenier#131 bugfix
1 parent 5d11f21 commit fa26495

File tree

12 files changed

+21
-23
lines changed

12 files changed

+21
-23
lines changed

‎Build/nuspec/Flurl.Http.nuspec

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package >
33
<metadata>
44
<id>Flurl.Http</id>
5-
<version>1.0.2</version>
5+
<version>1.0.3</version>
66
<title>Flurl.Http</title>
77
<authors>Todd Menier</authors>
88
<projectUrl>http://tmenier.github.io/Flurl</projectUrl>
@@ -13,6 +13,7 @@
1313
A fluent, portable, testable HTTP client library that extends Flurl's URL builder chain.
1414
</description>
1515
<releaseNotes>
16+
1.0.3 - Fix framework assemblies dependicies (https://github.com/tmenier/Flurl/issues/131)
1617
1.0.2 - Updated Flurl dependency to 2.2.1 https://www.nuget.org/packages/Flurl/2.2.1
1718
1.0.1 - Updated Flurl dependency to 2.2 https://www.nuget.org/packages/Flurl/2.2.0
1819
1.0.0 - Many updates and new features: https://github.com/tmenier/Flurl/releases/tag/Flurl.Http.1.0.0
@@ -107,6 +108,9 @@
107108
<dependency id="System.Text.Encoding.CodePages" version="4.0.1" />
108109
</group>
109110
</dependencies>
111+
<frameworkAssemblies>
112+
<frameworkAssembly assemblyName="System.Net.Http" targetFramework=".NETFramework4.5" />
113+
</frameworkAssemblies>
110114
</metadata>
111115
<files>
112116
<file src="..\..\src\Flurl.Http\bin\Release\portable40-net45+sl5+win8+wp8+wpa81\Flurl.Http.*" target="lib\monoandroid" />

‎PackageTesters/PackageTester.NET45/PackageTester.NET45.csproj

+2-3
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<HintPath>..\..\packages\Flurl.2.2.1\lib\portable40-net40+sl5+win8+wp8+wpa81\Flurl.dll</HintPath>
4141
<Private>True</Private>
4242
</Reference>
43-
<Reference Include="Flurl.Http, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
44-
<HintPath>..\..\packages\Flurl.Http.1.0.2\lib\net45\Flurl.Http.dll</HintPath>
43+
<Reference Include="Flurl.Http, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
44+
<HintPath>..\..\packages\Flurl.Http.1.0.3\lib\net45\Flurl.Http.dll</HintPath>
4545
<Private>True</Private>
4646
</Reference>
4747
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -80,7 +80,6 @@
8080
<HintPath>..\..\packages\Microsoft.Net.Http.2.2.29\lib\net45\System.Net.Http.Primitives.dll</HintPath>
8181
<Private>True</Private>
8282
</Reference>
83-
<Reference Include="System.Net.Http.WebRequest" />
8483
</ItemGroup>
8584
<ItemGroup>
8685
<Compile Include="Net45Tester.cs" />

‎PackageTesters/PackageTester.NET45/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Flurl" version="2.2.1" targetFramework="net45" />
4-
<package id="Flurl.Http" version="1.0.2" targetFramework="net45" />
4+
<package id="Flurl.Http" version="1.0.3" targetFramework="net45" />
55
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="net45" />
66
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />
77
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net45" />

‎PackageTesters/PackageTester.NET461/PackageTester.NET461.csproj

+2-7
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@
3838
<HintPath>..\..\packages\Flurl.2.2.1\lib\netstandard1.4\Flurl.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
41-
<Reference Include="Flurl.Http, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\..\packages\Flurl.Http.1.0.2\lib\net45\Flurl.Http.dll</HintPath>
41+
<Reference Include="Flurl.Http, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\..\packages\Flurl.Http.1.0.3\lib\net45\Flurl.Http.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
45-
<Reference Include="Microsoft.CSharp" />
4645
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
4746
<HintPath>..\..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
4847
<Private>True</Private>
@@ -57,10 +56,6 @@
5756
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
5857
<Private>True</Private>
5958
</Reference>
60-
<Reference Include="System.Globalization.Calendars, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
61-
<HintPath>..\..\packages\System.Globalization.Calendars.4.0.1\lib\net46\System.Globalization.Calendars.dll</HintPath>
62-
<Private>True</Private>
63-
</Reference>
6459
<Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
6560
<HintPath>..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
6661
<Private>True</Private>

‎PackageTesters/PackageTester.NET461/packages.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Flurl" version="2.2.1" targetFramework="net461" />
4-
<package id="Flurl.Http" version="1.0.2" targetFramework="net461" />
4+
<package id="Flurl.Http" version="1.0.3" targetFramework="net461" />
55
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" />
66
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
77
<package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net461" />
8-
<package id="System.Globalization.Calendars" version="4.0.1" targetFramework="net461" />
8+
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
99
<package id="System.IO.FileSystem" version="4.0.1" targetFramework="net461" />
1010
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
1111
<package id="System.Linq" version="4.1.0" targetFramework="net461" />

‎PackageTesters/PackageTester.NETCore/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
}
77
},
88
"dependencies": {
9-
"Flurl.Http": "1.0.2"
9+
"Flurl.Http": "1.0.3"
1010
},
1111
"frameworks": {
1212
"netcoreapp1.0": {
1313
"dependencies": {
1414
"Microsoft.NETCore.App": {
1515
"type": "platform",
16-
"version": "1.0.0"
16+
"version": "1.0.1"
1717
}
1818
}
1919
}

‎PackageTesters/PackageTester.PCL/PackageTester.PCL.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<HintPath>..\..\packages\Flurl.2.2.1\lib\portable40-net40+sl5+win8+wp8+wpa81\Flurl.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
56-
<Reference Include="Flurl.Http, Version=1.0.2.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\..\packages\Flurl.Http.1.0.2\lib\portable40-net45+sl5+win8+wp8+wpa81\Flurl.Http.dll</HintPath>
56+
<Reference Include="Flurl.Http, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\..\packages\Flurl.Http.1.0.3\lib\portable40-net45+sl5+win8+wp8+wpa81\Flurl.Http.dll</HintPath>
5858
<Private>True</Private>
5959
</Reference>
6060
<Reference Include="Microsoft.Threading.Tasks, Version=1.0.12.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

‎PackageTesters/PackageTester.PCL/packages.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Flurl" version="2.2.1" targetFramework="portable40-net45+sl5+win8+wp8+wpa81" />
4-
<package id="Flurl.Http" version="1.0.2" targetFramework="portable40-net45+sl5+win8+wp8+wpa81" />
4+
<package id="Flurl.Http" version="1.0.3" targetFramework="portable40-net45+sl5+win8+wp8+wpa81" />
55
<package id="Microsoft.Bcl" version="1.1.10" targetFramework="portable40-net45+sl5+win8+wp8+wpa81" />
66
<package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="portable40-net45+sl5+win8+wp8+wpa81" />
77
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="portable40-net45+sl5+win8+wp8+wpa81" />

‎Test/Flurl.Test.NETCore/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
"dependencies": {
3636
"Microsoft.NETCore.App": {
3737
"type": "platform",
38-
"version": "1.0.0"
38+
"version": "1.0.1"
3939
}
4040
}
4141
}

‎global.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src", "test" ],
33
"sdk": {
4-
"version": "1.0.0-preview2-003121"
4+
"version": "1.0.0-preview2-003131"
55
}
66
}

‎src/Flurl.Http.CodeGen/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"dependencies": {
1515
"Microsoft.NETCore.App": {
1616
"type": "platform",
17-
"version": "1.0.0"
17+
"version": "1.0.1"
1818
}
1919
},
2020

‎src/Flurl.Http/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"title": "Flurl.Http",
3-
"version": "1.0.2",
3+
"version": "1.0.3",
44

55
"dependencies": {
66
"Flurl": "2.2.1",

0 commit comments

Comments
 (0)