Changes the way the robot project is detected

ThadHouse · ThadHouse · commit 94d6e54795ed · 2015-12-10T21:45:32.000-08:00
As explained in #17, The old method of forcing the startup project to be the robot project was flawed. Instead we now have a flag in the csproj that the extension can use to be certain it is the robot project.
diff --git a/FRC-Extension/Buttons/DeployDebugButton.cs b/FRC-Extension/Buttons/DeployDebugButton.cs
@@ -14,6 +14,8 @@ public class DeployDebugButton : ButtonBase
         protected static bool s_deploying = false;
         protected static readonly List<OleMenuCommand> s_deployCommands = new List<OleMenuCommand>();
 
+        private Project m_robotProject = null;
+
         public DeployDebugButton(Frc_ExtensionPackage package, int pkgCmdIdOfButton, bool debug) : base(package, true, GuidList.guidFRC_ExtensionCmdSet, pkgCmdIdOfButton)
         {
             m_debugButton = debug;
@@ -59,7 +61,7 @@ public override async void ButtonCallback(object sender, EventArgs e)
                     //Disable the deploy buttons
                     DisableAllButtons();
                     DeployManager m = new DeployManager(m_package.PublicGetService(typeof(DTE)) as DTE);
-                    await m.DeployCode(teamNumber, page, m_debugButton);
+                    await m.DeployCode(teamNumber, page, m_debugButton, m_robotProject);
                     EnableAllButtons();
                     m_output.ProgressBarLabel = "Robot Code Deploy Successful";
                 }
@@ -79,32 +81,36 @@ public override void QueryCallback(object sender, EventArgs e)
             if (menuCommand != null)
             {
                 var dte = m_package.PublicGetService(typeof(DTE)) as DTE;
-                var sb = (SolutionBuild2)dte.Solution.SolutionBuild;
 
                 bool visable = false;
-                if (sb.StartupProjects != null)
+                m_robotProject = null;
+
+                foreach (Project project in dte.Solution.Projects)
                 {
-                    string project = ((Array)sb.StartupProjects).Cast<string>().First();
-                    Project startupProject = dte.Solution.Item(project);
-                    var vsproject = startupProject.Object as VSLangProj.VSProject;
-                    if (vsproject != null)
+                    if (project.Globals.VariableExists["RobotProject"])
                     {
-                        //If we are an assembly, and its named WPILib, enable the deploy
-                        if ((from Reference reference in vsproject.References where reference.SourceProject == null select reference.Name).Any(name => name.Contains("WPILib")))
+                        var vsproject = project.Object as VSLangProj.VSProject;
+
+                        if (vsproject != null)
                         {
-                            visable = true;
+                            //If we are an assembly, and its named WPILib, enable the deploy
+                            if ((from Reference reference in vsproject.References where reference.SourceProject == null select reference.Name).Any(name => name.Contains("WPILib")))
+                            {
+                                visable = true;
+                                m_robotProject = project;
+                                break;
+                            }
                         }
                     }
                 }
+
                 if (s_deploying)
                     visable = false;
 
                 menuCommand.Visible = visable;
                 if (menuCommand.Visible)
                 {
-                    bool enabled = ((Array)sb.StartupProjects).Cast<string>().Count() == 1;
-
-                    menuCommand.Enabled = enabled;
+                    menuCommand.Enabled = true;
                 }
             }
         }
diff --git a/FRC-Extension/RoboRIOCode/DeployManager.cs b/FRC-Extension/RoboRIOCode/DeployManager.cs
@@ -30,17 +30,23 @@ public DeployManager(DTE dte)
 
         
         //Uploads code to the robot and then runs it.
