Change compile and assembly loading for .NET 4 to Roslyn based.

This commit improves unit test speed significantly but cannot apply for .NET 3.5. And also includes * code generation tweaking APIs. * FEATURE_CONCURRENT compiler constant.
msgpack · Oct 24, 2016 · bc4a953 · bc4a953
1 parent 8a958ea
commit bc4a953
Show file tree

Hide file tree

Showing 77 changed files with 2,712 additions and 497 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -615,6 +615,11 @@ Release 0.9.0 beta1 2016/09/24
   * Fix nuspec to prevent old NuGet clients which do not support .NET Standard TFMs. Issue #177.
 
 Release 0.9.0 (planned)
+
+  NEW FEATURES
+  * Users of serializer code generator API can specify TextWriter to output. This may improve tooling chain.
+  * Users of serializer code generator API can suppress [DebuggerNonUserCode] attribute to enable debugger step in.
+
   BUG FIXES
   * The generated code for the type which has Tuple typed member uses old PackHelper API.
 
diff --git a/Sync.Test.xml b/Sync.Test.xml
@@ -44,6 +44,8 @@
     <Exclude Path="Serialization\FromExpressionTest.cs" />
     <Exclude Path="Serialization\MessagePackMemberAndDataMemberMixedTarget.cs" />
     <Exclude Path="Serialization\MessagePackMemberAttributeTest.cs" />
+    <Exclude Path="Serialization\RoslynCodeGeneration.cs" />
+    <Exclude Path="Serialization\TempFileDependentAssemblyManager.cs" />
   </Project>
 
   <Project Name="MsgPack.UnitTest.Xamarin.Android" Base="MsgPack.UnitTest.Xamarin.iOS">
@@ -95,11 +97,8 @@
     <Preserve Path="gen\array\*" />
     <Preserve Path="gen\map\*" />
     <Exclude Path="Serialization\AppendableReadOnlyCollections.cs" />
-    <Exclude Path="Serialization\ArrayExpressionBasedAutoMessagePackSerializerTest.cs" />
-    <Exclude Path="Serialization\ArrayExpressionBasedEnumSerializationTest.cs" />
-    <Exclude Path="Serialization\ExpressionBasedNilImplicationTest.cs" />
-    <Exclude Path="Serialization\MapExpressionBasedAutoMessagePackSerializerTest.cs" />
-    <Exclude Path="Serialization\MapExpressionBasedEnumSerializationTest.cs" />
+    <Exclude Path="Serialization\RoslynCodeGeneration.cs" />
+    <Preserve Path="Serialization\CodeDomCodeGeneration.cs" />
     <Preserve Path="Dummies\System.Threading.Tasks\Task.cs" />
     <Preserve Path="Dummies\System.Threading.Tasks\TaskFactory.cs" />
     <Preserve Path="Mono\System\AggregateException.cs" />
@@ -116,6 +115,7 @@
     <Exclude File="*.tt" />
     <Exclude File="*.ttinclude" />
   </Project>
+
   <Project Name="MsgPack.UnitTest.CodeDom.Net35" Base="MsgPack.UnitTest.CodeDom">
     <Preserve Path="Properties\AssemblyInfo.cs" />
     <Preserve File="*.config" />
@@ -147,9 +147,11 @@
     <Exclude Path="ExceptionTest.cs" />
     <Exclude Path="TestSuite.cs" />
     <Exclude Path="UnpackingTest.Combinations*" />
+    <Exclude Path="Serialization\CodeDomCodeGeneration.cs" />
     <Exclude Path="Serialization\PreGeneratedSerializerGenerator.cs" />
     <Exclude Path="Serialization\SerializationTargetTest.cs" />
     <Exclude Path="Serialization\SerializerGeneratorTest.cs" />
+    <Exclude Path="Serialization\TempFileDependentAssemblyManager.cs" />
     <Exclude Path="Serialization\CompositeTest.cs" />
     <!-- Generator related -->
     <Exclude File="*ContextBased*.cs" />
@@ -193,6 +195,8 @@
     <Exclude Path="Serialization\MapGenerationBasedEnumSerializationTest.cs" />
     <Exclude Path="Serialization\FromExpressionTest.cs" />
     <Exclude Path="Serialization\SerializerGeneratorTest.cs" />
+    <Exclude Path="Serialization\RoslynCodeGeneration.cs" />
+    <Exclude Path="Serialization\TempFileDependentAssemblyManager.cs" />
   </Project>
 
   <Project Name="MsgPack.UnitTest.BclExtensions.WinRT" Base="MsgPack.UnitTest.BclExtensions">
