tmenier/Flurl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix targets - part 1

Browse Source
This commit is contained in:
Nikolay Molchanov 2016-05-27 20:17:52 +03:00
parent e34e877492
commit c6e2b99fad
5 changed files with 65 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
Build/nuspec/Flurl.Http.nuspec
View File

@ -2,7 +2,7 @@
<package >
<metadata>
<id>Flurl.Http</id>
<version>1.0.0-beta3</version>
<version>1.0.0-beta4</version>
<title>Flurl.Http</title>
<authors>Todd Menier</authors>
<projectUrl>http://tmenier.github.io/Flurl</projectUrl>
@ -44,57 +44,57 @@
<dependencies>
<group targetFramework="MonoAndroid1.0">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
</group>
<group targetFramework="MonoTouch1.0">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
</group>
<group targetFramework="Xamarin.iOS1.0">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
</group>
<group targetFramework="Xamarin.Mac2.0">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
</group>
<group targetFramework="Xamarin.TVOS1.0">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
</group>
<group targetFramework="Xamarin.WatchOS1.0">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
</group>
<group targetFramework="portable45-net45+win8+wpa81">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
<dependency id="Microsoft.Bcl.Async" version="1.0.168" />
<dependency id="Microsoft.Net.Http" version="2.2.29" />
<dependency id="PCLStorage" version="1.0.2" />
</group>
<group targetFramework="net45">
<group targetFramework="net45">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
</group>
<group targetFramework="net46">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
<dependency id="System.IO.FileSystem" version="4.0.0" />
</group>
<group targetFramework="uap10">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
</group>
<group targetFramework=".NETStandard1.4">
<group targetFramework=".NETStandard1.3">
<dependency id="Newtonsoft.Json" version="8.0.3" />
<dependency id="Flurl" version="2.1.0-beta2" />
<dependency id="System.Dynamic.Runtime" version="4.0.10" />
<dependency id="System.IO.FileSystem" version="4.0.0" />
<dependency id="System.Net.Http" version="4.0.0" />
<dependency id="System.Runtime.Serialization.Primitives" version="4.1.0" />
<dependency id="System.Text.RegularExpressions" version="4.0.10" />
<dependency id="System.Threading" version="4.0.10" />
<dependency id="Flurl" version="2.1.0-beta3-update1" />
<dependency id="System.Dynamic.Runtime" version="4.0.11-rc2-24027" />
<dependency id="System.IO.FileSystem" version="4.0.1-rc2-24027" />
<dependency id="System.Net.Http" version="4.0.1-rc2-24027" />
<dependency id="System.Runtime.Serialization.Primitives" version="4.1.1-rc2-24027" />
<dependency id="System.Text.RegularExpressions" version="4.0.12-rc2-24027" />
<dependency id="System.Threading" version="4.0.11-rc2-24027" />
</group>
</dependencies>
</metadata>

18
Build/nuspec/Flurl.nuspec
View File

@ -1,8 +1,8 @@
<?xml version="1.0"?>
<?xml version="1.0"?>
<package >
<metadata>
<id>Flurl</id>
<version>2.1.0-beta2</version>
<version>2.1.0-beta3-update1</version>
<title>Flurl</title>
<authors>Todd Menier</authors>
<projectUrl>http://tmenier.github.io/Flurl</projectUrl>
@ -39,21 +39,25 @@
<group targetFramework="MonoTouch1.0" />
<group targetFramework="net40" />
<group targetFramework="net45" />
<group targetFramework="net46" />
<group targetFramework="uap10" />
<group targetFramework="portable45-net45+win8+wpa81" />
<group targetFramework="portable40-net40+win8+wpa81" />
<group targetFramework="Windows8.0" />
<group targetFramework="WindowsPhoneApp8.1" />
<group targetFramework="Xamarin.iOS1.0" />
<group targetFramework="Xamarin.Mac2.0" />
<group targetFramework="Xamarin.TVOS1.0" />
<group targetFramework="Xamarin.WatchOS1.0" />
<group targetFramework=".NETStandard1.1">
<dependency id="System.Linq" version="4.0.0" />
<dependency id="System.Reflection.TypeExtensions" version="4.0.0" />
<group targetFramework=".NETStandard1.3">
<dependency id="System.Globalization" version= "4.0.11-rc2-24027" />
<dependency id="System.Linq" version="4.1.0-rc2-24027" />
<dependency id="System.Reflection.TypeExtensions" version="4.1.0-rc2-24027" />
</group>
</dependencies>
</metadata>
<files>
<file src="..\..\src\Flurl.Library\bin\Release\**\Flurl.*" target="lib\" />
<file src="..\..\src\Flurl.Library\bin\Release\portable40-net40+win8+wpa81\Flurl.*" target="lib\portable40-net40+win8+wpa81" />
<file src="..\..\src\Flurl.Library\bin\Release\portable40-net40+win8+wpa81\Flurl.*" target="lib\MonoAndroid10" />
<file src="..\..\src\Flurl.Library\bin\Release\netstandard1.3\Flurl.*" target="lib\netstandard1.3" />
</files>
</package>