-        public async Task DeployCode(string teamNumber, SettingsPageGrid page, bool debug)
+        public async Task DeployCode(string teamNumber, SettingsPageGrid page, bool debug, Project robotProject)
         {
 
             var writer = OutputWriter.Instance;
 
+            if (robotProject == null)
+            {
+                writer.WriteLine("Robot Project not valid. Contact RobotDotNet for support.");
+                return;
+            }
+
             //Connect to Robot Async
             OutputWriter.Instance.WriteLine("Attempting to Connect to RoboRIO");
             Task<bool> rioConnectionTask = StartConnectionTask(teamNumber);
             Task delayTask = Task.Delay(10000);
 
-            CodeReturnStruct codeReturn = await BuildAndPrepareCode(debug);
+            CodeReturnStruct codeReturn = await BuildAndPrepareCode(debug, robotProject);
 
             if (codeReturn == null) return;
 
@@ -127,7 +133,7 @@ public CodeReturnStruct(string exe, List<string> files)
         }
 
 
-        public async Task<CodeReturnStruct> BuildAndPrepareCode(bool debug)
+        public async Task<CodeReturnStruct> BuildAndPrepareCode(bool debug, Project robotProject)
         {
 
             var writer = OutputWriter.Instance;
@@ -151,7 +157,8 @@ public async Task<CodeReturnStruct> BuildAndPrepareCode(bool debug)
             if (sb.LastBuildInfo == 0)
             {
                 writer.WriteLine("Successfully Built Robot Code");
-                string path = GetStartupAssemblyPath();
+                //string path = GetStartupAssemblyPath();
+                string path = GetAssemblyPath(robotProject);
                 string robotExe = Path.GetFileName(path);
                 string buildDir = Path.GetDirectoryName(path);
 
@@ -249,20 +256,6 @@ public async Task<bool> CheckRoboRioImage()
             }
         }
 
