Skip to content

Commit

Permalink
Merge pull request tmenier#199 from tmenier/dev
Browse files Browse the repository at this point in the history
Flurl 2.4.0 & Flurl.Http 1.2.0
  • Loading branch information
tmenier committed Jul 21, 2017
2 parents a412941 + cae33a1 commit bf3365f
Show file tree
Hide file tree
Showing 18 changed files with 116 additions and 194 deletions.
2 changes: 1 addition & 1 deletion Flurl.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.15
VisualStudioVersion = 15.0.26430.6
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flurl", "src\Flurl\Flurl.csproj", "{117B6C6E-53F9-45AE-9439-F4FB7E21B116}"
EndProject
Expand Down
4 changes: 0 additions & 4 deletions PackageTesters/PackageTester.NET45/Net45Tester.cs

This file was deleted.

13 changes: 6 additions & 7 deletions PackageTesters/PackageTester.NET45/PackageTester.NET45.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Flurl, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.2.3.0\lib\portable40-net40+sl5+win8+wp8+wpa81\Flurl.dll</HintPath>
<Reference Include="Flurl, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.2.4.0-pre\lib\net40\Flurl.dll</HintPath>
</Reference>
<Reference Include="Flurl.Http, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.Http.1.1.3\lib\net45\Flurl.Http.dll</HintPath>
<Reference Include="Flurl.Http, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.Http.1.2.0-pre\lib\net45\Flurl.Http.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -50,7 +50,6 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Net45Tester.cs" />
<Compile Include="Program.cs" />
</ItemGroup>
<ItemGroup>
Expand Down
20 changes: 4 additions & 16 deletions PackageTesters/PackageTester.NET45/Program.cs
Original file line number Diff line number Diff line change
@@ -1,28 +1,16 @@
using System;
using System.IO;
using System.Threading.Tasks;
using PackageTester.PCL;

namespace PackageTester.NET45
{
public class Program
{
public static void Main(string[] args) {
TestAllPlatformsAsync().Wait();
new Tester().DoTestsAsync().Wait();
Console.WriteLine();
Console.WriteLine("Testing against PCL...");
new PclTester().DoTestsAsync().Wait();
Console.ReadLine();
}

private static async Task TestAllPlatformsAsync() {
Cleanup();
await new Net45Tester().DoTestsAsync(Console.WriteLine);
Cleanup();
await new PclTester().DoTestsAsync(Console.WriteLine);
Cleanup();
}

private static void Cleanup() {
var file = "c:\\google.txt";
if (File.Exists(file)) File.Delete(file);
}
}
}
6 changes: 3 additions & 3 deletions PackageTesters/PackageTester.NET45/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Flurl" version="2.3.0" targetFramework="net45" />
<package id="Flurl.Http" version="1.1.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="Flurl" version="2.4.0" targetFramework="net45" />
<package id="Flurl.Http" version="1.2.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
</packages>
20 changes: 2 additions & 18 deletions PackageTesters/PackageTester.NET461/App.config
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
</startup>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.1.0.0" newVersion="4.1.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
4 changes: 0 additions & 4 deletions PackageTesters/PackageTester.NET461/Net461Tester.cs

This file was deleted.

51 changes: 10 additions & 41 deletions PackageTesters/PackageTester.NET461/PackageTester.NET461.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,62 +33,31 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Flurl, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.2.3.0\lib\netstandard1.4\Flurl.dll</HintPath>
<Reference Include="Flurl, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.2.4.0-pre\lib\net40\Flurl.dll</HintPath>
</Reference>
<Reference Include="Flurl.Http, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.Http.1.1.3\lib\net45\Flurl.Http.dll</HintPath>
<Reference Include="Flurl.Http, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.Http.1.2.0-pre\lib\net45\Flurl.Http.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Win32.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\Microsoft.Win32.Primitives.4.0.1\lib\net46\Microsoft.Win32.Primitives.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.IO.FileSystem, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.FileSystem.4.0.1\lib\net46\System.IO.FileSystem.dll</HintPath>
</Reference>
<Reference Include="System.IO.FileSystem.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.IO.FileSystem.Primitives.4.0.1\lib\net46\System.IO.FileSystem.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Net.Http.4.1.0\lib\net46\System.Net.Http.dll</HintPath>
</Reference>
<Reference Include="System.Reflection.TypeExtensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Reflection.TypeExtensions.4.1.0\lib\net46\System.Reflection.TypeExtensions.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.2.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.0.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.0.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.1.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
</Reference>
<Reference Include="System.Text.Encoding.CodePages, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\packages\System.Text.Encoding.CodePages.4.0.1\lib\net46\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Net461Tester.cs" />
<Compile Include="Program.cs" />
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="App.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
Expand Down
31 changes: 7 additions & 24 deletions PackageTesters/PackageTester.NET461/Program.cs
Original file line number Diff line number Diff line change
@@ -1,29 +1,12 @@
using System;
using System.IO;
using System.Threading.Tasks;

