Skip to content

Commit

Permalink
update csproj hints
Browse files Browse the repository at this point in the history
  • Loading branch information
@meee1
meee1 committed Dec 19, 2013
1 parent 36a949f commit 0e5a433
Show file tree
Hide file tree
Showing 731 changed files with 887,077 additions and 101 deletions.
2 changes: 0 additions & 2 deletions 3DRRadio/3DRRadio.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,9 @@
<ItemGroup>
<Compile Include="..\Arduino\ArduinoSTK.cs">
<Link>Linked\ArduinoSTK.cs</Link>
<SubType>Component</SubType>
</Compile>
<Compile Include="..\Arduino\ArduinoSTKv2.cs">
<Link>Linked\ArduinoSTKv2.cs</Link>
<SubType>Component</SubType>
</Compile>
<Compile Include="..\Arduino\IArduinoComms.cs">
<Link>Linked\IArduinoComms.cs</Link>
Expand Down
17 changes: 17 additions & 0 deletions ArdupilotMega.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MissionPlanner", "MissionPlanner.csproj", "{A2E22272-95FE-47B6-B050-9AE7E2055BF5}"
ProjectSection(ProjectDependencies) = postProject
{825E7A10-390C-4A2B-B3A8-491D14966912} = {825E7A10-390C-4A2B-B3A8-491D14966912}
{ABB32A29-AF50-47FA-B243-5FD75A5ABA54} = {ABB32A29-AF50-47FA-B243-5FD75A5ABA54}
{20296734-5F3C-4593-A0D5-DD20B440B13A} = {20296734-5F3C-4593-A0D5-DD20B440B13A}
{E64A1A41-A5B0-458E-8284-BB63705354DA} = {E64A1A41-A5B0-458E-8284-BB63705354DA}
{53F12A60-E9CC-44BC-8366-1AE3AB2B547D} = {53F12A60-E9CC-44BC-8366-1AE3AB2B547D}
{2541686B-1673-43BF-AF89-3163945DB009} = {2541686B-1673-43BF-AF89-3163945DB009}
{B46F6C6C-9184-41AF-8F8B-E0084752CA7C} = {B46F6C6C-9184-41AF-8F8B-E0084752CA7C}
{1378A66C-38E4-46F5-A05F-DC04EF7D4D16} = {1378A66C-38E4-46F5-A05F-DC04EF7D4D16}
{59129078-7B12-4198-B93E-0AA08D0BB7ED} = {59129078-7B12-4198-B93E-0AA08D0BB7ED}
{B1538F7F-C82B-4678-9397-880F92848BFB} = {B1538F7F-C82B-4678-9397-880F92848BFB}
{A625BE88-0000-0000-0000-000000000000} = {A625BE88-0000-0000-0000-000000000000}
{76374F95-C343-4ACC-B86F-7ECFDD668F46} = {76374F95-C343-4ACC-B86F-7ECFDD668F46}
{C8B88795-6D01-494D-83AD-6944BD4C5023} = {C8B88795-6D01-494D-83AD-6944BD4C5023}
{29976BA4-A04D-4A80-A866-098C879C2FDE} = {29976BA4-A04D-4A80-A866-098C879C2FDE}
{9CA367B8-0B98-49D1-84FB-735E612E3BA9} = {9CA367B8-0B98-49D1-84FB-735E612E3BA9}
{7F7994CE-823F-4A04-BBEA-D0A3808FF56D} = {7F7994CE-823F-4A04-BBEA-D0A3808FF56D}
{2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4} = {2A8E8AF5-74E7-49DB-A42E-9360FA7A6CC4}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Updater", "Updater\Updater.csproj", "{E64A1A41-A5B0-458E-8284-BB63705354DA}"
Expand Down Expand Up @@ -40,6 +53,10 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluginTest", "Plugins\PluginTest.csproj", "{9EB725D8-B6C2-4BB3-9937-8881BC35DAC8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MissionPlanner.Utilities", "ExtLibs\Utilities\MissionPlanner.Utilities.csproj", "{1378A66C-38E4-46F5-A05F-DC04EF7D4D16}"
ProjectSection(ProjectDependencies) = postProject
{825E7A10-390C-4A2B-B3A8-491D14966912} = {825E7A10-390C-4A2B-B3A8-491D14966912}
{C8B88795-6D01-494D-83AD-6944BD4C5023} = {C8B88795-6D01-494D-83AD-6944BD4C5023}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MissionPlanner.Grid", "ExtLibs\Grid\MissionPlanner.Grid.csproj", "{A01404DF-CB52-4CCC-AD17-0F815D533D98}"
EndProject
Expand Down
4 changes: 2 additions & 2 deletions ExtLibs/Controls/MissionPlanner.Controls.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@
<ItemGroup>
<Reference Include="GMap.NET.Core, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Desktop\DIYDrones\greatmaps_09991dd06609\Demo.WindowsForms\bin\Debug\GMap.NET.Core.dll</HintPath>
<HintPath>..\..\Lib\GMap.NET.Core.dll</HintPath>
</Reference>
<Reference Include="GMap.NET.WindowsForms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Desktop\DIYDrones\greatmaps_09991dd06609\Demo.WindowsForms\bin\Debug\GMap.NET.WindowsForms.dll</HintPath>
<HintPath>..\..\Lib\GMap.NET.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\Lib\log4net.dll</HintPath>
Expand Down
7 changes: 5 additions & 2 deletions ExtLibs/Controls/ProgressReporterDialogue.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ private void RunBackgroundOperation(object o)
this.Invoke((MethodInvoker)delegate
{
// if this windows isnt the current active windows, popups inherit the wrong parent.
this.Focus();
Application.DoEvents();
if (!this.Focused)
{
this.Focus();
Application.DoEvents();
}
});
}
catch { Running = false; return; }
Expand Down
2 changes: 1 addition & 1 deletion ExtLibs/CsAssortedWidgets/CsAssortedWidgets.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<ItemGroup>
<Reference Include="OpenTK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Documents\Visual Studio 2010\Projects\ArdupilotMega\ArdupilotMega\bin\Debug\OpenTK.dll</HintPath>
<HintPath>..\..\Lib\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down
2 changes: 1 addition & 1 deletion ExtLibs/GLControl/OpenTK.GLControl.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@
<ItemGroup>
<Reference Include="OpenTK, Version=1.0.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\Documents\Visual Studio 2010\Projects\ArdupilotMega\ArdupilotMega\bin\Debug\OpenTK.dll</HintPath>
<HintPath>..\..\Lib\OpenTK.dll</HintPath>
</Reference>
<Reference Include="System">
<Name>System</Name>
Expand Down
4 changes: 2 additions & 2 deletions ExtLibs/Grid/MissionPlanner.Grid.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@
<Private>False</Private>
</Reference>
<Reference Include="GMap.NET.Core">
<HintPath>..\..\..\..\..\..\..\Desktop\DIYDrones\greatmaps_09991dd06609\Demo.WindowsForms\bin\Debug\GMap.NET.Core.dll</HintPath>
<HintPath>..\..\Lib\GMap.NET.Core.dll</HintPath>
</Reference>
<Reference Include="GMap.NET.WindowsForms">
<HintPath>..\..\..\..\..\..\..\Desktop\DIYDrones\greatmaps_09991dd06609\Demo.WindowsForms\bin\Debug\GMap.NET.WindowsForms.dll</HintPath>
<HintPath>..\..\Lib\GMap.NET.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=1.2.11.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
Expand Down
2 changes: 1 addition & 1 deletion ExtLibs/MissionPlanner.Stats/MissionPlanner.Stats.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ItemGroup>
<Reference Include="GMap.NET.Core, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Desktop\DIYDrones\greatmaps_09991dd06609\Demo.WindowsForms\bin\Debug\GMap.NET.Core.dll</HintPath>
<HintPath>..\..\Lib\GMap.NET.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion ExtLibs/TrackerHome/TrackerHomeGPS.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<ItemGroup>
<Reference Include="GMap.NET.Core, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Desktop\DIYDrones\greatmaps_09991dd06609\Demo.WindowsForms\bin\Debug\GMap.NET.Core.dll</HintPath>
<HintPath>..\..\Lib\GMap.NET.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
4 changes: 2 additions & 2 deletions ExtLibs/Utilities/MissionPlanner.Utilities.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@
</Reference>
<Reference Include="GMap.NET.Core, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Desktop\DIYDrones\greatmaps_09991dd06609\Demo.WindowsForms\bin\Debug\GMap.NET.Core.dll</HintPath>
<HintPath>..\..\Lib\GMap.NET.Core.dll</HintPath>
</Reference>
<Reference Include="GMap.NET.WindowsForms, Version=1.7.0.0, Culture=neutral, PublicKeyToken=b85b9027b614afef, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\..\..\Desktop\DIYDrones\greatmaps_09991dd06609\Demo.WindowsForms\bin\Debug\GMap.NET.WindowsForms.dll</HintPath>
<HintPath>..\..\Lib\GMap.NET.WindowsForms.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\..\Lib\ICSharpCode.SharpZipLib.dll</HintPath>
Expand Down
115 changes: 31 additions & 84 deletions MissionPlanner.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,12 +271,8 @@
</Compile>
<Compile Include="Arduino\IArduinoComms.cs" />
<Compile Include="Arduino\BoardDetect.cs" />
<Compile Include="Arduino\ArduinoSTK.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Arduino\ArduinoSTKv2.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="Arduino\ArduinoSTK.cs" />
<Compile Include="Arduino\ArduinoSTKv2.cs" />
<Compile Include="CodeGen.cs" />
<Compile Include="Comms\CommsSerialScan.cs" />
<Compile Include="Controls\ConfigPanel.cs">
Expand Down Expand Up @@ -352,9 +348,7 @@
<Compile Include="GCSViews\ConfigurationView\ConfigCameraStab.Designer.cs">
<DependentUpon>ConfigCameraStab.cs</DependentUpon>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigFrameType.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigFrameType.cs" />
<Compile Include="GCSViews\ConfigurationView\ConfigFrameType.Designer.cs">
<DependentUpon>ConfigFrameType.cs</DependentUpon>
</Compile>
Expand All @@ -370,9 +364,7 @@
<Compile Include="GCSViews\ConfigurationView\ConfigOptional.Designer.cs">
<DependentUpon>ConfigOptional.cs</DependentUpon>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigSimplePids.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigSimplePids.cs" />
<Compile Include="GCSViews\ConfigurationView\ConfigSimplePids.Designer.cs">
<DependentUpon>ConfigSimplePids.cs</DependentUpon>
</Compile>
Expand Down Expand Up @@ -412,15 +404,11 @@
<Compile Include="GCSViews\ConfigurationView\ConfigHelp.Designer.cs">
<DependentUpon>ConfigHelp.cs</DependentUpon>
</Compile>
<Compile Include="GCSViews\InitialSetup.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\InitialSetup.cs" />
<Compile Include="GCSViews\InitialSetup.Designer.cs">
<DependentUpon>InitialSetup.cs</DependentUpon>
</Compile>
<Compile Include="GCSViews\SoftwareConfig.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\SoftwareConfig.cs" />
<Compile Include="GCSViews\SoftwareConfig.Designer.cs">
<DependentUpon>SoftwareConfig.cs</DependentUpon>
</Compile>
Expand Down Expand Up @@ -520,98 +508,71 @@
<None Include="flightgear.zip">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="MissionPlanner.sh">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<Compile Include="Utilities\ParamFile.cs" />
<Compile Include="Utilities\Password.cs" />
<Compile Include="Utilities\StringRedirectWriter.cs" />
<Compile Include="Utilities\Update.cs" />
<Compile Include="Wizard\1Intro.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\1Intro.cs" />
<Compile Include="Wizard\1Intro.Designer.cs">
<DependentUpon>1Intro.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\2FrameFW.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\2FrameFW.cs" />
<Compile Include="Wizard\2FrameFW.Designer.cs">
<DependentUpon>2FrameFW.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\3ConnectAP.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\3ConnectAP.cs" />
<Compile Include="Wizard\3ConnectAP.Designer.cs">
<DependentUpon>3ConnectAP.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\4FrameType.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\4FrameType.cs" />
<Compile Include="Wizard\4FrameType.Designer.cs">
<DependentUpon>4FrameType.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\5AccelCalib.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\5AccelCalib.cs" />
<Compile Include="Wizard\5AccelCalib.Designer.cs">
<DependentUpon>5AccelCalib.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\6CompassCalib.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\6CompassCalib.cs" />
<Compile Include="Wizard\6CompassCalib.Designer.cs">
<DependentUpon>6CompassCalib.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\7BatteryMonitor.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\7BatteryMonitor.cs" />
<Compile Include="Wizard\7BatteryMonitor.Designer.cs">
<DependentUpon>7BatteryMonitor.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\8OptionalItemsAC.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\8OptionalItemsAC.cs" />
<Compile Include="Wizard\8OptionalItemsAC.Designer.cs">
<DependentUpon>8OptionalItemsAC.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\8OptionalItemsAP.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\8OptionalItemsAP.cs" />
<Compile Include="Wizard\8OptionalItemsAP.Designer.cs">
<DependentUpon>8OptionalItemsAP.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\9RadioCalibration.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\9RadioCalibration.cs" />
<Compile Include="Wizard\9RadioCalibration.Designer.cs">
<DependentUpon>9RadioCalibration.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\10FlightModes.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\10FlightModes.cs" />
<Compile Include="Wizard\10FlightModes.Designer.cs">
<DependentUpon>10FlightModes.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\11Verify.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\11Verify.cs" />
<Compile Include="Wizard\11Verify.Designer.cs">
<DependentUpon>11Verify.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\12FailSafe.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\12FailSafe.cs" />
<Compile Include="Wizard\12FailSafe.Designer.cs">
<DependentUpon>12FailSafe.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\13GeoFence.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\13GeoFence.cs" />
<Compile Include="Wizard\13GeoFence.Designer.cs">
<DependentUpon>13GeoFence.cs</DependentUpon>
</Compile>
<Compile Include="Wizard\98DontForget.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="Wizard\98DontForget.cs" />
<Compile Include="Wizard\98DontForget.Designer.cs">
<DependentUpon>98DontForget.cs</DependentUpon>
</Compile>
Expand Down Expand Up @@ -951,9 +912,7 @@
<Compile Include="HIL\Hil.cs" />
<Compile Include="HIL\Wind.cs" />
<Compile Include="HIL\XPlane.cs" />
<Compile Include="OpenGLtest.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="OpenGLtest.cs" />
<Compile Include="OSDVideo.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -1141,15 +1100,11 @@
<Compile Include="RAW_Sensor.Designer.cs">
<DependentUpon>RAW_Sensor.cs</DependentUpon>
</Compile>
<Compile Include="GCSViews\Help.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\Help.cs" />
<Compile Include="GCSViews\Help.Designer.cs">
<DependentUpon>Help.cs</DependentUpon>
</Compile>
<Compile Include="GCSViews\Terminal.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\Terminal.cs" />
<Compile Include="GCSViews\Terminal.Designer.cs">
<DependentUpon>Terminal.cs</DependentUpon>
</Compile>
Expand All @@ -1159,18 +1114,10 @@
<Compile Include="MainV2.Designer.cs">
<DependentUpon>MainV2.cs</DependentUpon>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigFirmware.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\FlightData.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\FlightPlanner.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\Simulation.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="GCSViews\ConfigurationView\ConfigFirmware.cs" />
<Compile Include="GCSViews\FlightData.cs" />
<Compile Include="GCSViews\FlightPlanner.cs" />
<Compile Include="GCSViews\Simulation.cs" />
<Compile Include="GCSViews\Simulation.Designer.cs">
<DependentUpon>Simulation.cs</DependentUpon>
</Compile>
Expand Down
Binary file modified Msi/wix.exe
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.1.*")]
[assembly: AssemblyFileVersion("1.2.90")]
[assembly: AssemblyFileVersion("1.2.90.1")]
[assembly: NeutralResourcesLanguageAttribute("")]
2 changes: 2 additions & 0 deletions Readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ ensure you have an installed copy, and the source.
Please see the compile1.png to compile4.png
in the project properties set a "reference path" to the installed mp directory.

For Mono please install
sudo apt-get install mono-runtime libmono-system-windows-forms4.0-cil libmono-system-core4.0-cil libmono-winforms2.0-cil libmono-corlib2.0-cil libmono-system-management4.0-cil
Loading

0 comments on commit 0e5a433

Please sign in to comment.