Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit 8c51cb3

Browse files
jkoritzinskyjkoritzinsky
committed
Update MSBuild.Sdk.Extras and SharpGenTools.Sdk
1 parent bdb12ec commit 8c51cb3

24 files changed

Lines changed: 142 additions & 62 deletions

File tree

‎Source/Directory.build.props‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,12 @@
4040
<DelaySign>true</DelaySign>
4141
</PropertyGroup>
4242

43-
<PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
44-
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.14393.0</TargetPlatformVersion>
45-
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
46-
</PropertyGroup>
47-
4843
<ItemGroup>
49-
<PackageReference Include="SharpGenTools.Sdk" Version="1.0.0" PrivateAssets="All" />
50-
<PackageReference Include="SharpGen.Doc.Msdn.Tasks" Version="1.0.0" PrivateAssets="All" />
44+
<PackageReference Include="SharpGenTools.Sdk" Version="1.0.4-ci425" PrivateAssets="All" />
45+
<PackageReference Include="SharpGen.Doc.Msdn.Tasks" Version="1.0.4-ci418" PrivateAssets="All" />
5146
<SharpGenGlobalNamespaceOverrides Include="InterfaceArray" Override="ComArray" />
5247
<SharpGenGlobalNamespaceOverrides Include="MemoryHelpers" Override="Utilities" />
5348
<SharpGenGlobalNamespaceOverrides Include="BooleanHelpers" Override="Utilities" />
5449
<SharpGenGlobalNamespaceOverrides Include="StringHelpers" Override="Utilities" />
5550
</ItemGroup>
56-
57-
58-
<!-- Special packages and imports for UWP support -->
59-
<ItemGroup>
60-
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.1.0" PrivateAssets="all" />
61-
</ItemGroup>
62-
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
63-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform " Version="5.4.0" />
64-
</ItemGroup>
6551
</Project>