@@ -208,6 +212,8 @@
     <Exclude Path="Serialization\MapFieldBasedCustomCollectionSerializersTest.cs" />
     <Exclude Path="Serialization\MapContextBasedCustomCollectionSerializersTest.cs" />
     <Exclude Path="Serialization\MapCodeDomBasedCustomCollectionSerializersTest.cs" />
+    <Exclude Path="Serialization\RoslynCodeGeneration.cs" />
+    <Exclude Path="Serialization\TempFileDependentAssemblyManager.cs" />
   </Project>
 
   <Project Name="MsgPack.UnitTest.Silverlight.WindowsPhone" Base="MsgPack.UnitTest.WinRT">

diff --git a/Sync.xml b/Sync.xml
@@ -58,16 +58,22 @@
     <Exclude Path="Serialization\Reflection\TracingILGenerator.*" />
     <Exclude Path="Serialization\CallbackEnumMessagePackSerializer.cs" />
     <Exclude Path="Serialization\CallbackMessagePackSerializer`1.cs" />
+    <Exclude Path="Serialization\CodeGenerationSink.cs" />
+    <Exclude Path="Serialization\DependentAssemblyManager.cs" />
     <Exclude Path="Serialization\DefaultSerializerNameResolver.cs" />
     <Exclude Path="Serialization\FromExpression.cs" />
     <Exclude Path="Serialization\FromExpression.*.cs" />
-    <Exclude Path="Serialization\ReflectionExtensions.ConstructorDelegate.cs" />
+    <Exclude Path="Serialization\IndividualFileCodeGenerationSink.cs" />
     <Exclude Path="Serialization\ISerializerGeneratorConfiguration.cs" />
+    <Exclude Path="Serialization\ReflectionExtensions.ConstructorDelegate.cs" />
     <Exclude Path="Serialization\SerializerAssemblyGenerationConfiguration.cs" />
+    <Exclude Path="Serialization\SerializerCodeInformation.cs" />
     <Exclude Path="Serialization\SerializerCodeGenerationConfiguration.cs" />
     <Exclude Path="Serialization\SerializerCodeGenerationContext.cs" />
     <Exclude Path="Serialization\SerializerCodeGenerationResult.cs" />
     <Exclude Path="Serialization\SerializerGenerator.cs" />
+    <Exclude Path="Serialization\SingleTextWriterCodeGenerationSink.cs" />
+    <Exclude Path="Serialization\TeeTextWriter.cs" />
     <Exclude Path="Serialization\Tracer.cs" />
     <Exclude Path="UnsafeNativeMethods.cs" />
     <Exclude Path="Validation.cs" />

diff --git a/src/MsgPack.CoreClr/project.json b/src/MsgPack.CoreClr/project.json
@@ -15,7 +15,7 @@
         }
       }
     },
-    "define": [ "TRACE", "FEATURE_TAP" ],
+    "define": [ "TRACE", "FEATURE_TAP", "FEATURE_CONCURRENT" ],
     "xmlDoc": true,
     "compile": {
       "include": [
@@ -51,13 +51,19 @@
         "../MsgPack/Serialization/Metadata/_UnpackHelpers.cs",
         "../MsgPack/Serialization/Metadata/_UnpackHelpers.direct.cs",
         "../MsgPack/Serialization/Reflection/TracingILGenerator*.cs",
+        "../MsgPack/Serialization/CodeGenerationSink.cs",
+        "../MsgPack/Serialization/DependentAssemblyManager.cs",
+        "../MsgPack/Serialization/IndividualFileCodeGenerationSink.cs",
         "../MsgPack/Serialization/ISerializerGeneratorConfiguration.cs",
         "../MsgPack/Serialization/ReflectionExtensions.ConstructorDelegate.cs",
         "../MsgPack/Serialization/SerializerAssemblyGenerationConfiguration.cs",
         "../MsgPack/Serialization/SerializerCodeGenerationConfiguration.cs",
+        "../MsgPack/Serialization/SerializerCodeInformation.cs",
         "../MsgPack/Serialization/SerializerGenerator.cs",
         "../MsgPack/Serialization/SerializerCodeGenerationContext.cs",
-        "../MsgPack/Serialization/SerializerCodeGenerationResult.cs"
+        "../MsgPack/Serialization/SerializerCodeGenerationResult.cs",
+        "../MsgPack/Serialization/SingleTextWriterCodeGenerationSink.cs",
+        "../MsgPack/Serialization/TeeTextWriter.cs",
       ]
     }
   },

