Skip to content

Commit 0ea6f37

Browse files
holanceholance
committed
Update projects to use more common properties from Directory.Build.props
1 parent ec0dcbf commit 0ea6f37

File tree

70 files changed

+199
-329
lines changed

Some content is hidden

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

70 files changed

+199
-329
lines changed

‎Source/Directory.Build.props

+16
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,20 @@
22
<PropertyGroup>
33
<LangVersion>8.0</LangVersion>
44
</PropertyGroup>
5+
6+
<PropertyGroup>
7+
<Prefer32Bit>false</Prefer32Bit>
8+
</PropertyGroup>
9+
10+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
11+
<AssemblyOriginatorKeyFile>$(SolutionDir)HelixToolkit.snk</AssemblyOriginatorKeyFile>
12+
<SignAssembly>true</SignAssembly>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<None Include="$(SolutionDir)HelixToolkit.snk" />
17+
<Compile Include="$(SolutionDir)AssemblyInfo.cs">
18+
<Link>Properties\AssemblyInfo.cs</Link>
19+
</Compile>
20+
</ItemGroup>
521
</Project>

‎Source/Examples/Kinect/DepthSensorDemo/DepthSensorDemo.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<DefineConstants>DEBUG;TRACE</DefineConstants>
2727
<ErrorReport>prompt</ErrorReport>
2828
<WarningLevel>4</WarningLevel>
29-
<Prefer32Bit>false</Prefer32Bit>
29+
3030
</PropertyGroup>
3131
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
3232
<PlatformTarget>x86</PlatformTarget>
@@ -36,7 +36,7 @@
3636
<DefineConstants>TRACE</DefineConstants>
3737
<ErrorReport>prompt</ErrorReport>
3838
<WarningLevel>4</WarningLevel>
39-
<Prefer32Bit>false</Prefer32Bit>
39+
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<Reference Include="Microsoft.Kinect, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -76,9 +76,7 @@
7676
</Compile>
7777
</ItemGroup>
7878
<ItemGroup>
79-
<Compile Include="Properties\AssemblyInfo.cs">
80-
<SubType>Code</SubType>
81-
</Compile>
79+
8280
<None Include="app.config" />
8381
<AppDesigner Include="Properties\" />
8482
</ItemGroup>

‎Source/Examples/SharpDX.Core/CoreTest/CoreTest.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DefineConstants>DEBUG;TRACE</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
24-
<Prefer32Bit>false</Prefer32Bit>
24+
2525
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
2626
</PropertyGroup>
2727
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
@@ -32,7 +32,7 @@
3232
<DefineConstants>TRACE</DefineConstants>
3333
<ErrorReport>prompt</ErrorReport>
3434
<WarningLevel>4</WarningLevel>
35-
<Prefer32Bit>false</Prefer32Bit>
35+
3636
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3737
</PropertyGroup>
3838
<PropertyGroup>
@@ -61,7 +61,7 @@
6161
</Compile>
6262
<Compile Include="ImGuiNode.cs" />
6363
<Compile Include="Program.cs" />
64-
<Compile Include="Properties\AssemblyInfo.cs" />
64+
6565
<Compile Include="SceneUI.cs" />
6666
<Compile Include="ViewportControl.cs" />
6767
<EmbeddedResource Include="Form1.resx">

‎Source/Examples/SharpDX.Core/CoreWpfTest/CoreWpfTest.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<UseWPF>true</UseWPF>
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
78
</PropertyGroup>
89

910
<ItemGroup>

‎Source/Examples/UWP/SimpleDemo/SimpleDemo.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@
118118
<Compile Include="MainPageViewModel.cs" />
119119
<Compile Include="OITDemoViewModel.cs" />
120120
<Compile Include="ParticleViewModel.cs" />
121-
<Compile Include="Properties\AssemblyInfo.cs" />
121+
122122
</ItemGroup>
123123
<ItemGroup>
124124
<AppxManifest Include="Package.appxmanifest">