‎Source/DocumentationCache.xml‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75928,5 +75928,116 @@ hr = pInfoQueue-&amp;gt;GetMessage({{DXGI_DEBUG_ALL}}, 0, pMessage, &amp;amp;mes
7592875928
&lt;/p&gt;</summary>
7592975929
<Items />
7593075930
</doc-item>
75931+
<doc-item name="D3D11_UNORDERED_ACCESS_VIEW_DESC_INNER_0">
75932+
<Items />
75933+
</doc-item>
75934+
<doc-item name="D3D12_RENDER_TARGET_VIEW_DESC_INNER_0">
75935+
<Items />
75936+
</doc-item>
75937+
<doc-item name="D3D12_DEPTH_STENCIL_VIEW_DESC_INNER_0">
75938+
<Items />
75939+
</doc-item>
75940+
<doc-item name="D3D12_UNORDERED_ACCESS_VIEW_DESC_INNER_0">
75941+
<Items />
75942+
</doc-item>
75943+
<doc-item name="D3D12_ROOT_PARAMETER_INNER_0">
75944+
<Items />
75945+
</doc-item>
75946+
<doc-item name="D2D_MATRIX_4X4_F_INNER_0_INNER_0">
75947+
<Items />
75948+
</doc-item>
75949+
<doc-item name="D3D11_SHADER_RESOURCE_VIEW_DESC1_INNER_0">
75950+
<Items />
75951+
</doc-item>
75952+
<doc-item name="D2D_MATRIX_3X2_F_INNER_0_INNER_1">
75953+
<Items />
75954+
</doc-item>
75955+
<doc-item name="D2D_MATRIX_4X3_F_INNER_0">
75956+
<Items />
75957+
</doc-item>
75958+
<doc-item name="D3D11_VIDEO_PROCESSOR_OUTPUT_VIEW_DESC_INNER_0">
75959+
<Items />
75960+
</doc-item>
75961+
<doc-item name="D3D11_VIDEO_DECODER_OUTPUT_VIEW_DESC_INNER_0">
75962+
<Items />
75963+
</doc-item>
75964+
<doc-item name="D2D_MATRIX_3X2_F_INNER_0">
75965+
<Items />
75966+
</doc-item>
75967+
<doc-item name="D2D_MATRIX_4X4_F_INNER_0">
75968+
<Items />
75969+
</doc-item>
75970+
<doc-item name="D3D11_VIDEO_COLOR_INNER_0">
75971+
<Items />
75972+
</doc-item>
75973+
<doc-item name="D3D11_UNORDERED_ACCESS_VIEW_DESC1_INNER_0">
75974+
<Items />
75975+
</doc-item>
75976+
<doc-item name="D2D_MATRIX_5X4_F_INNER_0">
75977+
<Items />
75978+
</doc-item>
75979+
<doc-item name="D2D_MATRIX_5X4_F_INNER_0_INNER_0">
75980+
<Items />
75981+
</doc-item>
75982+
<doc-item name="D2D_MATRIX_4X3_F_INNER_0_INNER_0">
75983+
<Items />
75984+
</doc-item>
75985+
<doc-item name="D3D11_VIDEO_PROCESSOR_INPUT_VIEW_DESC_INNER_0">
75986+
<Items />
75987+
</doc-item>
75988+
<doc-item name="D3D11_BUFFER_RTV_INNER_1">
75989+
<Items />
75990+
</doc-item>
75991+
<doc-item name="D3D11_RENDER_TARGET_VIEW_DESC1_INNER_0">
75992+
<Items />
75993+
</doc-item>
75994+
<doc-item name="D3D11_BUFFER_SRV_INNER_1">
75995+
<Items />
75996+
</doc-item>
75997+
<doc-item name="D3D12_SHADER_RESOURCE_VIEW_DESC_INNER_0">
75998+
<Items />
75999+
</doc-item>
76000+
<doc-item name="RID_DEVICE_INFO_INNER_0">
76001+
<Items />
76002+
</doc-item>
76003+
<doc-item name="D3D11_RENDER_TARGET_VIEW_DESC_INNER_0">
76004+
<Items />
76005+
</doc-item>
76006+
<doc-item name="D3D12_VERSIONED_ROOT_SIGNATURE_DESC_INNER_0">
76007+
<Items />
76008+
</doc-item>
76009+
<doc-item name="D3D12_CLEAR_VALUE_INNER_0">
76010+
<Items />
76011+
</doc-item>
76012+
<doc-item name="D3D11_DEPTH_STENCIL_VIEW_DESC_INNER_0">
76013+
<Items />
76014+
</doc-item>
76015+
<doc-item name="D3D12_INDIRECT_ARGUMENT_DESC_INNER_0">
76016+
<Items />
76017+
</doc-item>
76018+
<doc-item name="MFTOPONODE_ATTRIBUTE_UPDATE_INNER_0">
76019+
<Items />
76020+
</doc-item>
76021+
<doc-item name="D2D_MATRIX_3X2_F_INNER_0_INNER_0">
76022+
<Items />
76023+
</doc-item>
76024+
<doc-item name="D3D11_SHADER_RESOURCE_VIEW_DESC_INNER_0">
76025+
<Items />
76026+
</doc-item>
76027+
<doc-item name="D3D12_TEXTURE_COPY_LOCATION_INNER_0">
76028+
<Items />
76029+
</doc-item>
76030+
<doc-item name="D3D11_BUFFER_RTV_INNER_0">
76031+
<Items />
76032+
</doc-item>
76033+
<doc-item name="D3D11_BUFFER_SRV_INNER_0">
76034+
<Items />
76035+
</doc-item>
76036+
<doc-item name="D3D12_ROOT_PARAMETER1_INNER_0">
76037+
<Items />
76038+
</doc-item>
76039+
<doc-item name="D3D12_RESOURCE_BARRIER_INNER_0">
76040+
<Items />
76041+
</doc-item>
7593176042
</DocItems>
7593276043
</documentation>

‎Source/SharpDX.Animation/SharpDX.Animation.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1</TargetFrameworks>

‎Source/SharpDX.D3DCompiler/SharpDX.D3DCompiler.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
@@ -19,6 +19,4 @@
1919
<ItemGroup>
2020
<ProjectReference Include="..\SharpDX\SharpDX.csproj" />
2121
</ItemGroup>
22-
23-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
2422
</Project>

‎Source/SharpDX.DXGI/SharpDX.DXGI.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
@@ -20,6 +20,4 @@
2020
<ItemGroup>
2121
<ProjectReference Include="..\SharpDX\SharpDX.csproj" />
2222
</ItemGroup>
23-
24-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
2523
</Project>

‎Source/SharpDX.Desktop/SharpDX.Desktop.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45</TargetFrameworks>

‎Source/SharpDX.Direct2D1/SharpDX.Direct2D1.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
@@ -21,6 +21,4 @@
2121
<ProjectReference Include="..\SharpDX\SharpDX.csproj" />
2222
<ProjectReference Include="..\SharpDX.DXGI\SharpDX.DXGI.csproj" />
2323
</ItemGroup>
24-
25-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
2624
</Project>

‎Source/SharpDX.Direct3D10/SharpDX.Direct3D10.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
@@ -23,6 +23,4 @@
2323
<ProjectReference Include="..\SharpDX.DXGI\SharpDX.DXGI.csproj" />
2424
<ProjectReference Include="..\SharpDX.D3DCompiler\SharpDX.D3DCompiler.csproj" />
2525
</ItemGroup>
26-
27-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
2826
</Project>

‎Source/SharpDX.Direct3D11.Effects/SharpDX.Direct3D11.Effects.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
@@ -34,7 +34,7 @@
3434
<None Include="..\..\External\Effects11\Bin\sharpdx_direct3d11_1_effects_arm.dll">
3535
<Link>sharpdx_direct3d11_1_effects_arm.dll</Link>
3636
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
37-
<PackagePath>runtimes/uap10.0/native/sharpdx_direct3d11_1_effects.dll</PackagePath>
37+
<PackagePath>runtimes/win8-arm/native/sharpdx_direct3d11_1_effects.dll</PackagePath>
3838
<Pack>true</Pack>
3939
</None>
4040
</ItemGroup>
@@ -44,6 +44,4 @@
4444
<ProjectReference Include="..\SharpDX.D3DCompiler\SharpDX.D3DCompiler.csproj" />
4545
<ProjectReference Include="..\SharpDX.Direct3D11\SharpDX.Direct3D11.csproj" />
4646
</ItemGroup>
47-
48-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
4947
</Project>

‎Source/SharpDX.Direct3D11/SharpDX.Direct3D11.csproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="MSBuild.Sdk.Extras">
22

33
<PropertyGroup>
44
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
@@ -21,6 +21,4 @@
2121
<ProjectReference Include="..\SharpDX\SharpDX.csproj" />
2222
<ProjectReference Include="..\SharpDX.DXGI\SharpDX.DXGI.csproj" />
2323
</ItemGroup>
24-
25-
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
2624
</Project>

0 commit comments

Comments
 (0)