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

Commit caeb0d9

Browse files
amerkoleciamerkoleci
committed
Add Directory.Build.props for common properties.
Geneate xml documentation only when compling in Release. Update Microsoft.NETCore.UniversalWindowsPlatform to 5.4.0.
1 parent 10a850d commit caeb0d9

34 files changed

Lines changed: 97 additions & 78 deletions

File tree

‎Build/SharpDX.props‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,6 @@
33
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
44
<DebugType>full</DebugType>
55
<DefineConstants>$(DefineConstants);DIRECTX11_1;DIRECTX11_2;DirectX12</DefineConstants>
6-
7-
<PackageIconUrl>http://sharpdx.org/logo_100x100.png</PackageIconUrl>
8-
<PackageLicenseUrl>http://sharpdx.org/License.txt</PackageLicenseUrl>
9-
<PackageProjectUrl>http://sharpdx.org</PackageProjectUrl>
10-
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
11-
<PackageTags>SharpDX DirectX Direct3D Multimedia MDX 3D</PackageTags>
12-
13-
<Authors>Alexandre Mutel</Authors>
14-
<Owners>Alexandre Mutel</Owners>
15-
<Company>Alexandre Mutel</Company>
16-
<Copyright>Copyright (c) 2010-2016 Alexandre Mutel</Copyright>
17-
<NeutralLanguage>en-US</NeutralLanguage>
18-
<Version>4.0.1</Version>
19-
<AssemblyVersion>$(Version)</AssemblyVersion>
20-
<Version Condition=" '$(SharpDXPackagingDev)' == 'true' ">$(Version)-ci$(SharpDXBuildNumber)</Version>
216
<PackageOutputPath>$(SolutionDir)bin</PackageOutputPath>
227
</PropertyGroup>
238
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' And Exists('$(SolutionDir)sharpdx.snk')">

‎Build/SharpDX.targets‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project>
2-
32
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
43
<DefineConstants>$(DefineConstants);DESKTOP_APP;BEFORE_NET45</DefineConstants>
54
<SharpDXAppType>DESKTOP_APP</SharpDXAppType>
@@ -11,7 +10,9 @@
1110
</PropertyGroup>
1211

1312
<PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
14-
<DefineConstants>$(DefineConstants);STORE_APP;WINDOWS_API_SET</DefineConstants>
13+
<DefineConstants>$(DefineConstants);STORE_APP</DefineConstants>
14+
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.14393.0</TargetPlatformVersion>
15+
<TargetPlatformMinVersion>10.0.10240.0</TargetPlatformMinVersion>
1516
<SharpDXAppType>STORE_APP</SharpDXAppType>
1617
</PropertyGroup>
1718

@@ -38,10 +39,10 @@
3839
</Target>
3940
<!-- Special packages and imports for UWP support -->
4041
<ItemGroup>
41-
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.0" PrivateAssets="all" />
42+
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.9" PrivateAssets="all" />
4243
</ItemGroup>
4344
<ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
44-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform " Version="5.2.2" />
45+
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform " Version="5.4.0" />
4546
</ItemGroup>
4647
<Import Project="$(MSBuildSDKExtrasTargets)" Condition="Exists('$(MSBuildSDKExtrasTargets)')" />
4748
</Project>

‎Directory.Build.props‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" TreatAsLocalProperty="OutDir">
2+
<PropertyGroup>
3+
<RepositoryRootDirectory>$(MSBuildThisFileDirectory)</RepositoryRootDirectory>
4+
<BinDir>$(RepositoryRootDirectory)bin</BinDir>
5+
</PropertyGroup>
6+
7+
<PropertyGroup>
8+
<Version>4.0.1</Version>
9+
<AssemblyVersion>$(Version)</AssemblyVersion>
10+
<Version Condition=" '$(SharpDXPackagingDev)' == 'true' ">$(Version)-ci$(SharpDXBuildNumber)</Version>
11+
<PackageIconUrl>http://sharpdx.org/logo_100x100.png</PackageIconUrl>
12+
<PackageLicenseUrl>http://sharpdx.org/License.txt</PackageLicenseUrl>
13+
<PackageProjectUrl>http://sharpdx.org</PackageProjectUrl>
14+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
15+
<PackageTags>SharpDX DirectX Direct3D Multimedia MDX 3D</PackageTags>
16+
17+
<Authors>Alexandre Mutel</Authors>
18+
<Owners>Alexandre Mutel</Owners>
19+
<Company>Alexandre Mutel</Company>
20+
<Copyright>Copyright (c) 2010-2016 Alexandre Mutel</Copyright>
21+
<NeutralLanguage>en-US</NeutralLanguage>
22+
</PropertyGroup>
23+
</Project>

