Skip to content

Christian Gerdes / WebServicePlugins

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 922cf120 922cf1200607d1b1965b99fb30e997ecff895230 by Christian Gerdes
Options

First working version on vs2017. 

Removed the Setup project.
Added Yes/No to info msg box to open homepage
1 parent bc089045
Inline Side-by-side
Showing 8 changed files with 15 additions and 160 deletions
...@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServicePluginForWebTestR ...@@ -9,8 +9,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServicePluginForWebTestR
9 EndProject 9 EndProject
10 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServicePluginForWebTestRuntime", "WebTestWebServiceRuntime\WebServicePluginForWebTestRuntime.csproj", "{F9E36CFA-A657-4DD4-BD17-BA3D91EB469F}" 10 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServicePluginForWebTestRuntime", "WebTestWebServiceRuntime\WebServicePluginForWebTestRuntime.csproj", "{F9E36CFA-A657-4DD4-BD17-BA3D91EB469F}"
11 EndProject 11 EndProject
12 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WebServicePluginsSetup", "WebTestWebServiceSetup\WebServicePluginsSetup.wixproj", "{73ACCDA5-47C1-40C9-B63E-AFF657E046E4}"
13 EndProject
14 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServicePluginForWebTestResultTabVSIX", "WebServicePluginForWebTestResultTabVSIX\WebServicePluginForWebTestResultTabVSIX.csproj", "{63355892-39EF-4F97-84E0-C7CA616E0281}" 12 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServicePluginForWebTestResultTabVSIX", "WebServicePluginForWebTestResultTabVSIX\WebServicePluginForWebTestResultTabVSIX.csproj", "{63355892-39EF-4F97-84E0-C7CA616E0281}"
15 EndProject 13 EndProject
16 Global 14 Global
...@@ -53,16 +51,6 @@ Global ...@@ -53,16 +51,6 @@ Global
53 {F9E36CFA-A657-4DD4-BD17-BA3D91EB469F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU 51 {F9E36CFA-A657-4DD4-BD17-BA3D91EB469F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
54 {F9E36CFA-A657-4DD4-BD17-BA3D91EB469F}.Release|Mixed Platforms.Build.0 = Release|Any CPU 52 {F9E36CFA-A657-4DD4-BD17-BA3D91EB469F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
55 {F9E36CFA-A657-4DD4-BD17-BA3D91EB469F}.Release|x86.ActiveCfg = Release|Any CPU 53 {F9E36CFA-A657-4DD4-BD17-BA3D91EB469F}.Release|x86.ActiveCfg = Release|Any CPU
56 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Debug|Any CPU.ActiveCfg = Debug|x86
57 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
58 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Debug|Mixed Platforms.Build.0 = Debug|x86
59 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Debug|x86.ActiveCfg = Debug|x86
60 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Debug|x86.Build.0 = Debug|x86
61 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Release|Any CPU.ActiveCfg = Release|x86
62 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Release|Mixed Platforms.ActiveCfg = Release|x86
63 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Release|Mixed Platforms.Build.0 = Release|x86
64 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Release|x86.ActiveCfg = Release|x86
65 {73ACCDA5-47C1-40C9-B63E-AFF657E046E4}.Release|x86.Build.0 = Release|x86
66 {63355892-39EF-4F97-84E0-C7CA616E0281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 54 {63355892-39EF-4F97-84E0-C7CA616E0281}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67 {63355892-39EF-4F97-84E0-C7CA616E0281}.Debug|Any CPU.Build.0 = Debug|Any CPU 55 {63355892-39EF-4F97-84E0-C7CA616E0281}.Debug|Any CPU.Build.0 = Debug|Any CPU
68 {63355892-39EF-4F97-84E0-C7CA616E0281}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU 56 {63355892-39EF-4F97-84E0-C7CA616E0281}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
......
...@@ -105,24 +105,29 @@ namespace WebTest.WebServive.Plugin ...@@ -105,24 +105,29 @@ namespace WebTest.WebServive.Plugin
105 /// <param name="e">Event args.</param> 105 /// <param name="e">Event args.</param>
106 private void MenuItemCallback(object sender, EventArgs e) 106 private void MenuItemCallback(object sender, EventArgs e)
107 { 107 {
108 string message = @"Repository, Wiki, Issues at https://git.lightsinline.se/lilchger/WebServicePlugins"; 108 string homepage = "https://git.lightsinline.se/lilchger/WebServicePlugins";
109 string message = "Repository, Wiki, Issues at " + homepage + ".\n\nWanna go there now?";
109 string title = "WebService Plugin For WebTest version 1.0"; 110 string title = "WebService Plugin For WebTest version 1.0";
110 111
111 112
112 WebServiceVSPackage wsp = package as WebServiceVSPackage; 113 EnvDTE80.DTE2 dte = this.ServiceProvider.GetService(typeof(EnvDTE.DTE)) as EnvDTE80.DTE2;
113 EnvDTE80.DTE2 dte = wsp.GetDTE2();
114 LoadTestPackageExt wpe = dte.GetObject("Microsoft.VisualStudio.TestTools.LoadTesting.LoadTestPackageExt") as LoadTestPackageExt; 114 LoadTestPackageExt wpe = dte.GetObject("Microsoft.VisualStudio.TestTools.LoadTesting.LoadTestPackageExt") as LoadTestPackageExt;
115 115
116 if (wpe != null) title += " (loaded)"; else title += " (not loaded)"; 116 if (wpe != null) title += " (loaded)"; else title += " (not loaded)";
117 117
118 // Show a message box to prove we were here 118 // Show a message box to prove we were here
119 VsShellUtilities.ShowMessageBox( 119 int res = VsShellUtilities.ShowMessageBox(
120 this.ServiceProvider, 120 this.ServiceProvider,
121 message, 121 message,
122 title, 122 title,
123 OLEMSGICON.OLEMSGICON_INFO, 123 OLEMSGICON.OLEMSGICON_INFO,
124 OLEMSGBUTTON.OLEMSGBUTTON_OK, 124 OLEMSGBUTTON.OLEMSGBUTTON_YESNO,
125 OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST); 125 OLEMSGDEFBUTTON.OLEMSGDEFBUTTON_FIRST);
126
127 if(res == 6) // YES
128 {
129 VsShellUtilities.OpenBrowser(homepage);
130 }
126 } 131 }
127 } 132 }
128 } 133 }
......
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
146 </Reference> 146 </Reference>
147 <Reference Include="Microsoft.VisualStudio.QualityTools.LoadTestPackage, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 147 <Reference Include="Microsoft.VisualStudio.QualityTools.LoadTestPackage, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
148 <SpecificVersion>False</SpecificVersion> 148 <SpecificVersion>False</SpecificVersion>
149 <HintPath>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.QualityTools.LoadTestPackage.dll</HintPath> 149 <HintPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.QualityTools.LoadTestPackage.dll</HintPath>
150 </Reference> 150 </Reference>
151 <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 151 <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
152 <HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath> 152 <HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
......
...@@ -96,11 +96,6 @@ namespace WebTest.WebServive.Plugin ...@@ -96,11 +96,6 @@ namespace WebTest.WebServive.Plugin
96 96
97 } 97 }
98 98
99 public DTE2 GetDTE2()
100 {
101 return (DTE2)GetService(typeof(DTE));
102 }
103
104 protected override void Dispose(bool disposing) 99 protected override void Dispose(bool disposing)
105 { 100 {
106 if(_wsp_connect != null) 101 if(_wsp_connect != null)
......
...@@ -70,10 +70,9 @@ ...@@ -70,10 +70,9 @@
70 <EmbedInteropTypes>True</EmbedInteropTypes> 70 <EmbedInteropTypes>True</EmbedInteropTypes>
71 </Reference> 71 </Reference>
72 <Reference Include="Microsoft.VisualStudio.QualityTools.LoadTestFramework" /> 72 <Reference Include="Microsoft.VisualStudio.QualityTools.LoadTestFramework" />
73 <Reference Include="Microsoft.VisualStudio.QualityTools.LoadTestPackage"> 73 <Reference Include="Microsoft.VisualStudio.QualityTools.LoadTestPackage, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
74 <HintPath>C:\Program Files\Microsoft Visual Studio 11.0\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.QualityTools.LoadTestPackage.dll</HintPath> 74 <SpecificVersion>False</SpecificVersion>
75 <HintPath>C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.QualityTools.LoadTestPackage.dll</HintPath> 75 <HintPath>C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\PrivateAssemblies\Microsoft.VisualStudio.QualityTools.LoadTestPackage.dll</HintPath>
76 <Private>True</Private>
77 </Reference> 76 </Reference>
78 <Reference Include="Microsoft.VisualStudio.QualityTools.WebTestFramework" /> 77 <Reference Include="Microsoft.VisualStudio.QualityTools.WebTestFramework" />
79 <Reference Include="System" /> 78 <Reference Include="System" />
......
1 <?xml version="1.0" encoding="UTF-8"?>
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3
4 <Product Id="{289E27D1-0F89-4F1A-A2C7-9584091B9950}" Name="Web Test Plugin for Web Service Messages - VS 2012" Language="1033" Version="3.0.0.0" Manufacturer="Microsoft IT" UpgradeCode="{BF388820-5266-41AF-BFFE-DC183C37D624}">
5 <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
6 <Media Id="1" Cabinet="WebServicePlugins1.cab" EmbedCab="yes" />
7
8 <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
9
10 <Feature Id="ProductFeature" Title="Web Test Plugin for Web Service Messages" Level="1">
11 <ComponentRef Id="WebTestMessageEditor" />
12 <ComponentRef Id="WebTestResultTab" />
13 <ComponentRef Id="WebTestRuntime" />
14 </Feature>
15
16 <Property Id="VS2012INSTALLFOLDER" Secure="yes">
17 <RegistrySearch Id="VS2012InstallationFolderRegistrySearchId" Type="raw"
18 Root="HKLM" Key="SOFTWARE\Microsoft\VisualStudio\11.0" Name="InstallDir"></RegistrySearch>
19 </Property>
20
21 <Condition Message="Visual Studio 2012 not found.">
22 Installed OR VS2012INSTALLFOLDER
23 </Condition>
24 </Product>
25
26 <Fragment>
27 <Directory Id="TARGETDIR" Name="SourceDir">
28 <Directory Id="VS2012INSTALLFOLDER">
29 <Directory Id="PrivateAssemblies" Name="PrivateAssemblies">
30 <Directory Id="WebTestPlugins" Name="WebTestPlugins">
31 <Component Id="WebTestMessageEditor" Guid="{17E95CD2-6B83-46C9-AEE5-019853FF62EC}">
32 <File Source="$(var.WebServicePluginForWebTestMessageEditor.TargetPath)" Vital="yes" DiskId="1"/>
33 </Component>
34 </Directory>
35 </Directory>
36 <Directory Id="PublicAssemblies" Name="PublicAssemblies">
37 <Component Id="WebTestRuntime" Guid="{854C9BA4-3E3E-4D0A-9DB1-DFF8140E834C}">
38 <File Source="$(var.WebServicePluginForWebTestRuntime.TargetPath)" Vital="yes" DiskId="1"/>
39 </Component>
40 </Directory>
41 </Directory>
42
43 <Directory Id="AppDataFolder">
44 <Directory Id="MSAppDataDir" Name="Microsoft">
45 <Directory Id="VSAppDataDir" Name="VisualStudio">
46 <Directory Id="VSAppDataVersionDir" Name="11.0">
47 <Directory Id="VSAddins" Name="Addins">
48 <Component Id="WebTestResultTab" Guid="{27569640-6946-4E4F-8E55-109E99A79DB9}">
49 <RegistryValue KeyPath="yes" Root="HKCU" Key="SOFTWARE\Microsoft\WebServicePlugin" Name="Installed" Type="integer" Value="1" Action="write" />
50 <File Source="$(var.WebServicePluginForWebTestResultTab.TargetPath)" Vital="yes" DiskId="1"/>
51 <File Source="$(var.WebServicePluginForWebTestResultTab.ProjectDir)WebServicePluginForWebTestResultTab.Addin" Vital="yes" DiskId="1"/>
52 <RemoveFolder Id="RemoveMSAppDataDir" Directory="MSAppDataDir" On="uninstall"/>
53 <RemoveFolder Id="RemoveVSAppDataDir" Directory="VSAppDataDir" On="uninstall"/>
54 <RemoveFolder Id="RemoveVSAppDataVersionDir" Directory="VSAppDataVersionDir" On="uninstall"/>
55 <RemoveFolder Id="RemoveVSAddins" Directory="VSAddins" On="uninstall"/>
56 </Component>
57 </Directory>
58 </Directory>
59 </Directory>
60 </Directory>
61 </Directory>
62 </Directory>
63 </Fragment>
64 </Wix>
...\ No newline at end of file ...\ No newline at end of file
1 Install Wix Toolset to load installer project
2 http://wix.codeplex.com/
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="utf-8"?>
2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
6 <ProductVersion>3.6</ProductVersion>
7 <ProjectGuid>73accda5-47c1-40c9-b63e-aff657e046e4</ProjectGuid>
8 <SchemaVersion>2.0</SchemaVersion>
9 <OutputName>Setup</OutputName>
10 <OutputType>Package</OutputType>
11 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
12 <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
13 <Name>WebServicePluginsSetup</Name>
14 <SccProjectName>SAK</SccProjectName>
15 <SccLocalPath>SAK</SccLocalPath>
16 <SccAuxPath>SAK</SccAuxPath>
17 <SccProvider>SAK</SccProvider>
18 </PropertyGroup>
19 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
20 <OutputPath>bin\$(Configuration)\</OutputPath>
21 <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
22 <DefineConstants>Debug</DefineConstants>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
25 <OutputPath>bin\$(Configuration)\</OutputPath>
26 <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
27 </PropertyGroup>
28 <ItemGroup>
29 <Compile Include="Product.wxs" />
30 </ItemGroup>
31 <ItemGroup>
32 <ProjectReference Include="..\WebTestWebServiceMessageEditor\WebServicePluginForWebTestMessageEditor.csproj">
33 <Name>WebServicePluginForWebTestMessageEditor</Name>
34 <Project>{23707a49-589b-4a36-bdaa-2896e647d07d}</Project>
35 <Private>True</Private>
36 <DoNotHarvest>True</DoNotHarvest>
37 <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
38 <RefTargetDir>INSTALLFOLDER</RefTargetDir>
39 </ProjectReference>
40 <ProjectReference Include="..\WebTestWebServiceResultAddin\WebServicePluginForWebTestResultTab.csproj">
41 <Name>WebServicePluginForWebTestResultTab</Name>
42 <Project>{48b3509e-1fd8-4875-8fc6-137647eb83aa}</Project>
43 <Private>True</Private>
44 <DoNotHarvest>True</DoNotHarvest>
45 <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
46 <RefTargetDir>INSTALLFOLDER</RefTargetDir>
47 </ProjectReference>
48 <ProjectReference Include="..\WebTestWebServiceRuntime\WebServicePluginForWebTestRuntime.csproj">
49 <Name>WebServicePluginForWebTestRuntime</Name>
50 <Project>{f9e36cfa-a657-4dd4-bd17-ba3d91eb469f}</Project>
51 <Private>True</Private>
52 <DoNotHarvest>True</DoNotHarvest>
53 <RefProjectOutputGroups>Binaries;Content;Satellites</RefProjectOutputGroups>
54 <RefTargetDir>INSTALLFOLDER</RefTargetDir>
55 </ProjectReference>
56 </ItemGroup>
57 <Import Project="$(WixTargetsPath)" />
58 <!--
59 To modify your build process, add your task inside one of the targets below and uncomment it.
60 Other similar extension points exist, see Wix.targets.
61 <Target Name="BeforeBuild">
62 </Target>
63 <Target Name="AfterBuild">
64 </Target>
65 -->
66 </Project>
...\ No newline at end of file ...\ No newline at end of file