diff --git a/src/MsgPack.Net35/MsgPack.Net35.csproj b/src/MsgPack.Net35/MsgPack.Net35.csproj
@@ -294,6 +294,9 @@
     <Compile Include="..\MsgPack\Serialization\CodeDomSerializers\VariableCodeDomConstruct.cs">
       <Link>Serialization\CodeDomSerializers\VariableCodeDomConstruct.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\CodeGenerationSink.cs">
+      <Link>Serialization\CodeGenerationSink.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\CollectionDetailedKind.cs">
       <Link>Serialization\CollectionDetailedKind.cs</Link>
     </Compile>
@@ -510,6 +513,9 @@
     <Compile Include="..\MsgPack\Serialization\DefaultSerializers\UnixEpocFileTimeMessagePackSerializer.cs">
       <Link>Serialization\DefaultSerializers\UnixEpocFileTimeMessagePackSerializer.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\DependentAssemblyManager.cs">
+      <Link>Serialization\DependentAssemblyManager.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\DictionaryKeyTransformers.cs">
       <Link>Serialization\DictionaryKeyTransformers.cs</Link>
     </Compile>
@@ -627,6 +633,9 @@
     <Compile Include="..\MsgPack\Serialization\IMessagePackSingleObjectSerializer.cs">
       <Link>Serialization\IMessagePackSingleObjectSerializer.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\IndividualFileCodeGenerationSink.cs">
+      <Link>Serialization\IndividualFileCodeGenerationSink.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\INilImplicationHandlerOnUnpackedParameter.cs">
       <Link>Serialization\INilImplicationHandlerOnUnpackedParameter.cs</Link>
     </Compile>
@@ -906,6 +915,9 @@
     <Compile Include="..\MsgPack\Serialization\SerializerCodeGenerationResult.cs">
       <Link>Serialization\SerializerCodeGenerationResult.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\SerializerCodeInformation.cs">
+      <Link>Serialization\SerializerCodeInformation.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\SerializerDebugging.cs">
       <Link>Serialization\SerializerDebugging.cs</Link>
     </Compile>
@@ -930,6 +942,12 @@
     <Compile Include="..\MsgPack\Serialization\SerializingMember.cs">
       <Link>Serialization\SerializingMember.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\SingleTextWriterCodeGenerationSink.cs">
+      <Link>Serialization\SingleTextWriterCodeGenerationSink.cs</Link>
+    </Compile>
+    <Compile Include="..\MsgPack\Serialization\TeeTextWriter.cs">
+      <Link>Serialization\TeeTextWriter.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\Tracer.cs">
       <Link>Serialization\Tracer.cs</Link>
     </Compile>

diff --git a/src/MsgPack.Net45/MsgPack.Net45.csproj b/src/MsgPack.Net45/MsgPack.Net45.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;FEATURE_TAP;NETFX_45</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;FEATURE_TAP;FEATURE_CONCURRENT;NETFX_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>bin\Debug\MsgPack.XML</DocumentationFile>
@@ -27,7 +27,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\..\bin\net45\</OutputPath>
-    <DefineConstants>TRACE;FEATURE_TAP;NETFX_45</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_TAP;FEATURE_CONCURRENT;NETFX_45</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\..\bin\net45\MsgPack.XML</DocumentationFile>
@@ -40,7 +40,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CodeAnalysis|AnyCPU'">
     <OutputPath>bin\CodeAnalysis\</OutputPath>
-    <DefineConstants>TRACE;FEATURE_TAP;NETFX_45;CODE_ANALYSIS</DefineConstants>
+    <DefineConstants>TRACE;FEATURE_TAP;FEATURE_CONCURRENT;NETFX_45;CODE_ANALYSIS</DefineConstants>
     <DocumentationFile></DocumentationFile>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
@@ -295,6 +295,9 @@
     <Compile Include="..\MsgPack\Serialization\CodeDomSerializers\VariableCodeDomConstruct.cs">
       <Link>Serialization\CodeDomSerializers\VariableCodeDomConstruct.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\CodeGenerationSink.cs">
+      <Link>Serialization\CodeGenerationSink.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\CollectionDetailedKind.cs">
       <Link>Serialization\CollectionDetailedKind.cs</Link>
     </Compile>
@@ -541,6 +544,9 @@
     <Compile Include="..\MsgPack\Serialization\DefaultSerializers\UnixEpocFileTimeMessagePackSerializer.cs">
       <Link>Serialization\DefaultSerializers\UnixEpocFileTimeMessagePackSerializer.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\DependentAssemblyManager.cs">