30
src/Flurl.Http.Library/project.json
View File

@ -1,9 +1,9 @@
{
{
"title": "Flurl.Http",
"version": "1.0.0-beta3",
"version": "1.0.0-beta4",
"dependencies": {
"Flurl": "2.1.0-beta2",
"Flurl": "2.1.0-beta3-update1",
"Newtonsoft.Json": "8.0.3"
},
@ -18,8 +18,9 @@
"frameworks": {
"portable45-net45+win8+wpa81": {
"buildOptions": {
"define": [ "PORTABLE" ] },
"buildOptions": {
"define": [ "PORTABLE" ]
},
"dependencies": {
"Microsoft.Bcl.Async": "1.0.168",
"Microsoft.Net.Http": "2.2.29",
@ -35,17 +36,18 @@
"System.Threading": "4.0.0.0"
}
},
"netstandard1.4": {
"buildOptions": {
"define": [ "NETSTD" ] },
"netstandard1.3": {
"buildOptions": {
"define": [ "NETSTD" ]
},
"imports": "dnxcore50",
"dependencies": {
"System.Dynamic.Runtime": "4.0.10",
"System.IO.FileSystem": "4.0.0",
"System.Net.Http": "4.0.0",
"System.Runtime.Serialization.Primitives": "4.1.0",
"System.Text.RegularExpressions": "4.0.10",
"System.Threading": "4.0.10"
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.IO.FileSystem": "4.0.1-rc2-24027",
"System.Net.Http": "4.0.1-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Text.RegularExpressions": "4.0.12-rc2-24027",
"System.Threading": "4.0.11-rc2-24027"
}
}
}

21
src/Flurl.Library/project.json
View File

@ -1,6 +1,6 @@
{
"title": "Flurl",
"version": "2.1.0-beta2",
"version": "2.1.0-beta3-update1",
"buildOptions": {
"compile": {
@ -12,12 +12,21 @@
},
"frameworks": {
"net40": { },
"netstandard1.1": {
"imports": "dotnet51",
"portable40-net40+win8+wpa81": {
"frameworkAssemblies": {
"mscorlib": "2.0.5.0",
"System": "2.0.5.0",
"System.Core": "2.0.5.0"
}
},
"netstandard1.3": {
"buildOptions": {
"define": [ "NETSTD" ]
},
"dependencies": {
"System.Linq": "4.0.0",
"System.Reflection.TypeExtensions": "4.0.0"
"System.Globalization": "4.0.11-rc2-24027",
"System.Linq": "4.1.0-rc2-24027",
"System.Reflection.TypeExtensions": "4.1.0-rc2-24027"
}
}
}

4
src/Flurl.Shared/Util/CommonExtensions.cs
View File

@ -3,7 +3,9 @@ using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
#if NETSTD
using System.Reflection;
#endif
namespace Flurl.Util
{
@ -80,4 +82,4 @@ namespace Flurl.Util
}
}
}
}
}