Skip to content

Commit 7f24399

Browse files
damienboddamienbod
authored
Merge pull request #12 from janohl/master
Upgraded protobuf-net nuget to 3.0.29 and Microsoft.AspNet.WebApi.Cli…
2 parents 9c3e061 + b009939 commit 7f24399

File tree

5 files changed

+89
-27
lines changed

5 files changed

+89
-27
lines changed

‎src/WebApiContrib.Formatting.ProtoBuf/ProtoBufFormatter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public override Task WriteToStreamAsync(Type type, object value, Stream stream,
7878

7979
private static RuntimeTypeModel CreateTypeModel()
8080
{
81-
var typeModel = TypeModel.Create();
81+
var typeModel = RuntimeTypeModel.Create();
8282
typeModel.UseImplicitZeroDefaults = false;
8383
return typeModel;
8484
}

‎src/WebApiContrib.Formatting.ProtoBuf/WebApiContrib.Formatting.ProtoBuf.csproj

Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
55
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>WebApiContrib.Formatting</RootNamespace>
1212
<AssemblyName>WebApiContrib.Formatting.ProtoBuf</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<RestorePackages>true</RestorePackages>
1616
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
@@ -36,26 +36,50 @@
3636
<Prefer32Bit>false</Prefer32Bit>
3737
</PropertyGroup>
3838
<ItemGroup>
39-
<Reference Include="Newtonsoft.Json">
40-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
39+
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
40+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
4141
</Reference>
42-
<Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
43-
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
42+
<Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\protobuf-net.3.0.29\lib\net461\protobuf-net.dll</HintPath>
44+
</Reference>
45+
<Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\protobuf-net.Core.3.0.29\lib\net461\protobuf-net.Core.dll</HintPath>
4547
</Reference>
4648
<Reference Include="System" />
49+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
50+
<HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
51+
</Reference>
52+
<Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
53+
<HintPath>..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
54+
</Reference>
55+
<Reference Include="System.Configuration" />
4756
<Reference Include="System.Core" />
57+
<Reference Include="System.IdentityModel" />
58+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
60+
</Reference>
4861
<Reference Include="System.Net.Http" />
49-
<Reference Include="System.Net.Http.Formatting, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.1.1\lib\net45\System.Net.Http.Formatting.dll</HintPath>
62+
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
64+
</Reference>
65+
<Reference Include="System.Numerics" />
66+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67+
<HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
68+
</Reference>
69+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
70+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
71+
</Reference>
72+
<Reference Include="System.ServiceModel" />
73+
<Reference Include="System.ServiceModel.Primitives, Version=4.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\System.ServiceModel.Primitives.4.7.0\lib\net461\System.ServiceModel.Primitives.dll</HintPath>
5275
</Reference>
5376
</ItemGroup>
5477
<ItemGroup>
5578
<Compile Include="Properties\AssemblyInfo.cs" />
5679
<Compile Include="ProtoBufFormatter.cs" />
5780
</ItemGroup>
5881
<ItemGroup>
82+
<None Include="app.config" />
5983
<None Include="packages.config">
6084
<SubType>Designer</SubType>
6185
</None>

‎src/WebApiContrib.Formatting.ProtoBuf/packages.config

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi.Client" version="5.1.1" targetFramework="net45" />
4-
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
5-
<package id="protobuf-net" version="2.0.0.668" targetFramework="net40" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
4+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net461" />
5+
<package id="protobuf-net" version="3.0.29" targetFramework="net461" />
6+
<package id="protobuf-net.Core" version="3.0.29" targetFramework="net461" />
7+
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
8+
<package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
9+
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
10+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
11+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
12+
<package id="System.ServiceModel.Primitives" version="4.7.0" targetFramework="net461" />
613
</packages>

‎test/WebApiContrib.Formatting.ProtoBuf.Test/WebApiContrib.Formatting.ProtoBuf.Test.csproj

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>WebApiContrib.Formatting.ProtoBuf.Test</RootNamespace>
1111
<AssemblyName>WebApiContrib.Formatting.ProtoBuf.Test</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
1515
<RestorePackages>true</RestorePackages>
16+
<TargetFrameworkProfile />
1617
</PropertyGroup>
1718
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1819
<DebugSymbols>true</DebugSymbols>
@@ -36,19 +37,41 @@
3637
<HintPath>..\..\packages\Moq.4.2.1312.1622\lib\net40\Moq.dll</HintPath>
3738
</Reference>
3839
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
39-
<SpecificVersion>False</SpecificVersion>
40-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
40+
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
4141
</Reference>
42-
<Reference Include="protobuf-net, Version=2.0.0.668, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
43-
<SpecificVersion>False</SpecificVersion>
44-
<HintPath>..\..\packages\protobuf-net.2.0.0.668\lib\net40\protobuf-net.dll</HintPath>
42+
<Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
43+
<HintPath>..\..\packages\protobuf-net.3.0.29\lib\net461\protobuf-net.dll</HintPath>
44+
</Reference>
45+
<Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
46+
<HintPath>..\..\packages\protobuf-net.Core.3.0.29\lib\net461\protobuf-net.Core.dll</HintPath>
4547
</Reference>
4648
<Reference Include="System" />
49+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
50+
<HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
51+
</Reference>
52+
<Reference Include="System.Collections.Immutable, Version=1.2.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
53+
<HintPath>..\..\packages\System.Collections.Immutable.1.7.1\lib\net461\System.Collections.Immutable.dll</HintPath>
54+
</Reference>
55+
<Reference Include="System.Configuration" />
4756
<Reference Include="System.Core" />
57+
<Reference Include="System.IdentityModel" />
58+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
60+
</Reference>
4861
<Reference Include="System.Net.Http" />
49-
<Reference Include="System.Net.Http.Formatting, Version=5.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
51-
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.1.1\lib\net45\System.Net.Http.Formatting.dll</HintPath>
62+
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
63+
<HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
64+
</Reference>
65+
<Reference Include="System.Numerics" />
66+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
67+
<HintPath>..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
68+
</Reference>
69+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
70+
<HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
71+
</Reference>
72+
<Reference Include="System.ServiceModel" />
73+
<Reference Include="System.ServiceModel.Primitives, Version=4.7.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\System.ServiceModel.Primitives.4.7.0\lib\net461\System.ServiceModel.Primitives.dll</HintPath>
5275
</Reference>
5376
<Reference Include="System.Xml.Linq" />
5477
<Reference Include="System.Data.DataSetExtensions" />
@@ -66,6 +89,7 @@
6689
<Compile Include="Properties\AssemblyInfo.cs" />
6790
</ItemGroup>
6891
<ItemGroup>
92+
<None Include="app.config" />
6993
<None Include="packages.config" />
7094
</ItemGroup>
7195
<ItemGroup>

‎test/WebApiContrib.Formatting.ProtoBuf.Test/packages.config

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.AspNet.WebApi.Client" version="5.1.1" targetFramework="net45" />
3+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net461" />
44
<package id="Moq" version="4.2.1312.1622" targetFramework="net45" />
5-
<package id="Newtonsoft.Json" version="6.0.1" targetFramework="net45" />
6-
<package id="protobuf-net" version="2.0.0.668" targetFramework="net45" />
5+
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net461" />
6+
<package id="protobuf-net" version="3.0.29" targetFramework="net461" />
7+
<package id="protobuf-net.Core" version="3.0.29" targetFramework="net461" />
8+
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
9+
<package id="System.Collections.Immutable" version="1.7.1" targetFramework="net461" />
10+
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
11+
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
12+
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
13+
<package id="System.ServiceModel.Primitives" version="4.7.0" targetFramework="net461" />
714
<package id="xunit" version="1.9.2" targetFramework="net45" />
8-
</packages>
15+
</packages>

0 commit comments

Comments
 (0)