Skip to content

Commit 8259aa9

Browse files
robertlong13meee1
robertlong13
authored and
meee1
committed
TerrainMaker: fix csproj
The previous project file was causing MissionPlanner.exe to be unnecessarily copied into the plugins output directory. I could not find a way to prevent that with a small incremental change, so I switched over to the same boilerplate as the other plugins.
1 parent 4d441bd commit 8259aa9

File tree

1 file changed

+28
-120
lines changed

1 file changed

+28
-120
lines changed

‎Plugins/TerrainMakerPlugin/TerrainMakerPlugin.csproj‎

Lines changed: 28 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,132 +1,40 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{DDD2FEA8-801E-463B-8913-9CCCDA2D9429}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<RootNamespace>TerrainMakerPlugin</RootNamespace>
10-
<AssemblyName>TerrainMakerPlugin</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
15-
<NuGetPackageImportStamp>
16-
</NuGetPackageImportStamp>
4+
<TargetFramework>net472</TargetFramework>
5+
<UseWindowsForms>true</UseWindowsForms>
6+
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
177
</PropertyGroup>
18-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
19-
<PlatformTarget>AnyCPU</PlatformTarget>
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>$(SolutionDir)bin\Debug\net461\plugins\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
8+
9+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
10+
<NoWarn>1701;1702;NU1605</NoWarn>
11+
<DebugType>portable</DebugType>
12+
<outputPath>..\..\bin\Debug\net461\plugins\</outputPath>
2713
</PropertyGroup>
28-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29-
<PlatformTarget>AnyCPU</PlatformTarget>
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>$(SolutionDir)bin\Release\net461\plugins\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
</PropertyGroup>
37-
<PropertyGroup>
38-
<StartupObject />
14+
15+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
16+
<NoWarn>1701;1702;NU1605</NoWarn>
17+
<DebugType>portable</DebugType>
18+
<outputPath>..\..\bin\Release\net461\plugins\</outputPath>
3919
</PropertyGroup>
20+
4021
<ItemGroup>
41-
<ProjectReference Include="$(SolutionDir)ExtLibs\BaseClasses\BaseClasses.csproj">
42-
<Project>{2a8e8af5-74e7-49db-a42e-9360fa7a6cc4}</Project>
43-
<Name>BaseClasses</Name>
44-
</ProjectReference>
45-
<ProjectReference Include="$(SolutionDir)ExtLibs\BSE.Windows.Forms\BSE.Windows.Forms.csproj">
46-
<Project>{9ca367b8-0b98-49d1-84fb-735e612e3ba9}</Project>
47-
<Name>BSE.Windows.Forms</Name>
48-
</ProjectReference>
49-
<ProjectReference Include="$(SolutionDir)ExtLibs\Core\Core.csproj">
50-
<Project>{59129078-7b12-4198-b93e-0aa08d0bb7ed}</Project>
51-
<Name>Core</Name>
52-
</ProjectReference>
53-
<ProjectReference Include="$(SolutionDir)ExtLibs\Mavlink\MAVLink.csproj">
54-
<Project>{13d2ec90-c41f-48a1-aada-859b6dc24edc}</Project>
55-
<Name>MAVLink</Name>
56-
</ProjectReference>
57-
<ProjectReference Include="$(SolutionDir)MissionPlanner.csproj">
58-
<Project>{a2e22272-95fe-47b6-b050-9ae7e2055bf5}</Project>
59-
<Name>MissionPlanner</Name>
60-
</ProjectReference>
61-
<ProjectReference Include="$(SolutionDir)ExtLibs\ArduPilot\MissionPlanner.ArduPilot.csproj">
62-
<Project>{ca6345d3-7a6d-478b-a0ed-a58e50dcaa83}</Project>
63-
<Name>MissionPlanner.ArduPilot</Name>
64-
</ProjectReference>
65-
<ProjectReference Include="$(SolutionDir)ExtLibs\Comms\MissionPlanner.Comms.csproj">
66-
<Project>{825e7a10-390c-4a2b-b3a8-491d14966912}</Project>
67-
<Name>MissionPlanner.Comms</Name>
68-
</ProjectReference>
69-
<ProjectReference Include="$(SolutionDir)ExtLibs\Controls\MissionPlanner.Controls.csproj">
70-
<Project>{c8b88795-6d01-494d-83ad-6944bd4c5023}</Project>
71-
<Name>MissionPlanner.Controls</Name>
72-
</ProjectReference>
73-
<ProjectReference Include="$(SolutionDir)ExtLibs\GeoUtility\GeoUtility.csproj">
74-
<Project>{7f7994ce-823f-4a04-bbea-d0a3808ff56d}</Project>
75-
<Name>GeoUtility</Name>
76-
</ProjectReference>
77-
<ProjectReference Include="$(SolutionDir)ExtLibs\GMap.NET.Core\GMap.NET.Core.csproj">
78-
<Project>{d0c39d9d-bed0-418b-9a5e-713176caf40c}</Project>
79-
<Name>GMap.NET.Core</Name>
80-
</ProjectReference>
81-
<ProjectReference Include="$(SolutionDir)ExtLibs\GMap.NET.WindowsForms\GMap.NET.WindowsForms.csproj">
82-
<Project>{e06def77-f933-42fb-afd7-db2d0d8d6a98}</Project>
83-
<Name>GMap.NET.WindowsForms</Name>
84-
</ProjectReference>
85-
<ProjectReference Include="$(SolutionDir)ExtLibs\Utilities\MissionPlanner.Utilities.csproj">
86-
<Project>{1378a66c-38e4-46f5-a05f-dc04ef7d4d16}</Project>
87-
<Name>MissionPlanner.Utilities</Name>
88-
</ProjectReference>
89-
<ProjectReference Include="$(SolutionDir)ExtLibs\GMap.NET.Drawing\GMap.NET.Drawing.csproj">
90-
<Project>{d773accd-9c2d-4e94-a967-faa7ea2d21cb}</Project>
91-
<Name>GMap.NET.Drawing</Name>
92-
</ProjectReference>
93-
<ProjectReference Include="$(SolutionDir)ExtLibs\Interfaces\Interfaces.csproj">
94-
<Project>{FD4D2994-9BEA-41A1-8C51-2E02D1E8503E}</Project>
95-
<Name>Interfaces</Name>
96-
</ProjectReference>
97-
<ProjectReference Include="$(SolutionDir)ExtLibs\Maps\MissionPlanner.Maps.csproj">
98-
<Project>{6c4ff9c3-7aff-4274-b8fc-4a93a1faadea}</Project>
99-
<Name>MissionPlanner.Maps</Name>
100-
</ProjectReference>
101-
<ProjectReference Include="$(SolutionDir)ExtLibs\MissionPlanner.Drawing\MissionPlanner.Drawing.csproj">
102-
<Project>{6974d22c-ede6-4bb2-aad2-ff23ed6ec165}</Project>
103-
<Name>MissionPlanner.Drawing</Name>
22+
<ProjectReference Include="..\..\ExtLibs\MissionPlanner.Drawing\MissionPlanner.Drawing.csproj">
10423
<Aliases>Drawing</Aliases>
24+
<Private>false</Private>
10525
</ProjectReference>
106-
<ProjectReference Include="$(SolutionDir)ExtLibs\SvgNet\SvgNet.csproj">
107-
<Project>{bb4c8021-b5e1-4de2-82cb-14bdfb9837e4}</Project>
108-
<Name>SvgNet</Name>
26+
<ProjectReference Include="..\..\ExtLibs\Utilities\MissionPlanner.Utilities.csproj">
27+
<Private>false</Private>
28+
</ProjectReference>
29+
<ProjectReference Include="..\..\MissionPlanner.csproj">
30+
<Private>false</Private>
10931
</ProjectReference>
11032
</ItemGroup>
33+
11134
<ItemGroup>
112-
<Compile Include="Location.cs" />
113-
<Compile Include="TerrainDataFile.cs" />
114-
<Compile Include="TerrainMakerPlugin.cs" />
115-
</ItemGroup>
116-
<ItemGroup>
117-
<Reference Include="System" />
118-
<Reference Include="System.Data" />
119-
<Reference Include="System.Drawing" />
120-
<Reference Include="System.Windows.Forms" />
121-
<Reference Include="System.Xml" />
122-
</ItemGroup>
123-
<ItemGroup>
124-
<WCFMetadata Include="Connected Services\" />
125-
</ItemGroup>
126-
<ItemGroup>
127-
<PackageReference Include="System.Drawing.Common">
128-
<Version>4.7.2</Version>
129-
</PackageReference>
35+
<Reference Update="System.Windows.Forms">
36+
<Private>False</Private>
37+
</Reference>
13038
</ItemGroup>
131-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
39+
13240
</Project>

0 commit comments

Comments
 (0)