‎Source/Examples/WPF.SharpDX/BatchedMeshDemo/BatchedMeshDemo.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<DefineConstants>DEBUG;TRACE</DefineConstants>
2424
<ErrorReport>prompt</ErrorReport>
2525
<WarningLevel>4</WarningLevel>
26-
<Prefer32Bit>false</Prefer32Bit>
26+
2727
</PropertyGroup>
2828
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2929
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,7 +33,7 @@
3333
<DefineConstants>TRACE</DefineConstants>
3434
<ErrorReport>prompt</ErrorReport>
3535
<WarningLevel>4</WarningLevel>
36-
<Prefer32Bit>false</Prefer32Bit>
36+
3737
</PropertyGroup>
3838
<ItemGroup>
3939
<Reference Include="System" />
@@ -71,9 +71,7 @@
7171
</Compile>
7272
</ItemGroup>
7373
<ItemGroup>
74-
<Compile Include="Properties\AssemblyInfo.cs">
75-
<SubType>Code</SubType>
76-
</Compile>
74+
7775
<Compile Include="Properties\Resources.Designer.cs">
7876
<AutoGen>True</AutoGen>
7977
<DesignTime>True</DesignTime>

‎Source/Examples/WPF.SharpDX/BillboardDemo/BillboardDemo.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<DefineConstants>DEBUG;TRACE</DefineConstants>
2525
<ErrorReport>prompt</ErrorReport>
2626
<WarningLevel>4</WarningLevel>
27-
<Prefer32Bit>false</Prefer32Bit>
27+
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3030
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,7 +34,7 @@
3434
<DefineConstants>TRACE</DefineConstants>
3535
<ErrorReport>prompt</ErrorReport>
3636
<WarningLevel>4</WarningLevel>
37-
<Prefer32Bit>false</Prefer32Bit>
37+
3838
</PropertyGroup>
3939
<ItemGroup>
4040
<Reference Include="System" />
@@ -73,9 +73,7 @@
7373
</Compile>
7474
</ItemGroup>
7575
<ItemGroup>
76-
<Compile Include="Properties\AssemblyInfo.cs">
77-
<SubType>Code</SubType>
78-
</Compile>
76+
7977
<Compile Include="Properties\Resources.Designer.cs">
8078
<AutoGen>True</AutoGen>
8179
<DesignTime>True</DesignTime>

‎Source/Examples/WPF.SharpDX/BoneSkinDemo/BoneSkinDemo.csproj

+9-11
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<DefineConstants>DEBUG;TRACE</DefineConstants>
2626
<ErrorReport>prompt</ErrorReport>
2727
<WarningLevel>4</WarningLevel>
28-
<Prefer32Bit>false</Prefer32Bit>
28+
2929
</PropertyGroup>
3030
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3131
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,7 +35,7 @@
3535
<DefineConstants>TRACE</DefineConstants>
3636
<ErrorReport>prompt</ErrorReport>
3737
<WarningLevel>4</WarningLevel>
38-
<Prefer32Bit>false</Prefer32Bit>
38+
3939
</PropertyGroup>
4040
<ItemGroup>
4141
<Reference Include="System" />
@@ -73,9 +73,7 @@
7373
</Compile>
7474
</ItemGroup>
7575
<ItemGroup>
76-
<Compile Include="Properties\AssemblyInfo.cs">
77-
<SubType>Code</SubType>
78-
</Compile>
76+
7977
<Compile Include="Properties\Resources.Designer.cs">
8078
<AutoGen>True</AutoGen>
8179
<DesignTime>True</DesignTime>
@@ -142,11 +140,11 @@
142140
</None>
143141
</ItemGroup>
144142
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
145-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
146-
Other similar extension points exist, see Microsoft.Common.targets.
147-
<Target Name="BeforeBuild">
148-
</Target>
149-
<Target Name="AfterBuild">
150-
</Target>
143+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
144+
Other similar extension points exist, see Microsoft.Common.targets.
145+
<Target Name="BeforeBuild">
146+
</Target>
147+
<Target Name="AfterBuild">
148+
</Target>
151149
-->
152150
</Project>

