diff --git a/.gitignore b/.gitignore index 0e406a5..ad86be5 100644 --- a/.gitignore +++ b/.gitignore @@ -190,4 +190,6 @@ FakesAssemblies/ # LightSwitch generated files GeneratedArtifacts/ _Pvt_Extensions/ -ModelManifest.xml \ No newline at end of file +ModelManifest.xml + +.vs diff --git a/FRC-Extension.sln b/FRC-Extension.sln index 4379a6f..e3e3171 100644 --- a/FRC-Extension.sln +++ b/FRC-Extension.sln @@ -1,13 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 +# Visual Studio 15 +VisualStudioVersion = 15.0.27004.2009 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRC-Extension", "FRC-Extension\FRC-Extension.csproj", "{D68E4367-9381-4140-B090-7445E4BD3073}" - ProjectSection(ProjectDependencies) = postProject - {F6724218-0C31-4428-A217-B4318E3026B2} = {F6724218-0C31-4428-A217-B4318E3026B2} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Templates", "Templates", "{B9F75D30-BCEA-499B-AC12-2A89253CAD51}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharp", "CSharp", "{9F7C36BB-948A-402D-BAB2-6FEBECC792EC}" @@ -18,6 +13,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Commands", "Commands", "{BE EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectTemplates", "ProjectTemplates", "{B6DC656B-5E9A-4230-BD9E-A52B134BD0B5}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic", "{1DC75549-19D8-4430-9219-D6A5E5208461}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectTemplates", "ProjectTemplates", "{820D222D-AE85-4C05-9C06-8EF43458FF0E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRC-Extension", "FRC-Extension\FRC-Extension.csproj", "{D68E4367-9381-4140-B090-7445E4BD3073}" + ProjectSection(ProjectDependencies) = postProject + {F6724218-0C31-4428-A217-B4318E3026B2} = {F6724218-0C31-4428-A217-B4318E3026B2} + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandRobot", "Templates\CSharp\Project-Templates\CommandRobot\CommandRobot.csproj", "{C8E54708-3CD1-426B-9A89-9CDE8BED7845}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IterativeRobot", "Templates\CSharp\Project-Templates\IterativeRobot\IterativeRobot.csproj", "{67898DB3-7BF6-4654-A9EA-B7AE87385E88}" @@ -44,10 +48,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LabVIEWRobot", "Templates\C EndProject Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "IterativeRobotVB", "Templates\VisualBasic\Project-Templates\IterativeRobotVB\IterativeRobotVB.vbproj", "{F6724218-0C31-4428-A217-B4318E3026B2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VisualBasic", "VisualBasic", "{1DC75549-19D8-4430-9219-D6A5E5208461}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ProjectTemplates", "ProjectTemplates", "{820D222D-AE85-4C05-9C06-8EF43458FF0E}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -177,6 +177,8 @@ Global {B4F71629-51D2-4DB7-9122-55A872235A47} = {9F7C36BB-948A-402D-BAB2-6FEBECC792EC} {BEC57D35-61CB-496A-BB37-85DD187880DF} = {B4F71629-51D2-4DB7-9122-55A872235A47} {B6DC656B-5E9A-4230-BD9E-A52B134BD0B5} = {9F7C36BB-948A-402D-BAB2-6FEBECC792EC} + {1DC75549-19D8-4430-9219-D6A5E5208461} = {B9F75D30-BCEA-499B-AC12-2A89253CAD51} + {820D222D-AE85-4C05-9C06-8EF43458FF0E} = {1DC75549-19D8-4430-9219-D6A5E5208461} {C8E54708-3CD1-426B-9A89-9CDE8BED7845} = {B6DC656B-5E9A-4230-BD9E-A52B134BD0B5} {67898DB3-7BF6-4654-A9EA-B7AE87385E88} = {B6DC656B-5E9A-4230-BD9E-A52B134BD0B5} {D92655E3-184C-407A-9E08-95F40898C16B} = {B6DC656B-5E9A-4230-BD9E-A52B134BD0B5} @@ -190,7 +192,8 @@ Global {E2A270CB-4CC1-41E8-8AB1-B643B6F818A4} = {B6DC656B-5E9A-4230-BD9E-A52B134BD0B5} {D9803506-1439-43BB-B553-62DB3841B6F9} = {B6DC656B-5E9A-4230-BD9E-A52B134BD0B5} {F6724218-0C31-4428-A217-B4318E3026B2} = {820D222D-AE85-4C05-9C06-8EF43458FF0E} - {1DC75549-19D8-4430-9219-D6A5E5208461} = {B9F75D30-BCEA-499B-AC12-2A89253CAD51} - {820D222D-AE85-4C05-9C06-8EF43458FF0E} = {1DC75549-19D8-4430-9219-D6A5E5208461} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {96F3D081-AE8A-49A6-82FE-9FE416F6FA09} EndGlobalSection EndGlobal diff --git a/FRC-Extension/FRC-Extension.csproj b/FRC-Extension/FRC-Extension.csproj index a43e53f..5f1f428 100644 --- a/FRC-Extension/FRC-Extension.csproj +++ b/FRC-Extension/FRC-Extension.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 12.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) @@ -9,6 +9,7 @@ 12.0 + false publish\ true Disk @@ -21,7 +22,6 @@ true 0 1.0.0.%2a - false false true @@ -68,8 +68,8 @@ True - - ..\packages\VSSDK.GraphModel.11.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll + + ..\packages\VSSDK.GraphModel.12.0.4\lib\net45\Microsoft.VisualStudio.GraphModel.dll False @@ -112,7 +112,7 @@ False - ..\packages\VSSDK.TemplateWizardInterface.9.0.4\lib\net20\Microsoft.VisualStudio.TemplateWizardInterface.dll + ..\packages\VSSDK.TemplateWizardInterface.12.0.4\lib\net20\Microsoft.VisualStudio.TemplateWizardInterface.dll True False @@ -132,9 +132,8 @@ - - ..\packages\SSH.NET.2016.0.0\lib\net40\Renci.SshNet.dll - True + + ..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll diff --git a/FRC-Extension/FRC-Extension.csproj.user b/FRC-Extension/FRC-Extension.csproj.user index f13c2b6..662f62f 100644 --- a/FRC-Extension/FRC-Extension.csproj.user +++ b/FRC-Extension/FRC-Extension.csproj.user @@ -12,5 +12,13 @@ ProjectFiles + + + + + + + en-US + false \ No newline at end of file diff --git a/FRC-Extension/Resources.Designer.cs b/FRC-Extension/Resources.Designer.cs index efbc25f..4b753ab 100644 --- a/FRC-Extension/Resources.Designer.cs +++ b/FRC-Extension/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace RobotDotNet.FRC_Extension { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { diff --git a/FRC-Extension/packages.config b/FRC-Extension/packages.config index 5a32962..94ac477 100644 --- a/FRC-Extension/packages.config +++ b/FRC-Extension/packages.config @@ -1,8 +1,8 @@  - + - + @@ -17,7 +17,7 @@ - + diff --git a/FRC-Extension/source.extension.vsixmanifest b/FRC-Extension/source.extension.vsixmanifest index f155580..4213717 100644 --- a/FRC-Extension/source.extension.vsixmanifest +++ b/FRC-Extension/source.extension.vsixmanifest @@ -1,35 +1,39 @@ - - - FRC Extension - A plugin for deploying DotNet code onto FRC Robots. Includes an Extension and Templates. - LICENSE.txt - FIRST FRC RoboRIO WPILib - - - - - - - - - - - - - - - - - - - - - - - - - - + + + FRC Extension + A plugin for deploying DotNet code onto FRC Robots. Includes an Extension and Templates. + LICENSE.txt + FIRST FRC RoboRIO WPILib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Templates/CSharp/Item-Templates/Commands/Command/Command.csproj b/Templates/CSharp/Item-Templates/Commands/Command/Command.csproj index 9a49aff..aa75bc6 100644 --- a/Templates/CSharp/Item-Templates/Commands/Command/Command.csproj +++ b/Templates/CSharp/Item-Templates/Commands/Command/Command.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Item-Templates/Commands/CommandGroup/CommandGroup.csproj b/Templates/CSharp/Item-Templates/Commands/CommandGroup/CommandGroup.csproj index 2a8aba9..dec3a0c 100644 --- a/Templates/CSharp/Item-Templates/Commands/CommandGroup/CommandGroup.csproj +++ b/Templates/CSharp/Item-Templates/Commands/CommandGroup/CommandGroup.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Item-Templates/Commands/PIDSubsystem/PIDSubsystem.csproj b/Templates/CSharp/Item-Templates/Commands/PIDSubsystem/PIDSubsystem.csproj index 728331f..0ce438a 100644 --- a/Templates/CSharp/Item-Templates/Commands/PIDSubsystem/PIDSubsystem.csproj +++ b/Templates/CSharp/Item-Templates/Commands/PIDSubsystem/PIDSubsystem.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Item-Templates/Commands/Subsystem/Subsystem.csproj b/Templates/CSharp/Item-Templates/Commands/Subsystem/Subsystem.csproj index 3ee1102..df65393 100644 --- a/Templates/CSharp/Item-Templates/Commands/Subsystem/Subsystem.csproj +++ b/Templates/CSharp/Item-Templates/Commands/Subsystem/Subsystem.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Item-Templates/Commands/Trigger/Trigger.csproj b/Templates/CSharp/Item-Templates/Commands/Trigger/Trigger.csproj index fec93f8..21cacd6 100644 --- a/Templates/CSharp/Item-Templates/Commands/Trigger/Trigger.csproj +++ b/Templates/CSharp/Item-Templates/Commands/Trigger/Trigger.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Item-Templates/SingleInstanceClass/SingletonClass.csproj b/Templates/CSharp/Item-Templates/SingleInstanceClass/SingletonClass.csproj index ba28724..b48d118 100644 --- a/Templates/CSharp/Item-Templates/SingleInstanceClass/SingletonClass.csproj +++ b/Templates/CSharp/Item-Templates/SingleInstanceClass/SingletonClass.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Item-Templates/WPILibClass/WPILibClass.csproj b/Templates/CSharp/Item-Templates/WPILibClass/WPILibClass.csproj index 8f2304a..faf0af9 100644 --- a/Templates/CSharp/Item-Templates/WPILibClass/WPILibClass.csproj +++ b/Templates/CSharp/Item-Templates/WPILibClass/WPILibClass.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Project-Templates/AttributedCommandRobot/AttributedCommandRobot.csproj b/Templates/CSharp/Project-Templates/AttributedCommandRobot/AttributedCommandRobot.csproj index 73370e9..ec796eb 100644 --- a/Templates/CSharp/Project-Templates/AttributedCommandRobot/AttributedCommandRobot.csproj +++ b/Templates/CSharp/Project-Templates/AttributedCommandRobot/AttributedCommandRobot.csproj @@ -1,13 +1,14 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) 14.0 - + + publish\ true Disk diff --git a/Templates/CSharp/Project-Templates/CommandRobot/CommandRobot.csproj b/Templates/CSharp/Project-Templates/CommandRobot/CommandRobot.csproj index 9351cad..cc56252 100644 --- a/Templates/CSharp/Project-Templates/CommandRobot/CommandRobot.csproj +++ b/Templates/CSharp/Project-Templates/CommandRobot/CommandRobot.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Project-Templates/IterativeRobot/IterativeRobot.csproj b/Templates/CSharp/Project-Templates/IterativeRobot/IterativeRobot.csproj index a08238e..a9e6165 100644 --- a/Templates/CSharp/Project-Templates/IterativeRobot/IterativeRobot.csproj +++ b/Templates/CSharp/Project-Templates/IterativeRobot/IterativeRobot.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/CSharp/Project-Templates/LabVIEWRobot/LabVIEWRobot.csproj b/Templates/CSharp/Project-Templates/LabVIEWRobot/LabVIEWRobot.csproj index d9102e7..582210f 100644 --- a/Templates/CSharp/Project-Templates/LabVIEWRobot/LabVIEWRobot.csproj +++ b/Templates/CSharp/Project-Templates/LabVIEWRobot/LabVIEWRobot.csproj @@ -1,12 +1,13 @@  - 14.0 + 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) 14.0 - + + publish\ true Disk diff --git a/Templates/CSharp/Project-Templates/SampleRobot/SampleRobot.csproj b/Templates/CSharp/Project-Templates/SampleRobot/SampleRobot.csproj index 87f02f9..c64be42 100644 --- a/Templates/CSharp/Project-Templates/SampleRobot/SampleRobot.csproj +++ b/Templates/CSharp/Project-Templates/SampleRobot/SampleRobot.csproj @@ -1,7 +1,7 @@  - 14.0 + 15.0 11.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) diff --git a/Templates/VisualBasic/Project-Templates/IterativeRobotVB/IterativeRobotVB.vbproj b/Templates/VisualBasic/Project-Templates/IterativeRobotVB/IterativeRobotVB.vbproj index ae56857..4a460ed 100644 --- a/Templates/VisualBasic/Project-Templates/IterativeRobotVB/IterativeRobotVB.vbproj +++ b/Templates/VisualBasic/Project-Templates/IterativeRobotVB/IterativeRobotVB.vbproj @@ -1,12 +1,13 @@  - 14.0 + 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) 14.0 - + + publish\ true Disk