Merge pull request #638 from jskeet/portable
First attempt at using profile 259 for Google.Protobuf.
This commit is contained in:
commit
74810c6ae3
@ -22,6 +22,17 @@ Use `protoc` with the `--csharp_out` option to generate C# files in the specifie
|
|||||||
Include these in your C# project, and add a reference to the `Google.Protobuf` project. Currently
|
Include these in your C# project, and add a reference to the `Google.Protobuf` project. Currently
|
||||||
there is no NuGet package for this, but we will be building one as soon as the API is stable.
|
there is no NuGet package for this, but we will be building one as soon as the API is stable.
|
||||||
|
|
||||||
|
Supported platforms
|
||||||
|
===================
|
||||||
|
|
||||||
|
The runtime library is built as a portable class library, supporting:
|
||||||
|
|
||||||
|
- .NET 4.5
|
||||||
|
- Windows 8
|
||||||
|
- Windows Phone Silverlight 8
|
||||||
|
- Windows Phone 8.1
|
||||||
|
- .NET Core (dnxcore)
|
||||||
|
|
||||||
Building
|
Building
|
||||||
========
|
========
|
||||||
|
|
||||||
|
@ -10,10 +10,11 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Google.Protobuf.Examples.AddressBook</RootNamespace>
|
<RootNamespace>Google.Protobuf.Examples.AddressBook</RootNamespace>
|
||||||
<AssemblyName>AddressBook</AssemblyName>
|
<AssemblyName>AddressBook</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<StartupObject>Google.Protobuf.Examples.AddressBook.Program</StartupObject>
|
<StartupObject>Google.Protobuf.Examples.AddressBook.Program</StartupObject>
|
||||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
<TargetFrameworkProfile>
|
||||||
|
</TargetFrameworkProfile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@ -26,6 +27,7 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<NoStdLib>true</NoStdLib>
|
<NoStdLib>true</NoStdLib>
|
||||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@ -37,6 +39,7 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<NoStdLib>true</NoStdLib>
|
<NoStdLib>true</NoStdLib>
|
||||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="mscorlib" />
|
<Reference Include="mscorlib" />
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<EnvironmentFlavor>CLIENTPROFILE</EnvironmentFlavor>
|
|
||||||
<EnvironmentTemplate>NET35</EnvironmentTemplate>
|
|
||||||
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
<ProductVersion>9.0.30729</ProductVersion>
|
<ProductVersion>9.0.30729</ProductVersion>
|
||||||
@ -12,9 +10,10 @@
|
|||||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
<RootNamespace>Google.Protobuf.JsonDump</RootNamespace>
|
<RootNamespace>Google.Protobuf.JsonDump</RootNamespace>
|
||||||
<AssemblyName>Google.Protobuf.JsonDump</AssemblyName>
|
<AssemblyName>Google.Protobuf.JsonDump</AssemblyName>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
|
<TargetFrameworkProfile>
|
||||||
|
</TargetFrameworkProfile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
<DebugSymbols>true</DebugSymbols>
|
<DebugSymbols>true</DebugSymbols>
|
||||||
@ -27,6 +26,7 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<NoStdLib>true</NoStdLib>
|
<NoStdLib>true</NoStdLib>
|
||||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
<DebugType>pdbonly</DebugType>
|
<DebugType>pdbonly</DebugType>
|
||||||
@ -38,6 +38,7 @@
|
|||||||
<WarningLevel>4</WarningLevel>
|
<WarningLevel>4</WarningLevel>
|
||||||
<NoStdLib>true</NoStdLib>
|
<NoStdLib>true</NoStdLib>
|
||||||
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
|
||||||
|
<Prefer32Bit>false</Prefer32Bit>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Reference Include="mscorlib" />
|
<Reference Include="mscorlib" />
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup></configuration>
|
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/></startup></configuration>
|
||||||
|
@ -0,0 +1,98 @@
|
|||||||
|
#region Copyright notice and license
|
||||||
|
// Protocol Buffers - Google's data interchange format
|
||||||
|
// Copyright 2015 Google Inc. All rights reserved.
|
||||||
|
// https://developers.google.com/protocol-buffers/
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without
|
||||||
|
// modification, are permitted provided that the following conditions are
|
||||||
|
// met:
|
||||||
|
//
|
||||||
|
// * Redistributions of source code must retain the above copyright
|
||||||
|
// notice, this list of conditions and the following disclaimer.
|
||||||
|
// * Redistributions in binary form must reproduce the above
|
||||||
|
// copyright notice, this list of conditions and the following disclaimer
|
||||||
|
// in the documentation and/or other materials provided with the
|
||||||
|
// distribution.
|
||||||
|
// * Neither the name of Google Inc. nor the names of its
|
||||||
|
// contributors may be used to endorse or promote products derived from
|
||||||
|
// this software without specific prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using NUnit.Framework;
|
||||||
|
using System.Reflection;
|
||||||
|
|
||||||
|
namespace Google.Protobuf.Compatibility
|
||||||
|
{
|
||||||
|
public class PropertyInfoExtensionsTest
|
||||||
|
{
|
||||||
|
public string PublicReadWrite { get; set; }
|
||||||
|
private string PrivateReadWrite { get; set; }
|
||||||
|
public string PublicReadPrivateWrite { get; private set; }
|
||||||
|
public string PrivateReadPublicWrite { private get; set; }
|
||||||
|
public string PublicReadOnly { get { return null; } }
|
||||||
|
private string PrivateReadOnly { get { return null; } }
|
||||||
|
public string PublicWriteOnly { set { } }
|
||||||
|
private string PrivateWriteOnly { set { } }
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase("PublicReadWrite")]
|
||||||
|
[TestCase("PublicReadPrivateWrite")]
|
||||||
|
[TestCase("PublicReadOnly")]
|
||||||
|
public void GetGetMethod_Success(string name)
|
||||||
|
{
|
||||||
|
var propertyInfo = typeof(PropertyInfoExtensionsTest)
|
||||||
|
.GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
|
||||||
|
Assert.IsNotNull(PropertyInfoExtensions.GetGetMethod(propertyInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase("PrivateReadWrite")]
|
||||||
|
[TestCase("PrivateReadPublicWrite")]
|
||||||
|
[TestCase("PrivateReadOnly")]
|
||||||
|
[TestCase("PublicWriteOnly")]
|
||||||
|
[TestCase("PrivateWriteOnly")]
|
||||||
|
public void GetGetMethod_NoAccessibleGetter(string name)
|
||||||
|
{
|
||||||
|
var propertyInfo = typeof(PropertyInfoExtensionsTest)
|
||||||
|
.GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
|
||||||
|
Assert.IsNull(PropertyInfoExtensions.GetGetMethod(propertyInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase("PublicReadWrite")]
|
||||||
|
[TestCase("PrivateReadPublicWrite")]
|
||||||
|
[TestCase("PublicWriteOnly")]
|
||||||
|
public void GetSetMethod_Success(string name)
|
||||||
|
{
|
||||||
|
var propertyInfo = typeof(PropertyInfoExtensionsTest)
|
||||||
|
.GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
|
||||||
|
Assert.IsNotNull(PropertyInfoExtensions.GetSetMethod(propertyInfo));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase("PublicReadPrivateWrite")]
|
||||||
|
[TestCase("PrivateReadWrite")]
|
||||||
|
[TestCase("PrivateReadOnly")]
|
||||||
|
[TestCase("PublicReadOnly")]
|
||||||
|
[TestCase("PrivateWriteOnly")]
|
||||||
|
public void GetSetMethod_NoAccessibleGetter(string name)
|
||||||
|
{
|
||||||
|
var propertyInfo = typeof(PropertyInfoExtensionsTest)
|
||||||
|
.GetProperty(name, BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
|
||||||
|
Assert.IsNull(PropertyInfoExtensions.GetSetMethod(propertyInfo));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
@ -0,0 +1,133 @@
|
|||||||
|
#region Copyright notice and license
|
||||||
|
// Protocol Buffers - Google's data interchange format
|
||||||
|
// Copyright 2015 Google Inc. All rights reserved.
|
||||||
|
// https://developers.google.com/protocol-buffers/
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without
|
||||||
|
// modification, are permitted provided that the following conditions are
|
||||||
|
// met:
|
||||||
|
//
|
||||||
|
// * Redistributions of source code must retain the above copyright
|
||||||
|
// notice, this list of conditions and the following disclaimer.
|
||||||
|
// * Redistributions in binary form must reproduce the above
|
||||||
|
// copyright notice, this list of conditions and the following disclaimer
|
||||||
|
// in the documentation and/or other materials provided with the
|
||||||
|
// distribution.
|
||||||
|
// * Neither the name of Google Inc. nor the names of its
|
||||||
|
// contributors may be used to endorse or promote products derived from
|
||||||
|
// this software without specific prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
#endregion
|
||||||
|
using NUnit.Framework;
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Reflection;
|
||||||
|
|
||||||
|
namespace Google.Protobuf.Compatibility
|
||||||
|
{
|
||||||
|
public class TypeExtensionsTest
|
||||||
|
{
|
||||||
|
public class DerivedList : List<string> { }
|
||||||
|
public string PublicProperty { get; set; }
|
||||||
|
private string PrivateProperty { get; set; }
|
||||||
|
|
||||||
|
public void PublicMethod()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
private void PrivateMethod()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase(typeof(int), true)]
|
||||||
|
[TestCase(typeof(int?), true)]
|
||||||
|
[TestCase(typeof(Nullable<>), true)]
|
||||||
|
[TestCase(typeof(WireFormat.WireType), true)]
|
||||||
|
[TestCase(typeof(string), false)]
|
||||||
|
[TestCase(typeof(object), false)]
|
||||||
|
[TestCase(typeof(Enum), false)]
|
||||||
|
[TestCase(typeof(ValueType), false)]
|
||||||
|
[TestCase(typeof(TypeExtensionsTest), false)]
|
||||||
|
[TestCase(typeof(Action), false)]
|
||||||
|
[TestCase(typeof(Action<>), false)]
|
||||||
|
[TestCase(typeof(IDisposable), false)]
|
||||||
|
public void IsValueType(Type type, bool expected)
|
||||||
|
{
|
||||||
|
Assert.AreEqual(expected, TypeExtensions.IsValueType(type));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase(typeof(object), typeof(string), true)]
|
||||||
|
[TestCase(typeof(object), typeof(int), true)]
|
||||||
|
[TestCase(typeof(string), typeof(string), true)]
|
||||||
|
[TestCase(typeof(string), typeof(object), false)]
|
||||||
|
[TestCase(typeof(string), typeof(int), false)]
|
||||||
|
[TestCase(typeof(int), typeof(int), true)]
|
||||||
|
[TestCase(typeof(ValueType), typeof(int), true)]
|
||||||
|
[TestCase(typeof(long), typeof(int), false)] //
|
||||||
|
public void IsAssignableFrom(Type target, Type argument, bool expected)
|
||||||
|
{
|
||||||
|
Assert.AreEqual(expected, TypeExtensions.IsAssignableFrom(target, argument));
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase(typeof(DerivedList), "Count")] // Go up the type hierarchy
|
||||||
|
[TestCase(typeof(List<string>), "Count")]
|
||||||
|
[TestCase(typeof(List<>), "Count")]
|
||||||
|
[TestCase(typeof(TypeExtensionsTest), "PublicProperty")]
|
||||||
|
public void GetProperty_Success(Type type, string name)
|
||||||
|
{
|
||||||
|
var property = TypeExtensions.GetProperty(type, name);
|
||||||
|
Assert.IsNotNull(property);
|
||||||
|
Assert.AreEqual(name, property.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase(typeof(TypeExtensionsTest), "PrivateProperty")]
|
||||||
|
[TestCase(typeof(TypeExtensionsTest), "Garbage")]
|
||||||
|
public void GetProperty_NoSuchProperty(Type type, string name)
|
||||||
|
{
|
||||||
|
var property = TypeExtensions.GetProperty(type, name);
|
||||||
|
Assert.IsNull(property);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase(typeof(DerivedList), "RemoveAt")] // Go up the type hierarchy
|
||||||
|
[TestCase(typeof(List<>), "RemoveAt")]
|
||||||
|
[TestCase(typeof(TypeExtensionsTest), "PublicMethod")]
|
||||||
|
public void GetMethod_Success(Type type, string name)
|
||||||
|
{
|
||||||
|
var method = TypeExtensions.GetMethod(type, name);
|
||||||
|
Assert.IsNotNull(method);
|
||||||
|
Assert.AreEqual(name, method.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase(typeof(TypeExtensionsTest), "PrivateMethod")]
|
||||||
|
[TestCase(typeof(TypeExtensionsTest), "GarbageMethod")]
|
||||||
|
public void GetMethod_NoSuchMethod(Type type, string name)
|
||||||
|
{
|
||||||
|
var method = TypeExtensions.GetMethod(type, name);
|
||||||
|
Assert.IsNull(method);
|
||||||
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[TestCase(typeof(List<string>), "IndexOf")]
|
||||||
|
public void GetMethod_Ambiguous(Type type, string name)
|
||||||
|
{
|
||||||
|
Assert.Throws<AmbiguousMatchException>(() => TypeExtensions.GetMethod(type, name));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -75,6 +75,8 @@
|
|||||||
<Compile Include="CodedInputStreamExtensions.cs" />
|
<Compile Include="CodedInputStreamExtensions.cs" />
|
||||||
<Compile Include="CodedInputStreamTest.cs" />
|
<Compile Include="CodedInputStreamTest.cs" />
|
||||||
<Compile Include="CodedOutputStreamTest.cs" />
|
<Compile Include="CodedOutputStreamTest.cs" />
|
||||||
|
<Compile Include="Compatibility\PropertyInfoExtensionsTest.cs" />
|
||||||
|
<Compile Include="Compatibility\TypeExtensionsTest.cs" />
|
||||||
<Compile Include="EqualityTester.cs" />
|
<Compile Include="EqualityTester.cs" />
|
||||||
<Compile Include="FieldCodecTest.cs" />
|
<Compile Include="FieldCodecTest.cs" />
|
||||||
<Compile Include="GeneratedMessageTest.cs" />
|
<Compile Include="GeneratedMessageTest.cs" />
|
||||||
|
@ -35,6 +35,7 @@ using System;
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Google.Protobuf.Compatibility;
|
||||||
|
|
||||||
namespace Google.Protobuf.Collections
|
namespace Google.Protobuf.Collections
|
||||||
{
|
{
|
||||||
@ -74,7 +75,7 @@ namespace Google.Protobuf.Collections
|
|||||||
/// <param name="allowNullValues">Whether null values are permitted in the map or not.</param>
|
/// <param name="allowNullValues">Whether null values are permitted in the map or not.</param>
|
||||||
public MapField(bool allowNullValues)
|
public MapField(bool allowNullValues)
|
||||||
{
|
{
|
||||||
if (allowNullValues && typeof(TValue).IsValueType && Nullable.GetUnderlyingType(typeof(TValue)) == null)
|
if (allowNullValues && typeof(TValue).IsValueType() && Nullable.GetUnderlyingType(typeof(TValue)) == null)
|
||||||
{
|
{
|
||||||
throw new ArgumentException("allowNullValues", "Non-nullable value types do not support null values");
|
throw new ArgumentException("allowNullValues", "Non-nullable value types do not support null values");
|
||||||
}
|
}
|
||||||
|
@ -29,10 +29,12 @@
|
|||||||
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
using Google.Protobuf.Reflection;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Google.Protobuf.Compatibility;
|
||||||
|
|
||||||
namespace Google.Protobuf.Collections
|
namespace Google.Protobuf.Collections
|
||||||
{
|
{
|
||||||
@ -88,7 +90,7 @@ namespace Google.Protobuf.Collections
|
|||||||
uint tag = input.LastTag;
|
uint tag = input.LastTag;
|
||||||
var reader = codec.ValueReader;
|
var reader = codec.ValueReader;
|
||||||
// Value types can be packed or not.
|
// Value types can be packed or not.
|
||||||
if (typeof(T).IsValueType && WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited)
|
if (typeof(T).IsValueType() && WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited)
|
||||||
{
|
{
|
||||||
int length = input.ReadLength();
|
int length = input.ReadLength();
|
||||||
if (length > 0)
|
if (length > 0)
|
||||||
@ -119,7 +121,7 @@ namespace Google.Protobuf.Collections
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
uint tag = codec.Tag;
|
uint tag = codec.Tag;
|
||||||
if (typeof(T).IsValueType && WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited)
|
if (typeof(T).IsValueType() && WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited)
|
||||||
{
|
{
|
||||||
int dataSize = CalculatePackedDataSize(codec);
|
int dataSize = CalculatePackedDataSize(codec);
|
||||||
return CodedOutputStream.ComputeRawVarint32Size(tag) +
|
return CodedOutputStream.ComputeRawVarint32Size(tag) +
|
||||||
@ -165,7 +167,7 @@ namespace Google.Protobuf.Collections
|
|||||||
}
|
}
|
||||||
var writer = codec.ValueWriter;
|
var writer = codec.ValueWriter;
|
||||||
var tag = codec.Tag;
|
var tag = codec.Tag;
|
||||||
if (typeof(T).IsValueType && WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited)
|
if (typeof(T).IsValueType() && WireFormat.GetTagWireType(tag) == WireFormat.WireType.LengthDelimited)
|
||||||
{
|
{
|
||||||
// Packed primitive type
|
// Packed primitive type
|
||||||
uint size = (uint)CalculatePackedDataSize(codec);
|
uint size = (uint)CalculatePackedDataSize(codec);
|
||||||
|
@ -0,0 +1,64 @@
|
|||||||
|
#region Copyright notice and license
|
||||||
|
// Protocol Buffers - Google's data interchange format
|
||||||
|
// Copyright 2015 Google Inc. All rights reserved.
|
||||||
|
// https://developers.google.com/protocol-buffers/
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without
|
||||||
|
// modification, are permitted provided that the following conditions are
|
||||||
|
// met:
|
||||||
|
//
|
||||||
|
// * Redistributions of source code must retain the above copyright
|
||||||
|
// notice, this list of conditions and the following disclaimer.
|
||||||
|
// * Redistributions in binary form must reproduce the above
|
||||||
|
// copyright notice, this list of conditions and the following disclaimer
|
||||||
|
// in the documentation and/or other materials provided with the
|
||||||
|
// distribution.
|
||||||
|
// * Neither the name of Google Inc. nor the names of its
|
||||||
|
// contributors may be used to endorse or promote products derived from
|
||||||
|
// this software without specific prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System.Reflection;
|
||||||
|
|
||||||
|
namespace Google.Protobuf.Compatibility
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Extension methods for <see cref="PropertyInfo"/>, effectively providing
|
||||||
|
/// the familiar members from previous desktop framework versions while
|
||||||
|
/// targeting the newer releases, .NET Core etc.
|
||||||
|
/// </summary>
|
||||||
|
internal static class PropertyInfoExtensions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Returns the public getter of a property, or null if there is no such getter
|
||||||
|
/// (either because it's read-only, or the getter isn't public).
|
||||||
|
/// </summary>
|
||||||
|
internal static MethodInfo GetGetMethod(this PropertyInfo target)
|
||||||
|
{
|
||||||
|
var method = target.GetMethod;
|
||||||
|
return method != null && method.IsPublic ? method : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns the public setter of a property, or null if there is no such setter
|
||||||
|
/// (either because it's write-only, or the setter isn't public).
|
||||||
|
/// </summary>
|
||||||
|
internal static MethodInfo GetSetMethod(this PropertyInfo target)
|
||||||
|
{
|
||||||
|
var method = target.SetMethod;
|
||||||
|
return method != null && method.IsPublic ? method : null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
113
csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs
Normal file
113
csharp/src/Google.Protobuf/Compatibility/TypeExtensions.cs
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
#region Copyright notice and license
|
||||||
|
// Protocol Buffers - Google's data interchange format
|
||||||
|
// Copyright 2015 Google Inc. All rights reserved.
|
||||||
|
// https://developers.google.com/protocol-buffers/
|
||||||
|
//
|
||||||
|
// Redistribution and use in source and binary forms, with or without
|
||||||
|
// modification, are permitted provided that the following conditions are
|
||||||
|
// met:
|
||||||
|
//
|
||||||
|
// * Redistributions of source code must retain the above copyright
|
||||||
|
// notice, this list of conditions and the following disclaimer.
|
||||||
|
// * Redistributions in binary form must reproduce the above
|
||||||
|
// copyright notice, this list of conditions and the following disclaimer
|
||||||
|
// in the documentation and/or other materials provided with the
|
||||||
|
// distribution.
|
||||||
|
// * Neither the name of Google Inc. nor the names of its
|
||||||
|
// contributors may be used to endorse or promote products derived from
|
||||||
|
// this software without specific prior written permission.
|
||||||
|
//
|
||||||
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
#endregion
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using System.Reflection;
|
||||||
|
|
||||||
|
namespace Google.Protobuf.Compatibility
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Provides extension methods on Type that just proxy to TypeInfo.
|
||||||
|
/// These are used to support the new type system from .NET 4.5, without
|
||||||
|
/// having calls to GetTypeInfo all over the place. While the methods here are meant to be
|
||||||
|
/// broadly compatible with the desktop framework, there are some subtle differences in behaviour - but
|
||||||
|
/// they're not expected to affect our use cases. While the class is internal, that should be fine: we can
|
||||||
|
/// evaluate each new use appropriately.
|
||||||
|
/// </summary>
|
||||||
|
internal static class TypeExtensions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Returns true if the target type is a value type, including a nullable value type or an enum, or false
|
||||||
|
/// if it's a reference type (class, delegate, interface - including System.ValueType and System.Enum).
|
||||||
|
/// </summary>
|
||||||
|
internal static bool IsValueType(this Type target)
|
||||||
|
{
|
||||||
|
return target.GetTypeInfo().IsValueType;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// See https://msdn.microsoft.com/en-us/library/system.type.isassignablefrom
|
||||||
|
/// </summary>
|
||||||
|
internal static bool IsAssignableFrom(this Type target, Type c)
|
||||||
|
{
|
||||||
|
return target.GetTypeInfo().IsAssignableFrom(c.GetTypeInfo());
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns a representation of the public property associated with the given name in the given type,
|
||||||
|
/// including inherited properties or null if there is no such public property.
|
||||||
|
/// Here, "public property" means a property where either the getter, or the setter, or both, is public.
|
||||||
|
/// </summary>
|
||||||
|
internal static PropertyInfo GetProperty(this Type target, string name)
|
||||||
|
{
|
||||||
|
// GetDeclaredProperty only returns properties declared in the given type, so we need to recurse.
|
||||||
|
while (target != null)
|
||||||
|
{
|
||||||
|
var typeInfo = target.GetTypeInfo();
|
||||||
|
var ret = typeInfo.GetDeclaredProperty(name);
|
||||||
|
if (ret != null && ((ret.CanRead && ret.GetMethod.IsPublic) || (ret.CanWrite && ret.SetMethod.IsPublic)))
|
||||||
|
{
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
target = typeInfo.BaseType;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Returns a representation of the public method associated with the given name in the given type,
|
||||||
|
/// including inherited methods.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// This has a few differences compared with Type.GetMethod in the desktop framework. It will throw
|
||||||
|
/// if there is an ambiguous match even between a private method and a public one, but it *won't* throw
|
||||||
|
/// if there are two overloads at different levels in the type hierarchy (e.g. class Base declares public void Foo(int) and
|
||||||
|
/// class Child : Base declares public void Foo(long)).
|
||||||
|
/// </remarks>
|
||||||
|
/// <exception cref="AmbiguousMatchException">One type in the hierarchy declared more than one method with the same name</exception>
|
||||||
|
internal static MethodInfo GetMethod(this Type target, string name)
|
||||||
|
{
|
||||||
|
// GetDeclaredMethod only returns methods declared in the given type, so we need to recurse.
|
||||||
|
while (target != null)
|
||||||
|
{
|
||||||
|
var typeInfo = target.GetTypeInfo();
|
||||||
|
var ret = typeInfo.GetDeclaredMethod(name);
|
||||||
|
if (ret != null && ret.IsPublic)
|
||||||
|
{
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
target = typeInfo.BaseType;
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -11,8 +11,8 @@
|
|||||||
<RootNamespace>Google.Protobuf</RootNamespace>
|
<RootNamespace>Google.Protobuf</RootNamespace>
|
||||||
<AssemblyName>Google.Protobuf</AssemblyName>
|
<AssemblyName>Google.Protobuf</AssemblyName>
|
||||||
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
|
||||||
<TargetFrameworkProfile>Profile92</TargetFrameworkProfile>
|
<TargetFrameworkProfile>Profile259</TargetFrameworkProfile>
|
||||||
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
|
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
|
||||||
<FileAlignment>512</FileAlignment>
|
<FileAlignment>512</FileAlignment>
|
||||||
<SignAssembly>true</SignAssembly>
|
<SignAssembly>true</SignAssembly>
|
||||||
<AssemblyOriginatorKeyFile>..\..\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>..\..\keys\Google.Protobuf.snk</AssemblyOriginatorKeyFile>
|
||||||
@ -60,6 +60,8 @@
|
|||||||
<Compile Include="Collections\MapField.cs" />
|
<Compile Include="Collections\MapField.cs" />
|
||||||
<Compile Include="Collections\ReadOnlyDictionary.cs" />
|
<Compile Include="Collections\ReadOnlyDictionary.cs" />
|
||||||
<Compile Include="Collections\RepeatedField.cs" />
|
<Compile Include="Collections\RepeatedField.cs" />
|
||||||
|
<Compile Include="Compatibility\PropertyInfoExtensions.cs" />
|
||||||
|
<Compile Include="Compatibility\TypeExtensions.cs" />
|
||||||
<Compile Include="FieldCodec.cs" />
|
<Compile Include="FieldCodec.cs" />
|
||||||
<Compile Include="FrameworkPortability.cs" />
|
<Compile Include="FrameworkPortability.cs" />
|
||||||
<Compile Include="Freezable.cs" />
|
<Compile Include="Freezable.cs" />
|
||||||
@ -111,6 +113,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="Google.Protobuf.nuspec" />
|
<None Include="Google.Protobuf.nuspec" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup />
|
||||||
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
|
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
|
||||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||||
Other similar extension points exist, see Microsoft.Common.targets.
|
Other similar extension points exist, see Microsoft.Common.targets.
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
<tags>Protocol Buffers Binary Serialization Format Google proto proto3</tags>
|
<tags>Protocol Buffers Binary Serialization Format Google proto proto3</tags>
|
||||||
</metadata>
|
</metadata>
|
||||||
<files>
|
<files>
|
||||||
<file src="bin/Release/Google.Protobuf.dll" target="lib/portable-net45+win8+wp8+wpa81" />
|
<file src="bin/Release/Google.Protobuf.dll" target="lib/portable-net45+netcore45+wpa81+wp8" />
|
||||||
<file src="bin/Release/Google.Protobuf.pdb" target="lib/portable-net45+win8+wp8+wpa81" />
|
<file src="bin/Release/Google.Protobuf.pdb" target="lib/portable-net45+netcore45+wpa81+wp8" />
|
||||||
<file src="bin/Release/Google.Protobuf.xml" target="lib/portable-net45+win8+wp8+wpa81" />
|
<file src="bin/Release/Google.Protobuf.xml" target="lib/portable-net45+netcore45+wpa81+wp8" />
|
||||||
<file src="**\*.cs" target="src" />
|
<file src="**\*.cs" target="src" />
|
||||||
</files>
|
</files>
|
||||||
</package>
|
</package>
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using Google.Protobuf.Compatibility;
|
||||||
|
|
||||||
namespace Google.Protobuf.Reflection
|
namespace Google.Protobuf.Reflection
|
||||||
{
|
{
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Google.Protobuf.Compatibility;
|
||||||
|
|
||||||
namespace Google.Protobuf.Reflection
|
namespace Google.Protobuf.Reflection
|
||||||
{
|
{
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using Google.Protobuf.Compatibility;
|
||||||
|
|
||||||
namespace Google.Protobuf.Reflection
|
namespace Google.Protobuf.Reflection
|
||||||
{
|
{
|
||||||
|
@ -33,6 +33,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using Google.Protobuf.Compatibility;
|
||||||
|
|
||||||
namespace Google.Protobuf.Reflection
|
namespace Google.Protobuf.Reflection
|
||||||
{
|
{
|
||||||
@ -91,7 +92,7 @@ namespace Google.Protobuf.Reflection
|
|||||||
{
|
{
|
||||||
throw new DescriptorValidationException(this, "Property " + clrName + "Case not found in " + containingType.GeneratedType);
|
throw new DescriptorValidationException(this, "Property " + clrName + "Case not found in " + containingType.GeneratedType);
|
||||||
}
|
}
|
||||||
var clearMethod = containingType.GeneratedType.GetMethod("Clear" + clrName, ReflectionUtil.EmptyTypes);
|
var clearMethod = containingType.GeneratedType.GetMethod("Clear" + clrName);
|
||||||
if (clearMethod == null)
|
if (clearMethod == null)
|
||||||
{
|
{
|
||||||
throw new DescriptorValidationException(this, "Method Clear" + clrName + " not found in " + containingType.GeneratedType);
|
throw new DescriptorValidationException(this, "Method Clear" + clrName + " not found in " + containingType.GeneratedType);
|
||||||
|
@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
using Google.Protobuf.Compatibility;
|
||||||
|
|
||||||
namespace Google.Protobuf.Reflection
|
namespace Google.Protobuf.Reflection
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user