-Update targets to move to 16299 and netstandard2.0

mrvux · mrvux · commit f2fc58533747 · 2017-10-22T00:39:48.000+03:00
-Update projects target frameworks to have netstandard2.0 as target (when relevant)
-Add mapping for D3D_SHADER_MODEL_6_1 and D3D12_VIEW_INSTANCING_TIER (new in 16299 )
-Add 'in' attribute in BlendFactor mapping, as d3d12.h has a different attribute for it, which made ther generator think of it as an array and breaking build
-Remove DESKTOP_APP build configuration in SharpDX.D3DCompiler to get input signature, since it's now supported in uap10
diff --git a/Build/SharpDX.targets b/Build/SharpDX.targets
@@ -11,12 +11,12 @@
 
   <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
     <DefineConstants>$(DefineConstants);STORE_APP</DefineConstants>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.14393.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.16299.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
     <SharpDXAppType>STORE_APP</SharpDXAppType>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3'">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' OR '$(TargetFramework)' == 'netstandard1.3' OR '$(TargetFramework)' == 'netstandard2.0'">
     <SharpDXAppType>REFERENCE</SharpDXAppType>
     <DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
   </PropertyGroup>
diff --git a/Source/Mapping.xml b/Source/Mapping.xml
@@ -24,9 +24,9 @@
 
   <include-dir override="true">$(THIS_CONFIG_PATH)\..\External\LegacyHeaders</include-dir>
   <include-dir>$(VC_TOOLS_PATH)\include</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\shared</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\um</include-dir>
-  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.15063.0\ucrt</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.16299.0\shared</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.16299.0\um</include-dir>
+  <include-dir>=HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots\KitsRoot10;Include\10.0.16299.0\ucrt</include-dir>
 
   <var name="FILTER_PASTING_ERROR">error: pasting .*a valid preprocessing token</var>
 
diff --git a/Source/SharpDX.Animation/SharpDX.Animation.csproj b/Source/SharpDX.Animation/SharpDX.Animation.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0</TargetFrameworks>
     <PackageId>SharpDX.Animation</PackageId>
     <Product>SharpDX.Animation</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Animation.xml</DocumentationFile>
diff --git a/Source/SharpDX.D3DCompiler/ShaderSignature.cs b/Source/SharpDX.D3DCompiler/ShaderSignature.cs
@@ -103,8 +103,6 @@ public byte[] Data
             private set;
         }
 
-// Win 8.1 SDK removed the corresponding functions from the WinRT platform
-#if DESKTOP_APP
         /// <summary>
         ///   Extracts the input and output signatures from a compiled shader or effect.
         /// </summary>
@@ -156,7 +154,6 @@ public unsafe static ShaderSignature GetOutputSignature(byte[] shaderBytecode)
                 return null;
             return new ShaderSignature(shaderSignature);
         }
-#endif
 
         /// <summary>
         /// Cast this <see cref="ShaderSignature"/> to the underlying byte buffer.
diff --git a/Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj b/Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.D3DCompiler</PackageId>
     <Product>SharpDX.D3DCompiler</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.D3DCompiler.xml</DocumentationFile>
diff --git a/Source/SharpDX.DXGI/SharpDX.DXGI.csproj b/Source/SharpDX.DXGI/SharpDX.DXGI.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.DXGI</PackageId>
     <Product>SharpDX.DXGI</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.DXGI.xml</DocumentationFile>
diff --git a/Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj b/Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct2D1</PackageId>
     <Product>SharpDX.Direct2D1</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct2D1.xml</DocumentationFile>
diff --git a/Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj b/Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D10</PackageId>
     <Product>SharpDX.Direct3D10</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D10.xml</DocumentationFile>
diff --git a/Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj b/Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D11.Effects</PackageId>
     <Product>SharpDX.Direct3D11.Effects</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D11.Effects.xml</DocumentationFile>
diff --git a/Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj b/Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D11</PackageId>
     <Product>SharpDX.Direct3D11</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D11.xml</DocumentationFile>
diff --git a/Source/SharpDX.Direct3D12/Mapping.xml b/Source/SharpDX.Direct3D12/Mapping.xml
@@ -96,6 +96,7 @@
     <map enum-item="D3D12_MESSAGE_ID_MAP_INVALID_SUBRESOURCE" name="MapInvalidSubResource2"/>
     <map enum-item="D3D12_MESSAGE_ID_UNMAP_INVALID_SUBRESOURCE" name="UnmapInvalidSubResource2"/>
 
+    <map enum-item="D3D12_VIEW_INSTANCING_TIER(.*)" name-tmp="Tier$1"/>
     <map enum-item="D3D12_CONSERVATIVE_RASTERIZATION_TIER(.*)" name-tmp="Tier$1"/>
     <map enum-item="D3D12_CROSS_NODE_SHARING_TIER(.*)" name-tmp="Tier$1"/>
     <map enum-item="D3D12_RESOURCE_HEAP_TIER(.*)" name-tmp="Tier$1"/>
@@ -115,7 +116,7 @@
     <map enum="D3D_SHADER_MODEL" name="ShaderModel"/>
     <map enum-item="D3D_SHADER_MODEL_5_1" name="Model51"/>
     <map enum-item="D3D_SHADER_MODEL_6_0" name="Model60"/>
-    
+    <map enum-item="D3D_SHADER_MODEL_6_1" name="Model61"/>
     <!--
     // *****************************************************************
     // D3D12 Struct
