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

Commit 8f03cb4

Browse files
xoofxxoofx
authored
Merge pull request #943 from amerkoleci/improvements
Various improvements and cleanup
2 parents 10a850d + 672e484 commit 8f03cb4

46 files changed

Lines changed: 200 additions & 121 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Build/SharpDX.targets‎

Lines changed: 4 additions & 3 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

@@ -41,7 +42,7 @@
4142
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.0.0" 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>

‎SharpDX-Sources.sln‎

Lines changed: 10 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,12 @@ 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+
Build\SharpDX.props = Build\SharpDX.props
56+
Build\SharpDX.targets = Build\SharpDX.targets
57+
EndProjectSection
58+
EndProject
5359
Global
5460
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5561
Debug|Any CPU = Debug|Any CPU
@@ -162,4 +168,7 @@ Global
162168
{5F8DB9E8-FFAE-475F-AC2E-FE2DC5B15A1B} = {CC8DB471-0644-430D-9D4B-808A2475BEC0}
163169
{618AFA87-81A8-4B1C-8876-5457D49F2DEF} = {CC8DB471-0644-430D-9D4B-808A2475BEC0}
164170
EndGlobalSection
171+
GlobalSection(ExtensibilityGlobals) = postSolution
172+
SolutionGuid = {3244F5C4-F587-4A39-B08A-2024351E5C4A}
173+
EndGlobalSection
165174
EndGlobal

‎Source/SharedAssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
[assembly:ComVisible(false)]
2626

27-
#if STORE_APP
27+
#if WINDOWS_UWP
2828
[assembly: Obfuscation(Feature = "Apply to type SharpDX.* when public and interface: renaming", Exclude = false, ApplyToMembers = true)]
2929
[assembly: Obfuscation(Feature = "Apply to type SharpDX.* when struct: renaming", Exclude = false, ApplyToMembers = true)]
3030
[assembly: Obfuscation(Feature = "Apply to type SharpDX.*: INotifyPropertyChanged heuristics", Exclude = true)]

‎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>

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

Lines changed: 11 additions & 11 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.Direct3D11.Effects</PackageId>
66
<Product>SharpDX.Direct3D11.Effects</Product>
7-
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D11.Effects.xml</DocumentationFile>
7+
<DocumentationFile Condition="'$(Configuration)' == 'Release'">bin\$(Configuration)\$(TargetFramework)\SharpDX.Direct3D11.Effects.xml</DocumentationFile>
88
<AssemblyTitle>SharpDX.Direct3D11.Effects</AssemblyTitle>
99
<Title>SharpDX.Direct3D11.Effects</Title>
1010
<Description>Assembly providing DirectX - Effects11 managed API for Direct3D11.</Description>
@@ -19,23 +19,23 @@
1919
</Compile>
2020
</ItemGroup>
2121
<ItemGroup>
22-
<None Include="..\..\External\Effects11\Bin\sharpdx_direct3d11_1_effects_arm.dll">
23-
<Link>sharpdx_direct3d11_1_effects_arm.dll</Link>
24-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25-
<Pack>true</Pack>
26-
<PackagePath>runtimes/win8-arm/sharpdx_direct3d11_1_effects.dll</PackagePath>
27-
</None>
28-
<None Include="..\..\External\Effects11\Bin\sharpdx_direct3d11_1_effects_x64.dll">
22+
<None Include="$(MSBuildThisFileDirectory)..\..\External\Effects11\Bin\sharpdx_direct3d11_1_effects_x64.dll">
2923
<Link>sharpdx_direct3d11_1_effects_x64.dll</Link>
3024
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25+
<PackagePath>runtimes/win7-x64/native/sharpdx_direct3d11_1_effects.dll</PackagePath>
3126
<Pack>true</Pack>
32-
<PackagePath>runtimes/win-x64/sharpdx_direct3d11_1_effects.dll</PackagePath>
3327
</None>
3428
<None Include="..\..\External\Effects11\Bin\sharpdx_direct3d11_1_effects_x86.dll">
3529
<Link>sharpdx_direct3d11_1_effects_x86.dll</Link>
3630
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
31+
<PackagePath>runtimes/win7-x86/native/sharpdx_direct3d11_1_effects.dll</PackagePath>
32+
<Pack>true</Pack>
33+
</None>
34+
<None Include="..\..\External\Effects11\Bin\sharpdx_direct3d11_1_effects_arm.dll">
35+
<Link>sharpdx_direct3d11_1_effects_arm.dll</Link>
36+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
37+
<PackagePath>runtimes/uap10.0/native/sharpdx_direct3d11_1_effects.dll</PackagePath>
3738
<Pack>true</Pack>
38-
<PackagePath>runtimes/win-x86/sharpdx_direct3d11_1_effects.dll</PackagePath>
3939
</None>
4040
</ItemGroup>
4141
<ItemGroup>

0 commit comments

Comments
 (0)