Skip to content

Commit

Permalink
Merge pull request #8 from WURFL/2.1.2
Browse files Browse the repository at this point in the history
WPC-228 support issue #5192 Error creating WM CLIENT: Could not load …
  • Loading branch information
andreacastello authored Nov 10, 2020
2 parents 017910d + 5de82b3 commit b8b20e5
Show file tree
Hide file tree
Showing 12 changed files with 20 additions and 77 deletions.
5 changes: 2 additions & 3 deletions Example/Example-dotNetCore-vs2017.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>Example_dotNetCore_vs2017</RootNamespace>
</PropertyGroup>

Expand All @@ -11,8 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
<PackageReference Include="WURFL_Microservice_Client.Core" Version="2.1.1" />
<PackageReference Include="WURFL_Microservice_Client.Core" Version="2.1.2" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion Example/WmClientExample.cs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ static void Main(string[] args)
{
// First we need to create a WM client instance, to connect to our WM server API at the specified host and port.
// Last parameter is a prefix for path, most of the time we won't need it
WmClient client = WmClient.Create("http" , "localhost", "8080", "");
WmClient client = WmClient.Create("http" , "localhost", "80", "");

if (client != null)
{
Expand Down
34 changes: 0 additions & 34 deletions Example/app.config

This file was deleted.

23 changes: 0 additions & 23 deletions Example/packages.config

This file was deleted.

4 changes: 2 additions & 2 deletions NUnit-Test/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.1")]
[assembly: AssemblyFileVersion("2.1.1")]
[assembly: AssemblyVersion("2.1.2")]
[assembly: AssemblyFileVersion("2.1.2")]
2 changes: 1 addition & 1 deletion NUnit-Test/WmClient-DotNetCore-NUnitTest-vs2017.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>

<IsPackable>false</IsPackable>

Expand Down
12 changes: 9 additions & 3 deletions Nuget Package-dotNetCore/WMClient_API_DotNetCore.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>WURFL_Microservice_Client.Core</id>
<version>2.1.1</version>
<version>2.1.2</version>
<title>WURFL Microservice client API for .NET Core</title>
<authors>ScientiaMobile,Inc.</authors>
<owners>ScientiaMobile,Inc.</owners>
Expand All @@ -15,20 +15,26 @@
The Client API relies on the presence of a running instance of "WURFL Microservice", available as either a Docker image (obtainable from ScientiaMobile, https://www.scientiamobile.com/products/wurfl-microservice-docker-detect-device/) or a Virtual Machine (AMI, VM instances and such:
https://www.scientiamobile.com/introducing-wurfl-microservice-for-aws/ ) of major Cloud infrastructure providers, such as: AWS, Azure and Google Cloud Platform).</description>
<releaseNotes>
2.1.2 - Fix: Could not load file or assembly 'System.Net.Http.Formatting' error.Set target framework to netcoreapp 3.1
2.1.1 - Ehn: Added cache usage tests. Used HTTP headers in samlple app detection.
2.1.0 - Added LookupHeaders method to API. Improved tests to be executed on different server configurations.
2.0.4 - Fix: naming issue in .NET Core package
2.0.3 - Added support for .NET Core framework 2.2.0
2.0.2 - Better packaging and info for NuGet release
2.0.1 - Initial release
</releaseNotes>
<dependencies>
<group targetFramework=".NETCoreApp3.1">
<dependency id="Microsoft.AspNet.WebApi.Client" version="5.2.7" exclude="Build,Analyzers" />
</group>
</dependencies>
<copyright>ScientiaMobile, Inc. 2020</copyright>
<tags>Mobile Phone ASP.NET WURFL Browser DDR Device Detection Data Microservice</tags>
</metadata>
<files>
<file src="Content\App_Readme\Readme.txt" target="Content\App_Readme\Readme.txt" />
<file src="..\WmClient\bin\Release\netcoreapp2.2\WmClient.dll" target="lib\WmClient.dll" />
<file src="..\WmClient\bin\Release\netcoreapp2.2\WmClient.pdb" target="lib\WmClient.pdb" />
<file src="..\WmClient\bin\Release\netcoreapp3.1\WmClient.dll" target="lib\WmClient.dll" />
<file src="..\WmClient\bin\Release\netcoreapp3.1\WmClient.pdb" target="lib\WmClient.pdb" />
<file src="wurfl.png" target="" />

</files>
Expand Down
4 changes: 2 additions & 2 deletions WmClient/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.1.1")]
[assembly: AssemblyFileVersion("2.1.1")]
[assembly: AssemblyVersion("2.1.2")]
[assembly: AssemblyFileVersion("2.1.2")]
4 changes: 2 additions & 2 deletions WmClient/WmClient-dotNetCore-vs2017.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.2</TargetFramework>
<TargetFramework>netcoreapp3.1</TargetFramework>
<RootNamespace>WmClient</RootNamespace>
<Authors>Scientiamobile Inc.</Authors>
<PackageId>WmClient</PackageId>
Expand Down
2 changes: 1 addition & 1 deletion WmClient/WmClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ public void DestroyConnection()
/// <returns></returns>
public string GetApiVersion()
{
return "2.1.1";
return "2.1.2";
}

/// <summary>
Expand Down
5 changes: 0 additions & 5 deletions WmClient/packages.config

This file was deleted.

Binary file added dist/dotNetCore/2.1.2/WmClient.dll
Binary file not shown.

0 comments on commit b8b20e5

Please sign in to comment.