Commit eca43953 eca43953fcfef48c6ce404b988e8384886bdb19d by Christian Gerdes

First release build

- added License.rtf
- changed icons
- changed name of button
- button shows info message of plugin
- does not support upgrades yet or multiple vs installs
1 parent de2f19f7
1 //------------------------------------------------------------------------------ 1 //------------------------------------------------------------------------------
2 // <copyright file="InfoCommand.cs" company="Company"> 2 // <copyright file="InfoCommand.cs" company="LIGHTS IN LINE AB">
3 // Copyright (c) Company. All rights reserved. 3 // Copyright (c) LIGHTS IN LINE AB. All rights reserved.
4 // </copyright> 4 // </copyright>
5 //------------------------------------------------------------------------------ 5 //------------------------------------------------------------------------------
6 6 /************************************************************************************************
7 * All code in this file is under the MS-RL License (https://opensource.org/licenses/MS-RL) *
8 * By using the code in this file in any way, you agree to the above license terms. *
9 * Copyright (C) LIGHTS IN LINE AB (https://www.lightsinline.se) *
10 * Repository, Wiki, Issue tracker and more at *
11 * https://git.lightsinline.se/lilchger/WebServicePlugins *
12 * *
13 * Contributors *
14 * LIGHTS IN LINE AB *
15 * SWEDBANK AB *
16 * SKATTEVERKET *
17 ************************************************************************************************/
7 using System; 18 using System;
8 using System.ComponentModel.Design; 19 using System.ComponentModel.Design;
9 using System.Globalization; 20 using System.Globalization;
...@@ -93,8 +104,8 @@ namespace WebTest.WebServive.Plugin ...@@ -93,8 +104,8 @@ namespace WebTest.WebServive.Plugin
93 /// <param name="e">Event args.</param> 104 /// <param name="e">Event args.</param>
94 private void MenuItemCallback(object sender, EventArgs e) 105 private void MenuItemCallback(object sender, EventArgs e)
95 { 106 {
96 string message = string.Format(CultureInfo.CurrentCulture, "Inside {0}.MenuItemCallback()", this.GetType().FullName); 107 string message = @"Repository, Wiki, Issues at https://git.lightsinline.se/lilchger/WebServicePlugins";
97 string title = "InfoCommand"; 108 string title = "WebService Plugin For WebTest version 1.0";
98 109
99 // Show a message box to prove we were here 110 // Show a message box to prove we were here
100 VsShellUtilities.ShowMessageBox( 111 VsShellUtilities.ShowMessageBox(
......
...@@ -57,6 +57,10 @@ ...@@ -57,6 +57,10 @@
57 </ItemGroup> 57 </ItemGroup>
58 <ItemGroup> 58 <ItemGroup>
59 <None Include="Key.snk" /> 59 <None Include="Key.snk" />
60 <Content Include="License.rtf">
61 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
62 <IncludeInVSIX>true</IncludeInVSIX>
63 </Content>
60 <None Include="packages.config" /> 64 <None Include="packages.config" />
61 <None Include="source.extension.vsixmanifest"> 65 <None Include="source.extension.vsixmanifest">
62 <SubType>Designer</SubType> 66 <SubType>Designer</SubType>
...@@ -65,7 +69,10 @@ ...@@ -65,7 +69,10 @@
65 <ItemGroup> 69 <ItemGroup>
66 <Content Include="index.html" /> 70 <Content Include="index.html" />
67 <Content Include="Resources\InfoCommand.png" /> 71 <Content Include="Resources\InfoCommand.png" />
68 <Content Include="Resources\WebServiceVSPackage.ico" /> 72 <Content Include="Resources\WebServiceVSPackage.ico">
73 <CopyToOutputDirectory>Always</CopyToOutputDirectory>
74 <IncludeInVSIX>true</IncludeInVSIX>
75 </Content>
69 <Content Include="stylesheet.css" /> 76 <Content Include="stylesheet.css" />
70 <VSCTCompile Include="WebServiceVSPackage.vsct"> 77 <VSCTCompile Include="WebServiceVSPackage.vsct">
71 <ResourceName>Menus.ctmenu</ResourceName> 78 <ResourceName>Menus.ctmenu</ResourceName>
......
1 //------------------------------------------------------------------------------ 1 //------------------------------------------------------------------------------
2 // <copyright file="WebServiceVSPackage.cs" company="Company"> 2 // <copyright file="WebServiceVSPackage.cs" company="LIGHTS IN LINE AB">
3 // Copyright (c) Company. All rights reserved. 3 // Copyright (c) LIGHTS IN LINE AB. All rights reserved.
4 // </copyright> 4 // </copyright>
5 //------------------------------------------------------------------------------ 5 //------------------------------------------------------------------------------
6 6 /************************************************************************************************
7 * All code in this file is under the MS-RL License (https://opensource.org/licenses/MS-RL) *
8 * By using the code in this file in any way, you agree to the above license terms. *
9 * Copyright (C) LIGHTS IN LINE AB (https://www.lightsinline.se) *
10 * Repository, Wiki, Issue tracker and more at *
11 * https://git.lightsinline.se/lilchger/WebServicePlugins *
12 * *
13 * Contributors *
14 * LIGHTS IN LINE AB *
15 * SWEDBANK AB *
16 * SKATTEVERKET *
17 ************************************************************************************************/
7 using System; 18 using System;
8 using System.ComponentModel.Design; 19 using System.ComponentModel.Design;
9 using System.Diagnostics; 20 using System.Diagnostics;
...@@ -124,10 +135,10 @@ namespace WebTest.WebServive.Plugin ...@@ -124,10 +135,10 @@ namespace WebTest.WebServive.Plugin
124 string runtimeLoc = new Uri(typeof(WebService.Plugin.Runtime.WebServicePlugin).Assembly.CodeBase).LocalPath; 135 string runtimeLoc = new Uri(typeof(WebService.Plugin.Runtime.WebServicePlugin).Assembly.CodeBase).LocalPath;
125 136
126 // Check if the old runtime was found in PublicAssemblies (old version installed there) 137 // Check if the old runtime was found in PublicAssemblies (old version installed there)
127 if (runtimeLoc.Contains("PublicAssemblies")) 138 if (runtimeLoc.Contains("PublicAssemblies") || runtimeLoc.Contains("MyAssemblies"))
128 { 139 {
129 // CONFLICT 140 // CONFLICT
130 VsShellUtilities.ShowMessageBox(this, "Previous version of the runtime dll was found in the PublicAssemblies folder. This version will conflict with this new version of the plugin. Please remove it and restart Visual Studio.\n\n Path to the DLL: " + runtimeLoc, 141 VsShellUtilities.ShowMessageBox(this, "Previous version of the runtime dll was found in the PublicAssemblies or MyAssemblies folder. This version will conflict with this new version of the plugin. Please remove it and restart Visual Studio.\n\n Path to the DLL: " + runtimeLoc,
131 "Conflicting previous version", OLEMSGICON.OLEMSGICON_CRITICAL, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST); 142 "Conflicting previous version", OLEMSGICON.OLEMSGICON_CRITICAL, OLEMSGBUTTON.OLEMSGBUTTON_OK, OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
132 return false; 143 return false;
133 } 144 }
......
...@@ -52,11 +52,11 @@ ...@@ -52,11 +52,11 @@
52 <CommandFlag>DefaultInvisible</CommandFlag> 52 <CommandFlag>DefaultInvisible</CommandFlag>
53 <CommandFlag>DynamicVisibility</CommandFlag> 53 <CommandFlag>DynamicVisibility</CommandFlag>
54 If you do not want an image next to your command, remove the Icon node /> --> 54 If you do not want an image next to your command, remove the Icon node /> -->
55 <Button guid="guidWebServiceVSPackageCmdSet" id="InfoCommandId" priority="0x0100" type="Button"> 55 <Button guid="guidWebServiceVSPackageCmdSet" id="InfoCommandId" priority="0x0500" type="Button">
56 <Parent guid="guidWebServiceVSPackageCmdSet" id="MyMenuGroup" /> 56 <Parent guid="guidWebServiceVSPackageCmdSet" id="MyMenuGroup" />
57 <Icon guid="guidImages" id="bmpPic1" /> 57 <Icon guid="guidImages" id="bmpPicArrows" />
58 <Strings> 58 <Strings>
59 <ButtonText>Invoke InfoCommand</ButtonText> 59 <ButtonText>WebService Plugin For WebTest</ButtonText>
60 </Strings> 60 </Strings>
61 </Button> 61 </Button>
62 </Buttons> 62 </Buttons>
......
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
5 <DisplayName>WebService Plugin For WebTest</DisplayName> 5 <DisplayName>WebService Plugin For WebTest</DisplayName>
6 <Description xml:space="preserve">The WebService Plugin as a VSPackage. Based on the original CodePlex project.</Description> 6 <Description xml:space="preserve">The WebService Plugin as a VSPackage. Based on the original CodePlex project.</Description>
7 <MoreInfo>https://git.lightsinline.se/lilchger/WebServicePlugins</MoreInfo> 7 <MoreInfo>https://git.lightsinline.se/lilchger/WebServicePlugins</MoreInfo>
8 <License>License.rtf</License>
9 <Icon>Resources\WebServiceVSPackage.ico</Icon>
10 <Tags>LoadTest WebTest JSON REST SOAP WS</Tags>
8 </Metadata> 11 </Metadata>
9 <Installation> 12 <Installation>
10 <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" /> 13 <InstallationTarget Id="Microsoft.VisualStudio.Community" Version="[14.0]" />
......