Add uap tfm (protobuf-net#411)

* failed attempt to add uap targets

* fix broken global.json; start configuring uap1.0 TFM

* show current state

* UAP tweaks; ref protobuf-net#409

* package 2.3.14-alpha1

Author: mgravell

README.md

@@ -12,6 +12,7 @@ To understand how protobuf-net relates to protobuf [see here](https://mgravell.g
 ## Supported Runtimes
 - .NET Framework 2.0+
 - .NET Standard 1.0+ (note that 1.0 is very restricted, and suits iOS etc; use the highest .NET Standard that works for your platform)
+- UAP 10.0(+?)
 
 It is possible to build for more specific TFMs, but *right now* I've simplified the build to those. If you need help
 with a custom build: let me know.
@@ -113,7 +114,8 @@ There is no special significance in the 7 above; it is an integer key, just like
 
 ### .proto file
 
-As an alternative to writing your classes and decorating them, You can generate your types from a .proto schema using [`protogen`](https://protogen.marcgravell.com/).
+As an alternative to writing your classes and decorating them, You can generate your types from a .proto schema using [`protogen`](https://protogen.marcgravell.com/);
+the `protogen` tool is available as a zip from that location, or [as a "global tool"](https://www.nuget.org/packages/protobuf-net.Protogen) (multi-platform).
 
 ### Alternative to attributes
 

docs/releasenotes.md

@@ -28,6 +28,10 @@ Alternatively, use Visual Studio 2017 ([community edition is free](https://www.v
 
 - fix #406 - relative and wildcard paths (`*.proto` etc) failed on `netcoreapp2.1`, impacting the "global tool"
 
+## protobuf-net v2.3.14-alpha1
+
+- attempt to add UAP TFM
+
 ## protobuf-net v2.3.13
 
 - **IMPORTANT** fix #403 - key cache was incorrect in some cases involving multi-level inheritance; update from 2.3.8 or above is highly recommended

global.json

@@ -1,5 +1,9 @@
 {
   "sdk": {
     "version": "2.1.300"
+  },
+  "msbuild-sdks": {
+    "MSBuild.Sdk.Extras": "1.5.4",
+    "__MSBuild.Sdk.Extras": "1.6.20-preview"
   }
 }

src/Directory.build.props

@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.3.13</VersionPrefix>
+    <VersionPrefix>2.3.14</VersionPrefix>
     <ProtoGenVersion>1.0.9</ProtoGenVersion>
-    <VersionSuffix></VersionSuffix>
+    <VersionSuffix>alpha1</VersionSuffix>
     <RootNamespace>ProtoBuf</RootNamespace>
     <Authors>Marc Gravell</Authors>
     <OutputType>Library</OutputType>

src/LongDataTests/LongDataTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>    
-    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
     <GenerateDocumentationFile>false</GenerateDocumentationFile>
     <Configurations>Debug;Release;VS</Configurations>
   </PropertyGroup>

src/protobuf-net.sln

@@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{0A6E81
 	ProjectSection(SolutionItems) = preProject
 		Tools\bcl.proto = Tools\bcl.proto
 		Directory.build.props = Directory.build.props
-		global.json = global.json
+		..\global.json = ..\global.json
 		..\docs\index.md = ..\docs\index.md
 		Tools\protogen.proto = Tools\protogen.proto
 		..\README.md = ..\README.md
@@ -33,7 +33,7 @@ Project("{778DAE3C-4631-46EA-AA77-85C1314464D9}") = "VBTest", "VBTest\VBTest.vbp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CSharpTest", "CSharpTest\CSharpTest.csproj", "{3C7D830B-7A76-43FD-8FFB-95E9E4231653}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "protobuf-net.Protogen", "protobuf-net.Protogen\protobuf-net.Protogen.csproj", "{D80F8D08-66B1-46C2-B882-7A0CE45B6C2D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "protobuf-net.Protogen", "protobuf-net.Protogen\protobuf-net.Protogen.csproj", "{D80F8D08-66B1-46C2-B882-7A0CE45B6C2D}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

src/protobuf-net/Meta/MetaType.cs

@@ -1894,8 +1894,8 @@ internal void WriteSchema(System.Text.StringBuilder builder, int indent, ref Run
                         if(field.IsStatic && field.IsLiteral)
                         {
                             object enumVal;
-#if WINRT || PORTABLE || CF || FX11 || NETSTANDARD1_3 || NETSTANDARD1_4 || PROFILE259
-							enumVal = Convert.ChangeType(field.GetValue(null), Enum.GetUnderlyingType(field.FieldType), System.Globalization.CultureInfo.InvariantCulture);
+#if WINRT || PORTABLE || CF || FX11 || NETSTANDARD1_3 || NETSTANDARD1_4 || PROFILE259 || UAP
+                            enumVal = Convert.ChangeType(field.GetValue(null), Enum.GetUnderlyingType(field.FieldType), System.Globalization.CultureInfo.InvariantCulture);
 #else
                             enumVal = field.GetRawConstantValue();
 #endif

src/protobuf-net/Serializers/TypeSerializer.cs

@@ -318,7 +318,7 @@ object CreateInstance(ProtoReader source, bool includeLocalCallback)
 
 #else
 				obj = Activator.CreateInstance(constructType
-#if !(CF || SILVERLIGHT || WINRT || PORTABLE  || NETSTANDARD1_3 || NETSTANDARD1_4)
+#if !(CF || SILVERLIGHT || WINRT || PORTABLE  || NETSTANDARD1_3 || NETSTANDARD1_4 || UAP)
                     , nonPublic: true
 #endif
                     );

src/protobuf-net/protobuf-net.csproj

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
     <AssemblyName>protobuf-net</AssemblyName>
     <Title>protobuf-net</Title>
     <Description>Provides simple access to fast and efficient "Protocol Buffers" serialization from .NET applications</Description>
-    <TargetFrameworks>net20;net35;net40;netstandard1.0;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net20;net35;net40;netstandard1.0;netstandard1.3;netstandard2.0;uap10.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <DefineConstants>EMIT_ASSEMBLY_INFO</DefineConstants>
     <!-- new build tools spit these out -->
@@ -24,6 +24,12 @@
   <PropertyGroup Condition="'$(TargetFramework)' == 'net20'">
     <FeatureServiceModel>false</FeatureServiceModel>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+    <FeatureServiceModel>false</FeatureServiceModel>
+    <FeatureCompiler>false</FeatureCompiler>
+    <PlatformBinaryFormatter>false</PlatformBinaryFormatter>
+    <DefineConstants>$(DefineConstants);COREFX;UAP</DefineConstants>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.0'">
     <DefineConstants>$(DefineConstants);PROFILE259;FEAT_SAFE</DefineConstants>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
@@ -65,10 +71,11 @@
     <Reference Include="System.Configuration" />
     <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
-  <ItemGroup Condition="'$(ImportLibs)' == 'core'">
-    <!-- could make this more granular to respect the options, but no need yet -->
+  <ItemGroup Condition="'$(ImportLibs)' == 'core' and '$(FeatureCompiler)' == 'true'">
     <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(ImportLibs)' == 'core'">
     <PackageReference Include="System.Reflection.TypeExtensions" Version="4.4.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />