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

Commit c10a662

Browse files
committed
Updated DirectManipulation to the new project system
1 parent 929a164 commit c10a662

4 files changed

Lines changed: 27 additions & 107 deletions

File tree

Source/Mapping.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,12 @@
8585
<file>SharpDX.DirectManipulation\Mapping.xml</file>
8686
<file>SharpDX.RawInput\Mapping.xml</file>
8787
</ifdef>
88+
<ifdef name="REFERENCE">
89+
<file>SharpDX.Animation\Mapping.xml</file>
90+
<file>SharpDX.DirectComposition\Mapping.xml</file>
91+
<file>SharpDX.DirectManipulation\Mapping.xml</file>
92+
<file>SharpDX.RawInput\Mapping.xml</file>
93+
</ifdef>
8894

8995
<file>SharpDX.XInput\Mapping.xml</file>
9096

Source/SharpDX.DirectManipulation/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 21 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="$(SolutionDir)Build\SharpDX.props" />
33
<PropertyGroup>
4-
<SharpDXDesktopOnly>true</SharpDXDesktopOnly>
4+
<TargetFrameworks>net45;netcoreapp1.0;netstandard1.1</TargetFrameworks>
5+
<PackageId>SharpDX.DirectManipulation</PackageId>
6+
<Product>SharpDX.DirectManipulation</Product>
7+
<AssemblyTitle>SharpDX.DirectManipulation</AssemblyTitle>
8+
<Title>SharpDX.DirectManipulation</Title>
9+
<Description>Assembly providing DirectX - DirectManipulation managed API.</Description>
10+
<PackageTags>$(PackageTags) DirectManipulation Touch Input</PackageTags>
511
</PropertyGroup>
6-
<Import Project="$(SolutionDir)\Build\SharpDX.PreSettings.targets" />
7-
<PropertyGroup>
8-
<ProductVersion>8.0.30703</ProductVersion>
9-
<SchemaVersion>2.0</SchemaVersion>
10-
<ProjectGuid>{F826CCCE-4B72-47F4-9493-DFCB51C106B7}</ProjectGuid>
11-
<RootNamespace>SharpDX.DirectManipulation</RootNamespace>
12-
<AssemblyName>SharpDX.DirectManipulation</AssemblyName>
13-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
12+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'netcoreapp1.0' ">
13+
<DefineConstants>$(DefineConstants);DESKTOP_APP</DefineConstants>
14+
<SharpDXAppType>DESKTOP_APP</SharpDXAppType>
15+
</PropertyGroup>
16+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.1' ">
17+
<DefineConstants>$(DefineConstants);REFERENCE</DefineConstants>
18+
<SharpDXAppType>REFERENCE</SharpDXAppType>
1419
</PropertyGroup>
1520
<ItemGroup>
16-
<Reference Include="System" />
17-
<Reference Include="System.Data" />
18-
<Reference Include="System.Drawing" />
19-
</ItemGroup>
20-
<ItemGroup>
21-
<Compile Include="AutoScrollBehavior.cs" />
22-
<Compile Include="Compositor.cs" />
23-
<Compile Include="CompositorNative.cs" />
24-
<Compile Include="CompositorShadow.cs" />
25-
<Compile Include="Content.cs" />
26-
<Compile Include="DragDropBehavior.cs" />
27-
<Compile Include="Manager.cs" />
28-
<Compile Include="Manager2.cs" />
29-
<Compile Include="Properties\AssemblyInfo.cs" />
21+
<None Include="Documentation\CodeComments.xml" />
22+
<None Include="Mapping.xml" />
3023
<Compile Include="..\SharedAssemblyInfo.cs">
3124
<Link>Properties\SharedAssemblyInfo.cs</Link>
3225
</Compile>
33-
<Compile Include="Generated\Enumerations.cs" />
34-
<Compile Include="Generated\Functions.cs" />
35-
<Compile Include="Generated\Interfaces.cs" />
36-
<Compile Include="Generated\LocalInterop.cs" />
37-
<Compile Include="Generated\Structures.cs" />
38-
<Compile Include="Viewport.cs" />
39-
<Compile Include="Viewport2.cs" />
40-
<None Include="Mapping.xml" />
41-
<None Include="SharpDX.DirectManipulation.nuspec" />
4226
</ItemGroup>
4327
<ItemGroup>
44-
<ProjectReference Include="..\SharpDX\SharpDX.csproj">
45-
<Project>{d0bcd56a-41c4-4a4e-8590-26864ced07ff}</Project>
46-
<Name>SharpDX</Name>
47-
<Private>False</Private>
48-
</ProjectReference>
49-
</ItemGroup>
50-
<ItemGroup>
51-
<None Include="Documentation\CodeComments.xml" />
28+
<ProjectReference Include="..\SharpDX\SharpDX.csproj" />
5229
</ItemGroup>
53-
<Import Project="$(SolutionDir)\Build\SharpDX.PostSettings.targets" />
54-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
55-
Other similar extension points exist, see Microsoft.Common.targets.
56-
<Target Name="BeforeBuild">
57-
</Target>
58-
<Target Name="AfterBuild">
59-
</Target>
60-
-->
30+
31+
<Import Project="$(SolutionDir)Build\SharpDX.targets" />
6132
</Project>

Source/SharpDX.DirectManipulation/SharpDX.DirectManipulation.nuspec

Lines changed: 0 additions & 49 deletions
This file was deleted.

0 commit comments

Comments
 (0)