-        internal string GetStartupAssemblyPath()
-        {
-            Project startupProject = GetStartupProject();
-            return GetAssemblyPath(startupProject);
-        }
-
-        private Project GetStartupProject()
-        {
-            var sb = (SolutionBuild2)m_dte.Solution.SolutionBuild;
-            string project = ((Array)sb.StartupProjects).Cast<string>().First();
-            Project startupProject = m_dte.Solution.Item(project);
-            return startupProject;
-        }
-
         internal string GetAssemblyPath(Project vsProject)
         {
             string fullPath = vsProject.Properties.Item("FullPath").Value.ToString();
diff --git a/Templates/CSharp/Project-Templates/AttributedCommandRobot/ProjectTemplate.csproj b/Templates/CSharp/Project-Templates/AttributedCommandRobot/ProjectTemplate.csproj
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RobotProject="yes" />
+    </VisualStudio>
+  </ProjectExtensions>
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/Templates/CSharp/Project-Templates/CommandRobot/ProjectTemplate.csproj b/Templates/CSharp/Project-Templates/CommandRobot/ProjectTemplate.csproj
@@ -1,5 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RobotProject="yes" />
+    </VisualStudio>
+  </ProjectExtensions>
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/Templates/CSharp/Project-Templates/IterativeRobot/ProjectTemplate.csproj b/Templates/CSharp/Project-Templates/IterativeRobot/ProjectTemplate.csproj
@@ -1,5 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RobotProject="yes" />
+    </VisualStudio>
+  </ProjectExtensions>
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/Templates/CSharp/Project-Templates/LabVIEWRobot/ProjectTemplate.csproj b/Templates/CSharp/Project-Templates/LabVIEWRobot/ProjectTemplate.csproj
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RobotProject="yes" />
+    </VisualStudio>
+  </ProjectExtensions>
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/Templates/CSharp/Project-Templates/SampleRobot/ProjectTemplate.csproj b/Templates/CSharp/Project-Templates/SampleRobot/ProjectTemplate.csproj
@@ -1,5 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RobotProject="yes" />
+    </VisualStudio>
+  </ProjectExtensions>
 	<PropertyGroup>
 		<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
 		<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
diff --git a/Templates/VisualBasic/Project-Templates/IterativeRobotVB/ProjectTemplate.vbproj b/Templates/VisualBasic/Project-Templates/IterativeRobotVB/ProjectTemplate.vbproj
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties RobotProject="yes" />
+    </VisualStudio>
+  </ProjectExtensions>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@ public class DeployDebugButton : ButtonBase`
`14`	`14`	`protected static bool s_deploying = false;`
`15`	`15`	`protected static readonly List<OleMenuCommand> s_deployCommands = new List<OleMenuCommand>();`
`16`	`16`
	`17`	`+ private Project m_robotProject = null;`
	`18`	`+`
`17`	`19`	`public DeployDebugButton(Frc_ExtensionPackage package, int pkgCmdIdOfButton, bool debug) : base(package, true, GuidList.guidFRC_ExtensionCmdSet, pkgCmdIdOfButton)`
`18`	`20`	`{`
`19`	`21`	`m_debugButton = debug;`
`@@ -59,7 +61,7 @@ public override async void ButtonCallback(object sender, EventArgs e)`
`59`	`61`	`//Disable the deploy buttons`
`60`	`62`	`DisableAllButtons();`
`61`	`63`	`DeployManager m = new DeployManager(m_package.PublicGetService(typeof(DTE)) as DTE);`
`62`		`- await m.DeployCode(teamNumber, page, m_debugButton);`
	`64`	`+ await m.DeployCode(teamNumber, page, m_debugButton, m_robotProject);`
`63`	`65`	`EnableAllButtons();`
`64`	`66`	`m_output.ProgressBarLabel = "Robot Code Deploy Successful";`
`65`	`67`	`}`
`@@ -79,32 +81,36 @@ public override void QueryCallback(object sender, EventArgs e)`
`79`	`81`	`if (menuCommand != null)`
`80`	`82`	`{`
`81`	`83`	`var dte = m_package.PublicGetService(typeof(DTE)) as DTE;`
`82`		`- var sb = (SolutionBuild2)dte.Solution.SolutionBuild;`
`83`	`84`
`84`	`85`	`bool visable = false;`
`85`		`- if (sb.StartupProjects != null)`
	`86`	`+ m_robotProject = null;`
	`87`	`+`
	`88`	`+ foreach (Project project in dte.Solution.Projects)`
`86`	`89`	`{`
`87`		`- string project = ((Array)sb.StartupProjects).Cast<string>().First();`
`88`		`- Project startupProject = dte.Solution.Item(project);`
`89`		`- var vsproject = startupProject.Object as VSLangProj.VSProject;`
`90`		`- if (vsproject != null)`
	`90`	`+ if (project.Globals.VariableExists["RobotProject"])`
`91`	`91`	`{`
`92`		`- //If we are an assembly, and its named WPILib, enable the deploy`
`93`		`- if ((from Reference reference in vsproject.References where reference.SourceProject == null select reference.Name).Any(name => name.Contains("WPILib")))`
	`92`	`+ var vsproject = project.Object as VSLangProj.VSProject;`
	`93`	`+`
	`94`	`+ if (vsproject != null)`
`94`	`95`	`{`
`95`		`- visable = true;`
	`96`	`+ //If we are an assembly, and its named WPILib, enable the deploy`
	`97`	`+ if ((from Reference reference in vsproject.References where reference.SourceProject == null select reference.Name).Any(name => name.Contains("WPILib")))`
	`98`	`+ {`
	`99`	`+ visable = true;`
	`100`	`+ m_robotProject = project;`
	`101`	`+ break;`
	`102`	`+ }`
`96`	`103`	`}`
`97`	`104`	`}`
`98`	`105`	`}`
	`106`	`+`
`99`	`107`	`if (s_deploying)`
`100`	`108`	`visable = false;`
`101`	`109`
`102`	`110`	`menuCommand.Visible = visable;`
`103`	`111`	`if (menuCommand.Visible)`
`104`	`112`	`{`
`105`		`- bool enabled = ((Array)sb.StartupProjects).Cast<string>().Count() == 1;`
`106`		`-`
`107`		`- menuCommand.Enabled = enabled;`
	`113`	`+ menuCommand.Enabled = true;`
`108`	`114`	`}`
`109`	`115`	`}`
`110`	`116`	`}`