namespace PackageTester.NET461
{
public class Program
{
public static void Main(string[] args)
{
TestAllPlatformsAsync().Wait();
Console.ReadLine();
}

private static async Task TestAllPlatformsAsync()
{
Cleanup();
await new Net461Tester().DoTestsAsync(Console.WriteLine);
Cleanup();
}

private static void Cleanup()
{
var file = "c:\\google.txt";
if (File.Exists(file))
File.Delete(file);
}
}
public class Program
{
public static void Main(string[] args) {
new Tester().DoTestsAsync().Wait();
Console.ReadLine();
}
}
}
19 changes: 3 additions & 16 deletions PackageTesters/PackageTester.NET461/packages.config
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Flurl" version="2.3.0" targetFramework="net461" />
<package id="Flurl.Http" version="1.1.3" targetFramework="net461" />
<package id="Microsoft.Win32.Primitives" version="4.0.1" targetFramework="net461" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
<package id="System.Diagnostics.DiagnosticSource" version="4.0.0" targetFramework="net461" />
<package id="System.Globalization" version="4.0.11" targetFramework="net461" />
<package id="System.IO.FileSystem" version="4.0.1" targetFramework="net461" />
<package id="System.IO.FileSystem.Primitives" version="4.0.1" targetFramework="net461" />
<package id="System.Linq" version="4.1.0" targetFramework="net461" />
<package id="System.Net.Http" version="4.1.0" targetFramework="net461" />
<package id="System.Reflection.TypeExtensions" version="4.1.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Algorithms" version="4.2.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Encoding" version="4.0.0" targetFramework="net461" />
<package id="System.Security.Cryptography.Primitives" version="4.0.0" targetFramework="net461" />
<package id="System.Security.Cryptography.X509Certificates" version="4.1.0" targetFramework="net461" />
<package id="System.Text.Encoding.CodePages" version="4.0.1" targetFramework="net461" />
<package id="Flurl" version="2.4.0" targetFramework="net461" />
<package id="Flurl.Http" version="1.2.0" targetFramework="net461" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
</packages>
4 changes: 0 additions & 4 deletions PackageTesters/PackageTester.NETCore/NetCoreTester.cs

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<TargetFramework>netcoreapp1.1</TargetFramework>
</PropertyGroup>

<Import Project="..\PackageTester.Shared\PackageTester.Shared.projitems" Label="Shared" />

<ItemGroup>
<PackageReference Include="Flurl.Http" Version="1.1.2" />
<PackageReference Include="Flurl.Http" Version="1.2.0-pre" />
</ItemGroup>

<Import Project="..\PackageTester.Shared\PackageTester.Shared.projitems" Label="Shared" />

</Project>
25 changes: 7 additions & 18 deletions PackageTesters/PackageTester.NETCore/Program.cs
Original file line number Diff line number Diff line change
@@ -1,23 +1,12 @@
using System;
using System.IO;

namespace PackageTester
{
public class Program
{
public static void Main(string[] args)
{
Cleanup();
new NetCoreTester().DoTestsAsync(Console.WriteLine).Wait();
Cleanup();
Console.ReadLine();
}

private static void Cleanup()
{
var file = "c:\\google.txt";
if (File.Exists(file))
File.Delete(file);
}
}
public class Program
{
public static void Main(string[] args) {
new Tester().DoTestsAsync().Wait();
Console.ReadLine();
}
}
}
12 changes: 6 additions & 6 deletions PackageTesters/PackageTester.PCL/PackageTester.PCL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Flurl, Version=2.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.2.3.0\lib\portable40-net40+sl5+win8+wp8+wpa81\Flurl.dll</HintPath>
<Reference Include="Flurl, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.2.4.0-pre\lib\net40\Flurl.dll</HintPath>
</Reference>
<Reference Include="Flurl.Http, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.Http.1.1.3\lib\net45\Flurl.Http.dll</HintPath>
<Reference Include="Flurl.Http, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\Flurl.Http.1.2.0-pre\lib\net45\Flurl.Http.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
6 changes: 3 additions & 3 deletions PackageTesters/PackageTester.PCL/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Flurl" version="2.3.0" targetFramework="net45" />
<package id="Flurl.Http" version="1.1.3" targetFramework="net45" />
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="Flurl" version="2.4.0" targetFramework="net45" />
<package id="Flurl.Http" version="1.2.0" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
</packages>
Loading

0 comments on commit bf3365f

Please sign in to comment.