Version 2.3

Updated license format, and added to extension Removed unnecessary references Removed OTA support (should only be done from the MAGE 2 Server)
cjvaughter · Oct 19, 2015 · d3f8dbc · d3f8dbc
1 parent 3c37b4b
commit d3f8dbc
Show file tree

Hide file tree

Showing 16 changed files with 170 additions and 117 deletions.
diff --git a/extension/GlobalSuppressions.cs b/extension/GlobalSuppressions.cs
@@ -1,4 +1,8 @@
-// Copyright 2015 Oklahoma State University
+//**************************************************************************
+// Description: mageload Atmel Studio extension
+// Author: CJ Vaughter
+//**************************************************************************
+// Copyright 2015 Oklahoma State University
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,6 +15,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//**************************************************************************
 
 
 // This file is used by Code Analysis to maintain SuppressMessage

diff --git a/extension/Guids.cs b/extension/Guids.cs
@@ -1,4 +1,8 @@
-// Copyright 2015 Oklahoma State University
+//**************************************************************************
+// Description: mageload Atmel Studio extension
+// Author: CJ Vaughter
+//**************************************************************************
+// Copyright 2015 Oklahoma State University
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,6 +15,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//**************************************************************************
 
 // Guids.cs
 // MUST match guids.h

diff --git a/extension/PkgCmdID.cs b/extension/PkgCmdID.cs
@@ -1,4 +1,8 @@
-// Copyright 2015 Oklahoma State University
+//**************************************************************************
+// Description: mageload Atmel Studio extension
+// Author: CJ Vaughter
+//**************************************************************************
+// Copyright 2015 Oklahoma State University
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,6 +15,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//**************************************************************************
 
 // PkgCmdID.cs
 // MUST match PkgCmdID.h

diff --git a/extension/Properties/AssemblyInfo.cs b/extension/Properties/AssemblyInfo.cs
@@ -29,8 +29,8 @@
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.3.0.0")]
+[assembly: AssemblyFileVersion("2.3.0.0")]
 
 
 
diff --git a/extension/extension.csproj b/extension/extension.csproj
@@ -49,23 +49,16 @@
     <Reference Include="Atmel.Studio.Toolchain.Interfaces, Version=6.2.0.0, Culture=neutral, PublicKeyToken=d264112969646cc9, processorArchitecture=MSIL" />
     <Reference Include="Atmel.Studio.Toolchain.Library, Version=6.2.0.0, Culture=neutral, PublicKeyToken=d264112969646cc9, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.VisualStudio.Debugger.Interop.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+    <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.14.0.DesignTime, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0">
       <EmbedInteropTypes>true</EmbedInteropTypes>
     </Reference>
@@ -162,6 +155,11 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="..\LICENSE">
+      <Link>LICENSE</Link>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -191,7 +189,7 @@
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup>
-    <PostBuildEvent>if $(ConfigurationName) == Release ( echo f | xcopy.exe "$(TargetDir)mageload extension.vsix" $(ProjectDir)..\release\mageload-2.2.vsix  /Y /C )</PostBuildEvent>
+    <PostBuildEvent>if $(ConfigurationName) == Release ( echo f | xcopy.exe "$(TargetDir)mageload extension.vsix" $(ProjectDir)..\release\mageload-2.3.vsix  /Y /C )</PostBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/extension/extension.vsct b/extension/extension.vsct
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
+//**************************************************************************
+// Description: mageload Atmel Studio extension
+// Author: CJ Vaughter
+//**************************************************************************
 // Copyright 2015 Oklahoma State University
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +17,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//**************************************************************************
 -->
 
 <CommandTable xmlns="http://schemas.microsoft.com/VisualStudio/2005-10-18/CommandTable" xmlns:xs="http://www.w3.org/2001/XMLSchema">

diff --git a/extension/extensionPackage.cs b/extension/extensionPackage.cs
@@ -1,4 +1,8 @@
-// Copyright 2015 Oklahoma State University
+//**************************************************************************
+// Description: mageload Atmel Studio extension
+// Author: CJ Vaughter
+//**************************************************************************
+// Copyright 2015 Oklahoma State University
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,6 +15,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//**************************************************************************
 
 using System;
 using System.ComponentModel;
@@ -54,21 +59,22 @@ protected override void Initialize()
                 OleMenuCommand chooseport = new OleMenuCommand(ChoosePort, chooseportID);
                 chooseport.BeforeQueryStatus += button_BeforeQueryStatus;
                 mcs.AddCommand(chooseport);
-
-                IVsOutputWindow outputWindow = GetGlobalService(typeof(SVsOutputWindow)) as IVsOutputWindow;
-                if (outputWindow != null)
-                {
-                    IVsOutputWindowPane pane;
-                    outputWindow.CreatePane(VSConstants.OutputWindowPaneGuid.GeneralPane_guid, "mageload", 1, 0);
-                    outputWindow.GetPane(VSConstants.OutputWindowPaneGuid.GeneralPane_guid, out pane);
-                    Program.Pane = pane;
-                }
             }
-            _worker = new BackgroundWorker();
-            _worker.DoWork += DoDeploy;
 
             _dte = GetGlobalService(typeof(DTE)) as DTE;
             if (_dte != null) _dte.Commands.Item("Tools.Deploy").Bindings = "Global::F8";
+
+            IVsOutputWindow outputWindow = GetGlobalService(typeof(SVsOutputWindow)) as IVsOutputWindow;
+            if (outputWindow != null)
+            {
+                IVsOutputWindowPane pane;
+                outputWindow.CreatePane(VSConstants.OutputWindowPaneGuid.GeneralPane_guid, "mageload", 1, 0);
+                outputWindow.GetPane(VSConstants.OutputWindowPaneGuid.GeneralPane_guid, out pane);
+                Program.Pane = pane;
+            }
+
+            _worker = new BackgroundWorker();
+            _worker.DoWork += DoDeploy;
         }
 
         private void Deploy(object sender, EventArgs e)

diff --git a/extension/source.extension.vsixmanifest b/extension/source.extension.vsixmanifest
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="bb99eb3c-b0b5-450b-a131-9c08565f7ed8" Version="2.0" Language="en-US" Publisher="OSU ECE Department" />
+    <Identity Id="bb99eb3c-b0b5-450b-a131-9c08565f7ed8" Version="2.3" Language="en-US" Publisher="OSU ECE Department" />
     <DisplayName>mageload</DisplayName>
     <Description>Integrates mageload with Atmel Studio</Description>
     <MoreInfo>https://github.com/cjvaughter/mageload</MoreInfo>
+    <License>LICENSE</License>
     <Icon>Resources\mageload.ico</Icon>
   </Metadata>
   <Installation AllUsers="true">

diff --git a/mageload.sln b/mageload.sln
@@ -7,6 +7,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mageload", "mageload\magelo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "extension", "extension\extension.csproj", "{46EC26BD-9166-4697-BED5-4B06200695E2}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{43C0DF40-281E-4572-829E-2CEE3F39B05E}"
+	ProjectSection(SolutionItems) = preProject
+		LICENSE = LICENSE
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/mageload/PortWindow.Designer.cs b/mageload/PortWindow.Designer.cs
diff --git a/mageload/PortWindow.cs b/mageload/PortWindow.cs
@@ -1,4 +1,8 @@
-// Copyright 2015 Oklahoma State University
+//**************************************************************************
+// Description: mageload port selection window
+// Author: CJ Vaughter
+//**************************************************************************
+// Copyright 2015 Oklahoma State University
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -11,6 +15,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+//**************************************************************************
 
 using System;
 using System.IO.Ports;