+      <Link>Serialization\DependentAssemblyManager.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\DictionaryKeyTransformers.cs">
       <Link>Serialization\DictionaryKeyTransformers.cs</Link>
     </Compile>
@@ -658,6 +664,9 @@
     <Compile Include="..\MsgPack\Serialization\IMessagePackSingleObjectSerializer.cs">
       <Link>Serialization\IMessagePackSingleObjectSerializer.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\IndividualFileCodeGenerationSink.cs">
+      <Link>Serialization\IndividualFileCodeGenerationSink.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\INilImplicationHandlerOnUnpackedParameter.cs">
       <Link>Serialization\INilImplicationHandlerOnUnpackedParameter.cs</Link>
     </Compile>
@@ -940,6 +949,9 @@
     <Compile Include="..\MsgPack\Serialization\SerializerCodeGenerationResult.cs">
       <Link>Serialization\SerializerCodeGenerationResult.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\SerializerCodeInformation.cs">
+      <Link>Serialization\SerializerCodeInformation.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\SerializerDebugging.cs">
       <Link>Serialization\SerializerDebugging.cs</Link>
     </Compile>
@@ -964,6 +976,12 @@
     <Compile Include="..\MsgPack\Serialization\SerializingMember.cs">
       <Link>Serialization\SerializingMember.cs</Link>
     </Compile>
+    <Compile Include="..\MsgPack\Serialization\SingleTextWriterCodeGenerationSink.cs">
+      <Link>Serialization\SingleTextWriterCodeGenerationSink.cs</Link>
+    </Compile>
+    <Compile Include="..\MsgPack\Serialization\TeeTextWriter.cs">
+      <Link>Serialization\TeeTextWriter.cs</Link>
+    </Compile>
     <Compile Include="..\MsgPack\Serialization\Tracer.cs">
       <Link>Serialization\Tracer.cs</Link>
     </Compile>

diff --git a/src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj b/src/MsgPack.Silverlight.WindowsPhone/MsgPack.Silverlight.WindowsPhone.csproj
@@ -46,7 +46,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Bin\x86\Debug</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -56,7 +56,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>Bin\x86\Release</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -67,7 +67,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Bin\ARM\Debug</OutputPath>
-    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -77,7 +77,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>Bin\ARM\Release</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE</DefineConstants>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT</DefineConstants>
     <NoStdLib>true</NoStdLib>
     <NoConfig>true</NoConfig>
     <ErrorReport>prompt</ErrorReport>
@@ -97,7 +97,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CodeAnalysis|x86'">
     <OutputPath>bin\x86\CodeAnalysis\</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE;CODE_ANALYSIS</DefineConstants>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT;CODE_ANALYSIS</DefineConstants>
     <Optimize>true</Optimize>
     <NoStdLib>true</NoStdLib>
     <DebugType>pdbonly</DebugType>
@@ -107,7 +107,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CodeAnalysis|ARM'">
     <OutputPath>bin\ARM\CodeAnalysis\</OutputPath>
-    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE;CODE_ANALYSIS</DefineConstants>
+    <DefineConstants>TRACE;SILVERLIGHT;WINDOWS_PHONE;AOT;CODE_ANALYSIS</DefineConstants>
     <Optimize>true</Optimize>
     <NoStdLib>true</NoStdLib>
     <DebugType>pdbonly</DebugType>

diff --git a/src/MsgPack.Uwp/MsgPack.Uwp.csproj b/src/MsgPack.Uwp/MsgPack.Uwp.csproj
@@ -23,7 +23,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;AOT;NETSTANDARD1_3;FEATURE_TAP</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;AOT;NETSTANDARD1_3;FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -32,15 +32,15 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;AOT;NETSTANDARD1_3;FEATURE_TAP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;AOT;NETSTANDARD1_3;FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;NETSTD_13;AOT</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -50,7 +50,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;NETSTD_13;AOT</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -62,7 +62,7 @@
     <PlatformTarget>ARM</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>ARM</PlatformTarget>
@@ -72,7 +72,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <PlatformTarget>ARM</PlatformTarget>
     <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>
@@ -84,7 +84,7 @@
     <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
     <NoWarn>;2008</NoWarn>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -94,7 +94,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <PlatformTarget>x64</PlatformTarget>
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
+    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP;NETSTANDARD1_3;AOT;FEATURE_TAP;FEATURE_CONCURRENT</DefineConstants>
     <Optimize>true</Optimize>
     <NoWarn>;2008</NoWarn>
     <DebugType>pdbonly</DebugType>