‎Source/Examples/WPF.SharpDX/CrossSectionDemo/CrossSectionDemo.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<ErrorReport>prompt</ErrorReport>
2929
<WarningLevel>4</WarningLevel>
3030
<UseVSHostingProcess>true</UseVSHostingProcess>
31-
<Prefer32Bit>false</Prefer32Bit>
31+
3232
</PropertyGroup>
3333
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3434
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -38,7 +38,7 @@
3838
<DefineConstants>TRACE</DefineConstants>
3939
<ErrorReport>prompt</ErrorReport>
4040
<WarningLevel>4</WarningLevel>
41-
<Prefer32Bit>false</Prefer32Bit>
41+
4242
</PropertyGroup>
4343
<ItemGroup>
4444
<Reference Include="System" />
@@ -77,9 +77,7 @@
7777
</Compile>
7878
</ItemGroup>
7979
<ItemGroup>
80-
<Compile Include="Properties\AssemblyInfo.cs">
81-
<SubType>Code</SubType>
82-
</Compile>
80+
8381
<Compile Include="Properties\Resources.Designer.cs">
8482
<AutoGen>True</AutoGen>
8583
<DesignTime>True</DesignTime>

‎Source/Examples/WPF.SharpDX/CustomShaderDemo/CustomShaderDemo.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<DefineConstants>DEBUG;TRACE</DefineConstants>
2828
<ErrorReport>prompt</ErrorReport>
2929
<WarningLevel>4</WarningLevel>
30-
<Prefer32Bit>false</Prefer32Bit>
30+
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3333
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,7 +37,7 @@
3737
<DefineConstants>TRACE</DefineConstants>
3838
<ErrorReport>prompt</ErrorReport>
3939
<WarningLevel>4</WarningLevel>
40-
<Prefer32Bit>false</Prefer32Bit>
40+
4141
</PropertyGroup>
4242
<PropertyGroup>
4343
<StartupObject>
@@ -84,9 +84,7 @@
8484
<Compile Include="Materials\CustomPointMaterial.cs" />
8585
<Compile Include="Materials\CustomPointMaterialCore.cs" />
8686
<Compile Include="Materials\CustomPointMaterialVariable.cs" />
87-
<Compile Include="Properties\AssemblyInfo.cs">
88-
<SubType>Code</SubType>
89-
</Compile>
87+
9088
<Compile Include="Properties\Resources.Designer.cs">
9189
<AutoGen>True</AutoGen>
9290
<DesignTime>True</DesignTime>

‎Source/Examples/WPF.SharpDX/CustomViewCubeDemo/CustomViewCubeDemo.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -76,9 +76,7 @@
7676
</ItemGroup>
7777
<ItemGroup>
7878
<Compile Include="MainWindowViewModel.cs" />
79-
<Compile Include="Properties\AssemblyInfo.cs">
80-
<SubType>Code</SubType>
81-
</Compile>
79+
8280
<Compile Include="Properties\Resources.Designer.cs">
8381
<AutoGen>True</AutoGen>
8482
<DesignTime>True</DesignTime>

‎Source/Examples/WPF.SharpDX/D2DScreenMenuExample/D2DScreenMenuExample.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<DefineConstants>DEBUG;TRACE</DefineConstants>
2828
<ErrorReport>prompt</ErrorReport>
2929
<WarningLevel>4</WarningLevel>
30-
<Prefer32Bit>false</Prefer32Bit>
30+
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3333
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,7 +37,7 @@
3737
<DefineConstants>TRACE</DefineConstants>
3838
<ErrorReport>prompt</ErrorReport>
3939
<WarningLevel>4</WarningLevel>
40-
<Prefer32Bit>false</Prefer32Bit>
40+
4141
</PropertyGroup>
4242
<ItemGroup>
4343
<Reference Include="System" />
@@ -75,9 +75,7 @@
7575
</Compile>
7676
</ItemGroup>
7777
<ItemGroup>
78-
<Compile Include="Properties\AssemblyInfo.cs">
79-
<SubType>Code</SubType>
80-
</Compile>
78+
8179
<Compile Include="Properties\Resources.Designer.cs">
8280
<AutoGen>True</AutoGen>
8381
<DesignTime>True</DesignTime>

