Commit 3798811b 3798811b8d2d6fb8c3e53db9e8997cee77c73f4d by Christian Gerdes

First upgrade to vs2017. Can build and now launches in the correct exp instance …

…after upgrade of nuget packages (and msbuild) to version 15.
1 parent 9b92fd48
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
5 *.suo 5 *.suo
6 # *.user 6 # *.user
7 *.sln.docstates 7 *.sln.docstates
8 .vs/
8 9
9 # Build results 10 # Build results
10 11
......
1  1 
2 Microsoft Visual Studio Solution File, Format Version 12.00 2 Microsoft Visual Studio Solution File, Format Version 12.00
3 # Visual Studio 14 3 # Visual Studio 15
4 VisualStudioVersion = 14.0.25420.1 4 VisualStudioVersion = 15.0.27004.2002
5 MinimumVisualStudioVersion = 10.0.40219.1 5 MinimumVisualStudioVersion = 10.0.40219.1
6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServicePluginForWebTestMessageEditor", "WebTestWebServiceMessageEditor\WebServicePluginForWebTestMessageEditor.csproj", "{23707A49-589B-4A36-BDAA-2896E647D07D}" 6 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebServicePluginForWebTestMessageEditor", "WebTestWebServiceMessageEditor\WebServicePluginForWebTestMessageEditor.csproj", "{23707A49-589B-4A36-BDAA-2896E647D07D}"
7 EndProject 7 EndProject
...@@ -79,4 +79,7 @@ Global ...@@ -79,4 +79,7 @@ Global
79 GlobalSection(SolutionProperties) = preSolution 79 GlobalSection(SolutionProperties) = preSolution
80 HideSolutionNode = FALSE 80 HideSolutionNode = FALSE
81 EndGlobalSection 81 EndGlobalSection
82 GlobalSection(ExtensibilityGlobals) = postSolution
83 SolutionGuid = {3406948A-A80F-48D3-96E7-33CA569DB57C}
84 EndGlobalSection
82 EndGlobal 85 EndGlobal
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" /> 3 <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" />
4 <PropertyGroup> 4 <PropertyGroup>
5 <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion> 5 <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
6 <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath> 6 <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
7 <NuGetPackageImportStamp> 7 <NuGetPackageImportStamp>
8 </NuGetPackageImportStamp> 8 </NuGetPackageImportStamp>
9 <UseCodebase>true</UseCodebase> 9 <UseCodebase>true</UseCodebase>
10 <FileUpgradeFlags>
11 </FileUpgradeFlags>
12 <UpgradeBackupLocation>
13 </UpgradeBackupLocation>
14 <OldToolsVersion>14.0</OldToolsVersion>
15 <PublishUrl>publish\</PublishUrl>
16 <Install>true</Install>
17 <InstallFrom>Disk</InstallFrom>
18 <UpdateEnabled>false</UpdateEnabled>
19 <UpdateMode>Foreground</UpdateMode>
20 <UpdateInterval>7</UpdateInterval>
21 <UpdateIntervalUnits>Days</UpdateIntervalUnits>
22 <UpdatePeriodically>false</UpdatePeriodically>
23 <UpdateRequired>false</UpdateRequired>
24 <MapFileExtensions>true</MapFileExtensions>
25 <ApplicationRevision>0</ApplicationRevision>
26 <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
27 <IsWebBootstrapper>false</IsWebBootstrapper>
28 <UseApplicationTrust>false</UseApplicationTrust>
29 <BootstrapperEnabled>true</BootstrapperEnabled>
30 <TargetFrameworkProfile />
10 </PropertyGroup> 31 </PropertyGroup>
11 <PropertyGroup> 32 <PropertyGroup>
12 <SignAssembly>true</SignAssembly> 33 <SignAssembly>true</SignAssembly>
...@@ -25,7 +46,7 @@ ...@@ -25,7 +46,7 @@
25 <AppDesignerFolder>Properties</AppDesignerFolder> 46 <AppDesignerFolder>Properties</AppDesignerFolder>
26 <RootNamespace>WebTest.WebServive.Plugin</RootNamespace> 47 <RootNamespace>WebTest.WebServive.Plugin</RootNamespace>
27 <AssemblyName>WebTest.WebServive.Plugin</AssemblyName> 48 <AssemblyName>WebTest.WebServive.Plugin</AssemblyName>
28 <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion> 49 <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
29 <GeneratePkgDefFile>true</GeneratePkgDefFile> 50 <GeneratePkgDefFile>true</GeneratePkgDefFile>
30 <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer> 51 <IncludeAssemblyInVSIXContainer>true</IncludeAssemblyInVSIXContainer>
31 <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer> 52 <IncludeDebugSymbolsInVSIXContainer>true</IncludeDebugSymbolsInVSIXContainer>
...@@ -41,6 +62,10 @@ ...@@ -41,6 +62,10 @@
41 <DefineConstants>DEBUG;TRACE</DefineConstants> 62 <DefineConstants>DEBUG;TRACE</DefineConstants>
42 <ErrorReport>prompt</ErrorReport> 63 <ErrorReport>prompt</ErrorReport>
43 <WarningLevel>4</WarningLevel> 64 <WarningLevel>4</WarningLevel>
65 <DeployExtension>True</DeployExtension>
66 <CopyVsixExtensionFiles>False</CopyVsixExtensionFiles>
67 <CopyVsixExtensionLocation>
68 </CopyVsixExtensionLocation>
44 </PropertyGroup> 69 </PropertyGroup>
45 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 70 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
46 <DebugType>pdbonly</DebugType> 71 <DebugType>pdbonly</DebugType>
...@@ -56,6 +81,7 @@ ...@@ -56,6 +81,7 @@
56 <Compile Include="WebServiceVSPackage.cs" /> 81 <Compile Include="WebServiceVSPackage.cs" />
57 </ItemGroup> 82 </ItemGroup>
58 <ItemGroup> 83 <ItemGroup>
84 <None Include="app.config" />
59 <None Include="Key.snk" /> 85 <None Include="Key.snk" />
60 <Content Include="License.rtf"> 86 <Content Include="License.rtf">
61 <IncludeInVSIX>true</IncludeInVSIX> 87 <IncludeInVSIX>true</IncludeInVSIX>
...@@ -106,32 +132,40 @@ ...@@ -106,32 +132,40 @@
106 <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 132 <Reference Include="Microsoft.VisualStudio.CommandBars, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
107 <EmbedInteropTypes>False</EmbedInteropTypes> 133 <EmbedInteropTypes>False</EmbedInteropTypes>
108 </Reference> 134 </Reference>
109 <Reference Include="Microsoft.VisualStudio.Imaging, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 135 <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
110 <HintPath>..\packages\Microsoft.VisualStudio.Imaging.14.3.25407\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath> 136 <HintPath>..\packages\Microsoft.VisualStudio.CoreUtility.15.4.27004\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
137 <Private>True</Private>
138 </Reference>
139 <Reference Include="Microsoft.VisualStudio.Imaging, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
140 <HintPath>..\packages\Microsoft.VisualStudio.Imaging.15.4.27004\lib\net45\Microsoft.VisualStudio.Imaging.dll</HintPath>
111 <Private>True</Private> 141 <Private>True</Private>
112 </Reference> 142 </Reference>
113 <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 143 <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
114 <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath> 144 <HintPath>..\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6071\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
115 <Private>True</Private> 145 <Private>True</Private>
116 </Reference> 146 </Reference>
117 <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 147 <Reference Include="Microsoft.VisualStudio.Shell.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
118 <HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath> 148 <HintPath>..\packages\Microsoft.VisualStudio.Shell.14.0.14.3.25407\lib\Microsoft.VisualStudio.Shell.14.0.dll</HintPath>
119 <Private>True</Private> 149 <Private>True</Private>
120 </Reference> 150 </Reference>
121 <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 151 <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
122 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.10.0.30319\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath> 152 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Framework.15.4.27004\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
153 <Private>True</Private>
154 </Reference>
155 <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
156 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.10.0.15.0.25414\lib\net40\Microsoft.VisualStudio.Shell.Immutable.10.0.dll</HintPath>
123 <Private>True</Private> 157 <Private>True</Private>
124 </Reference> 158 </Reference>
125 <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 159 <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
126 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.11.0.50727\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath> 160 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.11.0.15.0.25414\lib\net45\Microsoft.VisualStudio.Shell.Immutable.11.0.dll</HintPath>
127 <Private>True</Private> 161 <Private>True</Private>
128 </Reference> 162 </Reference>
129 <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 163 <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
130 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.12.0.21003\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath> 164 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.12.0.15.0.25414\lib\net45\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
131 <Private>True</Private> 165 <Private>True</Private>
132 </Reference> 166 </Reference>
133 <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 167 <Reference Include="Microsoft.VisualStudio.Shell.Immutable.14.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
134 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.14.3.25407\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath> 168 <HintPath>..\packages\Microsoft.VisualStudio.Shell.Immutable.14.0.15.0.25404\lib\net45\Microsoft.VisualStudio.Shell.Immutable.14.0.dll</HintPath>
135 <Private>True</Private> 169 <Private>True</Private>
136 </Reference> 170 </Reference>
137 <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 171 <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
...@@ -169,16 +203,16 @@ ...@@ -169,16 +203,16 @@
169 <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath> 203 <HintPath>..\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
170 <Private>True</Private> 204 <Private>True</Private>
171 </Reference> 205 </Reference>
172 <Reference Include="Microsoft.VisualStudio.Threading, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 206 <Reference Include="Microsoft.VisualStudio.Threading, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
173 <HintPath>..\packages\Microsoft.VisualStudio.Threading.14.1.111\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath> 207 <HintPath>..\packages\Microsoft.VisualStudio.Threading.15.4.4\lib\net45\Microsoft.VisualStudio.Threading.dll</HintPath>
174 <Private>True</Private> 208 <Private>True</Private>
175 </Reference> 209 </Reference>
176 <Reference Include="Microsoft.VisualStudio.Utilities, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 210 <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
177 <HintPath>..\packages\Microsoft.VisualStudio.Utilities.14.3.25407\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath> 211 <HintPath>..\packages\Microsoft.VisualStudio.Utilities.15.4.27004\lib\net46\Microsoft.VisualStudio.Utilities.dll</HintPath>
178 <Private>True</Private> 212 <Private>True</Private>
179 </Reference> 213 </Reference>
180 <Reference Include="Microsoft.VisualStudio.Validation, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> 214 <Reference Include="Microsoft.VisualStudio.Validation, Version=15.3.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
181 <HintPath>..\packages\Microsoft.VisualStudio.Validation.14.1.111\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath> 215 <HintPath>..\packages\Microsoft.VisualStudio.Validation.15.3.32\lib\net45\Microsoft.VisualStudio.Validation.dll</HintPath>
182 <Private>True</Private> 216 <Private>True</Private>
183 </Reference> 217 </Reference>
184 <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 218 <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
...@@ -217,16 +251,28 @@ ...@@ -217,16 +251,28 @@
217 <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly> 251 <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
218 </ProjectReference> 252 </ProjectReference>
219 </ItemGroup> 253 </ItemGroup>
254 <ItemGroup>
255 <BootstrapperPackage Include=".NETFramework,Version=v4.5.2">
256 <Visible>False</Visible>
257 <ProductName>Microsoft .NET Framework 4.5.2 %28x86 and x64%29</ProductName>
258 <Install>true</Install>
259 </BootstrapperPackage>
260 <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
261 <Visible>False</Visible>
262 <ProductName>.NET Framework 3.5 SP1</ProductName>
263 <Install>false</Install>
264 </BootstrapperPackage>
265 </ItemGroup>
220 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 266 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
221 <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" /> 267 <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
222 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> 268 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
223 <PropertyGroup> 269 <PropertyGroup>
224 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> 270 <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
225 </PropertyGroup> 271 </PropertyGroup>
226 <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.props'))" /> 272 <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.props'))" />
227 <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets'))" /> 273 <Error Condition="!Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets'))" />
228 </Target> 274 </Target>
229 <Import Project="..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.14.3.25407\build\Microsoft.VSSDK.BuildTools.targets')" /> 275 <Import Project="..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\packages\Microsoft.VSSDK.BuildTools.15.1.192\build\Microsoft.VSSDK.BuildTools.targets')" />
230 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 276 <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
231 Other similar extension points exist, see Microsoft.Common.targets. 277 Other similar extension points exist, see Microsoft.Common.targets.
232 <Target Name="BeforeBuild"> 278 <Target Name="BeforeBuild">
......
...@@ -2,10 +2,18 @@ ...@@ -2,10 +2,18 @@
2 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup> 3 <PropertyGroup>
4 <ProjectView>ProjectFiles</ProjectView> 4 <ProjectView>ProjectFiles</ProjectView>
5 <PublishUrlHistory />
6 <InstallUrlHistory />
7 <SupportUrlHistory />
8 <UpdateUrlHistory />
9 <BootstrapperUrlHistory />
10 <ErrorReportUrlHistory />
11 <FallbackCulture>en-US</FallbackCulture>
12 <VerifyUploadedFiles>false</VerifyUploadedFiles>
5 </PropertyGroup> 13 </PropertyGroup>
6 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'"> 14 <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
7 <StartAction>Program</StartAction> 15 <StartAction>Program</StartAction>
8 <StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio 14.0\Common7\IDE\devenv.exe</StartProgram> 16 <StartProgram>C:\Program Files %28x86%29\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\devenv.exe</StartProgram>
9 <StartArguments>/rootsuffix Exp</StartArguments> 17 <StartArguments>/rootsuffix Exp</StartArguments>
10 </PropertyGroup> 18 </PropertyGroup>
11 </Project> 19 </Project>
...\ No newline at end of file ...\ No newline at end of file
......
1 <?xml version="1.0" encoding="utf-8"?>
2 <configuration>
3 <runtime>
4 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
5 <dependentAssembly>
6 <assemblyIdentity name="Microsoft.VisualStudio.Utilities" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
7 <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
8 </dependentAssembly>
9 <dependentAssembly>
10 <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.10.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
11 <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
12 </dependentAssembly>
13 <dependentAssembly>
14 <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.14.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
15 <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
16 </dependentAssembly>
17 <dependentAssembly>
18 <assemblyIdentity name="Microsoft.VisualStudio.Threading" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
19 <bindingRedirect oldVersion="0.0.0.0-15.3.0.0" newVersion="15.3.0.0" />
20 </dependentAssembly>
21 <dependentAssembly>
22 <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.11.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
23 <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
24 </dependentAssembly>
25 <dependentAssembly>
26 <assemblyIdentity name="Microsoft.VisualStudio.Imaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
27 <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
28 </dependentAssembly>
29 <dependentAssembly>
30 <assemblyIdentity name="Microsoft.VisualStudio.Shell.Immutable.12.0" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
31 <bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
32 </dependentAssembly>
33 </assemblyBinding>
34 </runtime>
35 </configuration>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <packages> 2 <packages>
3 <package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" targetFramework="net452" /> 3 <package id="Microsoft.VisualStudio.CoreUtility" version="15.4.27004" targetFramework="net46" />
4 <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net452" /> 4 <package id="Microsoft.VisualStudio.Imaging" version="15.4.27004" targetFramework="net46" />
5 <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6071" targetFramework="net46" />
5 <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net452" /> 6 <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" targetFramework="net452" />
6 <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" targetFramework="net452" /> 7 <package id="Microsoft.VisualStudio.Shell.Framework" version="15.4.27004" targetFramework="net46" />
7 <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" targetFramework="net452" /> 8 <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="15.0.25414" targetFramework="net46" />
8 <package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" targetFramework="net452" /> 9 <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="15.0.25414" targetFramework="net46" />
9 <package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.3.25407" targetFramework="net452" /> 10 <package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="15.0.25414" targetFramework="net46" />
11 <package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="15.0.25404" targetFramework="net46" />
10 <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net452" /> 12 <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net452" />
11 <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net452" /> 13 <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net452" />
12 <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" targetFramework="net452" /> 14 <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" targetFramework="net452" />
...@@ -15,8 +17,8 @@ ...@@ -15,8 +17,8 @@
15 <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net452" /> 17 <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net452" />
16 <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net452" /> 18 <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net452" />
17 <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net452" /> 19 <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net452" />
18 <package id="Microsoft.VisualStudio.Threading" version="14.1.111" targetFramework="net452" /> 20 <package id="Microsoft.VisualStudio.Threading" version="15.4.4" targetFramework="net46" />
19 <package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" targetFramework="net452" /> 21 <package id="Microsoft.VisualStudio.Utilities" version="15.4.27004" targetFramework="net46" />
20 <package id="Microsoft.VisualStudio.Validation" version="14.1.111" targetFramework="net452" /> 22 <package id="Microsoft.VisualStudio.Validation" version="15.3.32" targetFramework="net46" />
21 <package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" targetFramework="net452" developmentDependency="true" /> 23 <package id="Microsoft.VSSDK.BuildTools" version="15.1.192" targetFramework="net46" developmentDependency="true" />
22 </packages> 24 </packages>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -13,11 +13,10 @@ ...@@ -13,11 +13,10 @@
13 <Tags>LoadTest WebTest JSON REST SOAP WS</Tags> 13 <Tags>LoadTest WebTest JSON REST SOAP WS</Tags>
14 </Metadata> 14 </Metadata>
15 <Installation> 15 <Installation>
16 <InstallationTarget Id="Microsoft.VisualStudio.Pro" Version="[10.0]" /> 16 <InstallationTarget Id="Microsoft.VisualStudio.Enterprise" Version="[14.0,]" />
17 </Installation> 17 </Installation>
18 <Dependencies> 18 <Dependencies>
19 <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" /> 19 <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.6,]" />
20 <Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0]" />
21 </Dependencies> 20 </Dependencies>
22 <Assets> 21 <Assets>
23 <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" /> 22 <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
...@@ -25,4 +24,8 @@ ...@@ -25,4 +24,8 @@
25 <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="WebServicePluginForWebTestRuntime" Path="|WebServicePluginForWebTestRuntime|" AssemblyName="|WebServicePluginForWebTestRuntime;AssemblyName|" /> 24 <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="WebServicePluginForWebTestRuntime" Path="|WebServicePluginForWebTestRuntime|" AssemblyName="|WebServicePluginForWebTestRuntime;AssemblyName|" />
26 <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="WebServicePluginForWebTestMessageEditor" Path="|WebServicePluginForWebTestMessageEditor|" AssemblyName="|WebServicePluginForWebTestMessageEditor;AssemblyName|" /> 25 <Asset Type="Microsoft.VisualStudio.Assembly" d:Source="Project" d:ProjectName="WebServicePluginForWebTestMessageEditor" Path="|WebServicePluginForWebTestMessageEditor|" AssemblyName="|WebServicePluginForWebTestMessageEditor;AssemblyName|" />
27 </Assets> 26 </Assets>
27 <Prerequisites>
28 <Prerequisite Id="Microsoft.VisualStudio.Component.TestTools.WebLoadTest" Version="[15.0.26606.0,16.0)" DisplayName="Web performance and load testing tools" />
29 <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[15.0.26606.0,16.0)" DisplayName="Visual Studio core editor" />
30 </Prerequisites>
28 </PackageManifest> 31 </PackageManifest>
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup> 3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <AppDesignerFolder>Properties</AppDesignerFolder> 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>WebTest.WebService.Plugin.MessageEditors</RootNamespace> 11 <RootNamespace>WebTest.WebService.Plugin.MessageEditors</RootNamespace>
12 <AssemblyName>WebTest.WebService.Plugin.MessageEditors</AssemblyName> 12 <AssemblyName>WebTest.WebService.Plugin.MessageEditors</AssemblyName>
13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 13 <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment> 14 <FileAlignment>512</FileAlignment>
15 <SccProjectName>SAK</SccProjectName> 15 <SccProjectName>SAK</SccProjectName>
16 <SccLocalPath>SAK</SccLocalPath> 16 <SccLocalPath>SAK</SccLocalPath>
......
1 //------------------------------------------------------------------------------ 1 //------------------------------------------------------------------------------
2 // <auto-generated> 2 // <auto-generated>
3 // This code was generated by a tool. 3 // This code was generated by a tool.
4 // Runtime Version:4.0.30319.17929 4 // Runtime Version:4.0.30319.42000
5 // 5 //
6 // Changes to this file may cause incorrect behavior and will be lost if 6 // Changes to this file may cause incorrect behavior and will be lost if
7 // the code is regenerated. 7 // the code is regenerated.
...@@ -19,7 +19,7 @@ namespace WebTest.WebService.Plugin.ResultTab.Properties { ...@@ -19,7 +19,7 @@ namespace WebTest.WebService.Plugin.ResultTab.Properties {
19 // class via a tool like ResGen or Visual Studio. 19 // class via a tool like ResGen or Visual Studio.
20 // To add or remove a member, edit your .ResX file then rerun ResGen 20 // To add or remove a member, edit your .ResX file then rerun ResGen
21 // with the /str option, or rebuild your VS project. 21 // with the /str option, or rebuild your VS project.
22 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] 22 [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
23 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] 23 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
24 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] 24 [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
25 internal class Resources { 25 internal class Resources {
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> 2 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
3 <PropertyGroup> 3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <SccLocalPath>SAK</SccLocalPath> 16 <SccLocalPath>SAK</SccLocalPath>
17 <SccAuxPath>SAK</SccAuxPath> 17 <SccAuxPath>SAK</SccAuxPath>
18 <SccProvider>SAK</SccProvider> 18 <SccProvider>SAK</SccProvider>
19 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 19 <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
20 <TargetFrameworkProfile /> 20 <TargetFrameworkProfile />
21 </PropertyGroup> 21 </PropertyGroup>
22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> 22 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
...@@ -51,6 +51,18 @@ ...@@ -51,6 +51,18 @@
51 <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile> 51 <AssemblyOriginatorKeyFile>Key.snk</AssemblyOriginatorKeyFile>
52 </PropertyGroup> 52 </PropertyGroup>
53 <ItemGroup> 53 <ItemGroup>
54 <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
55 <EmbedInteropTypes>True</EmbedInteropTypes>
56 </Reference>
57 <Reference Include="envdte100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
58 <EmbedInteropTypes>True</EmbedInteropTypes>
59 </Reference>
60 <Reference Include="envdte80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
61 <EmbedInteropTypes>True</EmbedInteropTypes>
62 </Reference>
63 <Reference Include="envdte90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
64 <EmbedInteropTypes>True</EmbedInteropTypes>
65 </Reference>
54 <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> 66 <Reference Include="Extensibility, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
55 <EmbedInteropTypes>False</EmbedInteropTypes> 67 <EmbedInteropTypes>False</EmbedInteropTypes>
56 </Reference> 68 </Reference>
...@@ -110,42 +122,6 @@ ...@@ -110,42 +122,6 @@
110 <Compile Include="XmlTreeView.cs" /> 122 <Compile Include="XmlTreeView.cs" />
111 </ItemGroup> 123 </ItemGroup>
112 <ItemGroup> 124 <ItemGroup>
113 <COMReference Include="EnvDTE">
114 <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
115 <VersionMajor>8</VersionMajor>
116 <VersionMinor>0</VersionMinor>
117 <Lcid>0</Lcid>
118 <WrapperTool>primary</WrapperTool>
119 <Isolated>False</Isolated>
120 <EmbedInteropTypes>False</EmbedInteropTypes>
121 </COMReference>
122 <COMReference Include="EnvDTE100">
123 <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
124 <VersionMajor>10</VersionMajor>
125 <VersionMinor>0</VersionMinor>
126 <Lcid>0</Lcid>
127 <WrapperTool>primary</WrapperTool>
128 <Isolated>False</Isolated>
129 <EmbedInteropTypes>False</EmbedInteropTypes>
130 </COMReference>
131 <COMReference Include="EnvDTE80">
132 <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
133 <VersionMajor>8</VersionMajor>
134 <VersionMinor>0</VersionMinor>
135 <Lcid>0</Lcid>
136 <WrapperTool>primary</WrapperTool>
137 <Isolated>False</Isolated>
138 <EmbedInteropTypes>False</EmbedInteropTypes>
139 </COMReference>
140 <COMReference Include="EnvDTE90">
141 <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
142 <VersionMajor>9</VersionMajor>
143 <VersionMinor>0</VersionMinor>
144 <Lcid>0</Lcid>
145 <WrapperTool>primary</WrapperTool>
146 <Isolated>False</Isolated>
147 <EmbedInteropTypes>False</EmbedInteropTypes>
148 </COMReference>
149 <COMReference Include="Microsoft.VisualStudio.CommandBars"> 125 <COMReference Include="Microsoft.VisualStudio.CommandBars">
150 <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid> 126 <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
151 <VersionMajor>8</VersionMajor> 127 <VersionMajor>8</VersionMajor>
......
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> 2 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3 <PropertyGroup> 3 <PropertyGroup>
4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> 4 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> 5 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <AppDesignerFolder>Properties</AppDesignerFolder> 10 <AppDesignerFolder>Properties</AppDesignerFolder>
11 <RootNamespace>WebTest.WebService.Plugin.Runtime</RootNamespace> 11 <RootNamespace>WebTest.WebService.Plugin.Runtime</RootNamespace>
12 <AssemblyName>WebTest.WebService.Plugin.Runtime</AssemblyName> 12 <AssemblyName>WebTest.WebService.Plugin.Runtime</AssemblyName>
13 <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> 13 <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
14 <FileAlignment>512</FileAlignment> 14 <FileAlignment>512</FileAlignment>
15 <SccProjectName>SAK</SccProjectName> 15 <SccProjectName>SAK</SccProjectName>
16 <SccLocalPath>SAK</SccLocalPath> 16 <SccLocalPath>SAK</SccLocalPath>
......