@@ -223,7 +224,7 @@
     <map method="ID3D12GraphicsCommandList::OM(.*)" name="$1"/>
     <map method="ID3D12GraphicsCommandList::RS(.*)" name="$1"/>
     <map method="ID3D12GraphicsCommandList::OMSetStencilRef" name="SetStencilReference"/>
-    <map param="ID3D12GraphicsCommandList::OMSetBlendFactor::BlendFactor" type="SHARPDX_VECTOR4"/>
+    <map param="ID3D12GraphicsCommandList::OMSetBlendFactor::BlendFactor" type="SHARPDX_VECTOR4" attribute="in" />
     <map param="ID3D12GraphicsCommandList::ClearRenderTargetView::ColorRGBA" type="SHARPDX_COLOR4"/>
     <map param="ID3D12GraphicsCommandList::ClearUnorderedAccessViewUint::Values" type="SHARPDX_INT4"/>
     <map param="ID3D12GraphicsCommandList::ClearUnorderedAccessViewFloat::Values" type="SHARPDX_VECTOR4"/>
diff --git a/Source/SharpDX.Direct3D12/SharpDX.Direct3D12.csproj b/Source/SharpDX.Direct3D12/SharpDX.Direct3D12.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D12</PackageId>
     <Product>SharpDX.Direct3D12</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D12.xml</DocumentationFile>
diff --git a/Source/SharpDX.Direct3D9/SharpDX.Direct3D9.csproj b/Source/SharpDX.Direct3D9/SharpDX.Direct3D9.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <PackageId>SharpDX.Direct3D9</PackageId>
     <Product>SharpDX.Direct3D9</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D9.xml</DocumentationFile>
diff --git a/Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj b/Source/SharpDX.DirectComposition/SharpDX.DirectComposition.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <PackageId>SharpDX.DirectComposition</PackageId>
     <Product>SharpDX.DirectComposition</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.DirectComposition.xml</DocumentationFile>
diff --git a/Source/SharpDX.DirectInput/SharpDX.DirectInput.csproj b/Source/SharpDX.DirectInput/SharpDX.DirectInput.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <PackageId>SharpDX.DirectInput</PackageId>
     <Product>SharpDX.DirectInput</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.DirectInput.xml</DocumentationFile>
diff --git a/Source/SharpDX.DirectManipulation/SharpDX.DirectManipulation.csproj b/Source/SharpDX.DirectManipulation/SharpDX.DirectManipulation.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0</TargetFrameworks>
     <PackageId>SharpDX.DirectManipulation</PackageId>
     <Product>SharpDX.DirectManipulation</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.DirectManipulation.xml</DocumentationFile>
diff --git a/Source/SharpDX.DirectSound/SharpDX.DirectSound.csproj b/Source/SharpDX.DirectSound/SharpDX.DirectSound.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.3</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.3;netstandard2.0</TargetFrameworks>
     <PackageId>SharpDX.DirectSound</PackageId>
     <Product>SharpDX.DirectSound</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.DirectSound.xml</DocumentationFile>
diff --git a/Source/SharpDX.Mathematics/SharpDX.Mathematics.csproj b/Source/SharpDX.Mathematics/SharpDX.Mathematics.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.Mathematics</PackageId>
     <Product>SharpDX.Mathematics</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Mathematics.xml</DocumentationFile>
diff --git a/Source/SharpDX.MediaFoundation/SharpDX.MediaFoundation.csproj b/Source/SharpDX.MediaFoundation/SharpDX.MediaFoundation.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.MediaFoundation</PackageId>
     <Product>SharpDX.MediaFoundation</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.MediaFoundation.xml</DocumentationFile>
diff --git a/Source/SharpDX.XAudio2/SharpDX.XAudio2.csproj b/Source/SharpDX.XAudio2/SharpDX.XAudio2.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.XAudio2</PackageId>
     <Product>SharpDX.XAudio2</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.XAudio2.xml</DocumentationFile>
diff --git a/Source/SharpDX.XInput/SharpDX.XInput.csproj b/Source/SharpDX.XInput/SharpDX.XInput.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX.XInput</PackageId>
     <Product>SharpDX.XInput</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.XInput.xml</DocumentationFile>
diff --git a/Source/SharpDX/SharpDX.csproj b/Source/SharpDX/SharpDX.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <Import Project="..\..\Build\SharpDX.props" />
   <PropertyGroup>
-    <TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
+    <TargetFrameworks>net40;net45;netstandard1.1;netstandard2.0;uap10.0</TargetFrameworks>
     <PackageId>SharpDX</PackageId>
     <Product>SharpDX</Product>
     <DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.xml</DocumentationFile>

Original file line number	Diff line number	Diff line change
`@@ -103,8 +103,6 @@ public byte[] Data`
`103`	`103`	`private set;`
`104`	`104`	`}`
`105`	`105`
`106`		`-// Win 8.1 SDK removed the corresponding functions from the WinRT platform`
`107`		`-#if DESKTOP_APP`
`108`	`106`	`/// <summary>`
`109`	`107`	`/// Extracts the input and output signatures from a compiled shader or effect.`
`110`	`108`	`/// </summary>`
`@@ -156,7 +154,6 @@ public unsafe static ShaderSignature GetOutputSignature(byte[] shaderBytecode)`
`156`	`154`	`return null;`
`157`	`155`	`return new ShaderSignature(shaderSignature);`
`158`	`156`	`}`
`159`		`-#endif`
`160`	`157`
`161`	`158`	`/// <summary>`
`162`	`159`	`/// Cast this <see cref="ShaderSignature"/> to the underlying byte buffer.`