‎Source/Examples/WPF.SharpDX/DeferredShadingDemo/DeferredShadingDemo.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<DefineConstants>DEBUG;TRACE</DefineConstants>
2727
<ErrorReport>prompt</ErrorReport>
2828
<WarningLevel>4</WarningLevel>
29-
<Prefer32Bit>false</Prefer32Bit>
29+
3030
</PropertyGroup>
3131
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3232
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -36,7 +36,7 @@
3636
<DefineConstants>TRACE</DefineConstants>
3737
<ErrorReport>prompt</ErrorReport>
3838
<WarningLevel>4</WarningLevel>
39-
<Prefer32Bit>false</Prefer32Bit>
39+
4040
</PropertyGroup>
4141
<ItemGroup>
4242
<Reference Include="PropertyChanged, Version=2.1.3.0, Culture=neutral, PublicKeyToken=ee3ee20bcf148ddd, processorArchitecture=MSIL">
@@ -99,9 +99,7 @@
9999
</Compile>
100100
</ItemGroup>
101101
<ItemGroup>
102-
<Compile Include="Properties\AssemblyInfo.cs">
103-
<SubType>Code</SubType>
104-
</Compile>
102+
105103
<Compile Include="Properties\Resources.Designer.cs">
106104
<AutoGen>True</AutoGen>
107105
<DesignTime>True</DesignTime>

‎Source/Examples/WPF.SharpDX/DemoCore/DemoCore.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<DefineConstants>DEBUG;TRACE</DefineConstants>
2222
<ErrorReport>prompt</ErrorReport>
2323
<WarningLevel>4</WarningLevel>
24-
<Prefer32Bit>false</Prefer32Bit>
24+
2525
</PropertyGroup>
2626
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2727
<DebugType>pdbonly</DebugType>
@@ -30,7 +30,7 @@
3030
<DefineConstants>TRACE</DefineConstants>
3131
<ErrorReport>prompt</ErrorReport>
3232
<WarningLevel>4</WarningLevel>
33-
<Prefer32Bit>false</Prefer32Bit>
33+
3434
</PropertyGroup>
3535
<ItemGroup>
3636
<Reference Include="PresentationCore" />
@@ -43,7 +43,7 @@
4343
<Compile Include="BaseViewModel.cs" />
4444
<Compile Include="Converters.cs" />
4545
<Compile Include="ObservableObject.cs" />
46-
<Compile Include="Properties\AssemblyInfo.cs" />
46+
4747
<Compile Include="RelayCommand.cs" />
4848
</ItemGroup>
4949
<ItemGroup>

‎Source/Examples/WPF.SharpDX/DynamicCodeSurfaceDemo/DynamicCodeSurfaceDemo.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,7 @@
6969
</Compile>
7070
</ItemGroup>
7171
<ItemGroup>
72-
<Compile Include="Properties\AssemblyInfo.cs">
73-
<SubType>Code</SubType>
74-
</Compile>
72+
7573
<Compile Include="Properties\Resources.Designer.cs">
7674
<AutoGen>True</AutoGen>
7775
<DesignTime>True</DesignTime>

‎Source/Examples/WPF.SharpDX/DynamicTextureDemo/DynamicTextureDemo.csproj

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<DefineConstants>DEBUG;TRACE</DefineConstants>
2828
<ErrorReport>prompt</ErrorReport>
2929
<WarningLevel>4</WarningLevel>
30-
<Prefer32Bit>false</Prefer32Bit>
30+
3131
</PropertyGroup>
3232
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
3333
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -37,7 +37,7 @@
3737
<DefineConstants>TRACE</DefineConstants>
3838
<ErrorReport>prompt</ErrorReport>
3939
<WarningLevel>4</WarningLevel>
40-
<Prefer32Bit>false</Prefer32Bit>
40+
4141
</PropertyGroup>
4242
<ItemGroup>
4343
<Reference Include="System" />
@@ -72,9 +72,7 @@
7272
</Compile>
7373
</ItemGroup>
7474
<ItemGroup>
75-
<Compile Include="Properties\AssemblyInfo.cs">
76-
<SubType>Code</SubType>
77-
</Compile>
75+
7876
<Compile Include="Properties\Resources.Designer.cs">
7977
<AutoGen>True</AutoGen>
8078
<DesignTime>True</DesignTime>

0 commit comments

Comments
 (0)