‎SharpDX-Sources.sln‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.9
4+
VisualStudioVersion = 15.0.26730.16
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sources", "Sources", "{CC8DB471-0644-430D-9D4B-808A2475BEC0}"
77
ProjectSection(SolutionItems) = preProject
@@ -50,6 +50,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpDX.Desktop", "Source\S
5050
EndProject
5151
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SharpDX.Direct3D10", "Source\SharpDX.Direct3D10\SharpDX.Direct3D10.csproj", "{618AFA87-81A8-4B1C-8876-5457D49F2DEF}"
5252
EndProject
53+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{C3D5FB70-8EA0-4493-B1C3-8A2C73605C4B}"
54+
ProjectSection(SolutionItems) = preProject
55+
Directory.Build.props = Directory.Build.props
56+
Build\SharpDX.props = Build\SharpDX.props
57+
Build\SharpDX.targets = Build\SharpDX.targets
58+
EndProjectSection
59+
EndProject
5360
Global
5461
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5562
Debug|Any CPU = Debug|Any CPU
@@ -162,4 +169,7 @@ Global
162169
{5F8DB9E8-FFAE-475F-AC2E-FE2DC5B15A1B} = {CC8DB471-0644-430D-9D4B-808A2475BEC0}
163170
{618AFA87-81A8-4B1C-8876-5457D49F2DEF} = {CC8DB471-0644-430D-9D4B-808A2475BEC0}
164171
EndGlobalSection
172+
GlobalSection(ExtensibilityGlobals) = postSolution
173+
SolutionGuid = {3244F5C4-F587-4A39-B08A-2024351E5C4A}
174+
EndGlobalSection
165175
EndGlobal

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\Build\SharpDX.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1</TargetFrameworks>
4+
<TargetFrameworks>net40;net45;netstandard1.1</TargetFrameworks>
55
<PackageId>SharpDX.Animation</PackageId>
66
<Product>SharpDX.Animation</Product>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Animation.xml</DocumentationFile>
7+
<DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Animation.xml</DocumentationFile>
88
<AssemblyTitle>SharpDX.Animation</AssemblyTitle>
99
<Title>SharpDX.Animation</Title>
1010
<Description>Assembly providing DirectX - Animation managed API.</Description>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\Build\SharpDX.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
55
<PackageId>SharpDX.D3DCompiler</PackageId>
66
<Product>SharpDX.D3DCompiler</Product>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.D3DCompiler.xml</DocumentationFile>
7+
<DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.D3DCompiler.xml</DocumentationFile>
88
<AssemblyTitle>SharpDX.D3DCompiler</AssemblyTitle>
99
<Title>SharpDX.D3DCompiler</Title>
1010
<Description>Assembly providing DirectX - D3DCompiler managed API.</Description>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\Build\SharpDX.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
55
<PackageId>SharpDX.DXGI</PackageId>
66
<Product>SharpDX.DXGI</Product>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.DXGI.xml</DocumentationFile>
7+
<DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.DXGI.xml</DocumentationFile>
88
<AssemblyTitle>SharpDX.DXGI</AssemblyTitle>
99
<Title>SharpDX.DXGI</Title>
1010
<Description>Assembly providing DirectX - DXGI managed API.</Description>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<TargetFrameworks>net40;net45</TargetFrameworks>
55
<PackageId>SharpDX.Desktop</PackageId>
66
<Product>SharpDX.Desktop</Product>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Desktop.xml</DocumentationFile>
7+
<DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Desktop.xml</DocumentationFile>
88
<AssemblyTitle>SharpDX.Desktop</AssemblyTitle>
99
<Title>SharpDX.Desktop</Title>
1010
<Description>Assembly providing APIs related to Desktop platform.</Description>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\Build\SharpDX.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
55
<PackageId>SharpDX.Direct2D1</PackageId>
66
<Product>SharpDX.Direct2D1</Product>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct2D1.xml</DocumentationFile>
7+
<DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct2D1.xml</DocumentationFile>
88
<AssemblyTitle>SharpDX.Direct2D1</AssemblyTitle>
99
<Title>SharpDX.Direct2D1</Title>
1010
<Description>Assembly providing DirectX - Direct2D, DirectWrite and WIC managed API.</Description>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<Import Project="..\..\Build\SharpDX.props" />
33
<PropertyGroup>
4-
<TargetFrameworks>net40;net45;netcoreapp1.0;netstandard1.1;uap10.0</TargetFrameworks>
4+
<TargetFrameworks>net40;net45;netstandard1.1;uap10.0</TargetFrameworks>
55
<PackageId>SharpDX.Direct3D10</PackageId>
66
<Product>SharpDX.Direct3D10</Product>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D10.xml</DocumentationFile>
7+
<DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D10.xml</DocumentationFile>
88
<AssemblyTitle>SharpDX.Direct3D10</AssemblyTitle>
99
<Title>SharpDX.Direct3D10</Title>
1010
<Description>Assembly providing DirectX - Direct3D10 and Direct3D10.1 managed API.</Description>

0 commit comments

Comments
 (0)