Merge pull request #950 from mrvux/netstandard2

Move to windows SDK 16299 and netstandard2.0

Author: xoofx

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>

Readme.md

@@ -17,7 +17,7 @@ You can find more documentation on the [Wiki](http://sharpdx.org/wiki)
 In order to compile SharpDX, you need to install **Visual Studio 2017 or newer** with the following workloads and components:
 
 - [x] Visual C++ Toolset Component
-- [x] Windows 10 Creators Update SDK (10.0.15063.0) Component
+- [x] Windows 10 Fall Creators Update SDK (10.0.16299.0) Component
 - [x] C# Development Workload
 - [x] .NET Core Cross Platform Development Workload
 

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>
 

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.

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"/>