diff --git a/.gitignore b/.gitignore index a87f2c6..c506470 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -################################################################################ +################################################################################ # This .gitignore file was automatically created by Microsoft(R) Visual Studio. ################################################################################ @@ -8,3 +8,4 @@ /FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/lib /FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/obj /FASTBuildMonitorVSIX/FASTBuildMonitorStandalone/obj +FASTBuildMonitorVSIX/.vs/FASTBuildMonitorVSIX/v15/Server/sqlite3/storage.ide diff --git a/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.sln b/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.sln index 7bfa85b..c3efbf6 100644 --- a/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.sln +++ b/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2027 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FASTBuildMonitorVSIX", "FASTBuildMonitorVSIX\FASTBuildMonitorVSIX.csproj", "{E50A8B0A-8964-4ADB-B504-71DD7228B20A}" EndProject @@ -28,4 +28,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {B1CBC84D-A6C5-40CB-B162-CBF560A62D09} + EndGlobalSection EndGlobal diff --git a/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/Code/FASTBuildMonitorControl.xaml.cs b/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/Code/FASTBuildMonitorControl.xaml.cs index 25aab23..27ab049 100644 --- a/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/Code/FASTBuildMonitorControl.xaml.cs +++ b/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/Code/FASTBuildMonitorControl.xaml.cs @@ -380,17 +380,17 @@ private void FASTBuildMonitorControl_Loaded(object sender, RoutedEventArgs e) string authorsText = "Yassine Riahi & Liam Flookes"; string packageNameText = "FASTBuildMonitorVSIX"; - // Find out the VSIX info - FASTBuildMonitorPackage.VSIXPackageInformation packageInfo = FASTBuildMonitorPackage._instance != null ? FASTBuildMonitorPackage._instance.GetCurrentVSIXPackageInformation() : null; + // Find out the VSIX info + FASTBuildMonitorPackage.VSIXPackageInformation packageInfo = FASTBuildMonitorPackage._instance != null ? FASTBuildMonitorPackage._instance.GetCurrentVSIXPackageInformation() : null; - if (packageInfo != null) - { - versionText = packageInfo._version.ToString(); - authorsText = packageInfo._authors; - packageNameText = packageInfo._packageName; - } + if (packageInfo != null) + { + versionText = packageInfo._version != null? packageInfo._version.ToString() : versionText; + authorsText = packageInfo._authors != null? packageInfo._authors: authorsText; + packageNameText = packageInfo._packageName != null? packageInfo._packageName: packageNameText; + } - AboutTextBlock.Text = string.Format("{0} v{1}\nCopyright (c) 2016 {2}.\nProvided under a MIT License, see license file on github.", packageNameText, versionText, authorsText); + AboutTextBlock.Text = string.Format("{0} v{1}\nCopyright (c) 2016 {2}.\nProvided under a MIT License, see license file on github.", packageNameText, versionText, authorsText); } diff --git a/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.csproj b/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.csproj index 8d15688..179ffab 100644 --- a/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.csproj +++ b/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX/FASTBuildMonitorVSIX.csproj @@ -1,12 +1,32 @@  - + - 14.0 + 15.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) true + + + + + 14.0 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -237,6 +257,18 @@ VSPackage + + + False + Microsoft .NET Framework 4.5.2 %28x86 and x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + @@ -251,10 +283,10 @@ xcopy /Y /R /E $(TargetDir)$(TargetName).vsix $(ProjectDir)vsix\$(TargetName). 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}. - - + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 14.0 - 14.0 - $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VsSDKVersion)\VSSDK - Software\Microsoft\VisualStudio\$(VSSDKTargetPlatformVersion) - Exp - Microsoft\VisualStudio\$(VSSDKTargetPlatformVersion)$(VSSDKTargetPlatformRegRootSuffix)\Extensions\ - - - - $(registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\VSIP\$(VsSDKVersion)\@InstallDir)\VisualStudioIntegration - $(VSIntegrationRoot)\common - $(VSIntegrationCommon)\idl - $(VSIntegrationCommon)\inc - $(VSIntegrationInclude)\Office10 - $(VSIntegrationCommon)\lib\x86 - $(VSIntegrationRoot)\Common\Source\CPP\VSL\Include - $(VSIntegrationRoot)\Tools\Bin - $(VSIntegrationTools) - $(VSIntegrationTools) - - - - $(VSIntegrationInclude);$(VSIntegrationIdl);$(IntDir);%(AdditionalIncludeDirectories) - - - $(VSLIncludePath);$(VSIntegrationInclude);$(IntDir);%(AdditionalIncludeDirectories) - false - Level4 - true - - - $(VSIntegrationInclude);$(IntDir);$(OutDir);%(AdditionalIncludeDirectories) - - - $(VSIntegrationLibraries);$(IntDir);%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/CreatePkgDef.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/CreatePkgDef.exe deleted file mode 100644 index 9d39393..0000000 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/CreatePkgDef.exe and /dev/null differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/Microsoft.VisualStudio.Shell.Immutable.10.0.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/Microsoft.VisualStudio.Shell.Immutable.10.0.dll deleted file mode 100644 index 9bcebf1..0000000 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/Microsoft.VisualStudio.Shell.Immutable.10.0.dll and /dev/null differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegPkg.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegPkg.exe deleted file mode 100644 index 52f9745..0000000 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegPkg.exe and /dev/null differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegPkg.exe.config b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegPkg.exe.config deleted file mode 100644 index cbde019..0000000 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegPkg.exe.config +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegRiched20.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegRiched20.exe deleted file mode 100644 index 390589f..0000000 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/RegRiched20.exe and /dev/null differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCT.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCT.exe deleted file mode 100644 index 378ed56..0000000 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCT.exe and /dev/null differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCTCompress.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCTCompress.dll deleted file mode 100644 index 9ad1ab4..0000000 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCTCompress.dll and /dev/null differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCTLibrary.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCTLibrary.dll deleted file mode 100644 index f662547..0000000 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/VSCTLibrary.dll and /dev/null differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/ShellCmdDef.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/ShellCmdDef.vsct deleted file mode 100644 index 2740482..0000000 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/ShellCmdDef.vsct +++ /dev/null @@ -1,6817 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DynamicVisibility - - Load/Save Window UI - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - - Find - Go To Find Combo - Go To Find Combo - Go To Find Combo - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Object Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Class View Search - - - - DynamicVisibility - DefaultInvisible - DefaultDisabled - IconAndText - CommandWellOnly - - Browse: - Object Browsing Scope: - Choose object browsing scope - Object Browsing Scope - Object Browsing Scope - Object Browsing Scope - - - - DynamicVisibility - DefaultInvisible - CommandWellOnly - - Solution Configurations - - - - DynamicVisibility - DefaultInvisible - CommandWellOnly - - Solution Platforms - - - - DynamicVisibility - IconAndText - - &Show output from: - - - - DynamicVisibility - StretchHorizontally - - &Categories - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - CaseSensitive - NoAutoComplete - CommandWellOnly - FilterKeys - StretchHorizontally - - Call Browser Search - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/Microsoft.VSSDK.BuildTools.15.5.100.nupkg b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/Microsoft.VSSDK.BuildTools.15.5.100.nupkg new file mode 100644 index 0000000..6807478 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/Microsoft.VSSDK.BuildTools.15.5.100.nupkg differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/build/Microsoft.VSSDK.BuildTools.props b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/build/Microsoft.VSSDK.BuildTools.props similarity index 85% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/build/Microsoft.VSSDK.BuildTools.props rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/build/Microsoft.VSSDK.BuildTools.props index ae5665f..5e2cb73 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/build/Microsoft.VSSDK.BuildTools.props +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/build/Microsoft.VSSDK.BuildTools.props @@ -5,6 +5,5 @@ $(VSToolsPath)\VSSDK $(VsSDKInstall)\inc $(VsSDKInstall)\bin - $(VsSDKInstall)\schemas\VSIXManifestSchema.xsd \ No newline at end of file diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/build/Microsoft.VSSDK.BuildTools.targets b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/build/Microsoft.VSSDK.BuildTools.targets similarity index 77% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/build/Microsoft.VSSDK.BuildTools.targets rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/build/Microsoft.VSSDK.BuildTools.targets index 703422c..3cb90c4 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/build/Microsoft.VSSDK.BuildTools.targets +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/build/Microsoft.VSSDK.BuildTools.targets @@ -7,10 +7,11 @@ System.Environment.SetEnvironmentVariable("VsSDKToolsPath", System.IO.Path.GetFullPath(ProjectDirectory + @"\..\tools\VSSDK\bin"),EnvironmentVariableTarget.Process); + System.Environment.SetEnvironmentVariable("VsSDKSchemaDir", System.IO.Path.GetFullPath(ProjectDirectory + @"\..\tools\VSSDK\schemas"),EnvironmentVariableTarget.Process); - + \ No newline at end of file diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.ExtensionEngine.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.ExtensionEngine.dll new file mode 100644 index 0000000..043ce11 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.ExtensionEngine.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.BuildTasks.15.0.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.BuildTasks.15.0.dll new file mode 100644 index 0000000..1c9888f Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.BuildTasks.15.0.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.BuildTasks.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.BuildTasks.dll new file mode 100644 index 0000000..4db62cb Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.BuildTasks.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Common.targets b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.Common.targets similarity index 90% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Common.targets rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.Common.targets index 9d719d5..f7c2de8 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Common.targets +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Sdk.Common.targets @@ -1,5 +1,4 @@ - - + + + Microsoft.VisualStudio.Sdk.BuildTasks.dll + Microsoft.VisualStudio.Sdk.BuildTasks.15.0.dll + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - 14.0 - 14.0 + 15.0 + 15.0 $(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VsSDKVersion)\VSSDK Software\Microsoft\VisualStudio\$(VSSDKTargetPlatformVersion) Exp @@ -90,7 +31,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - + @@ -129,8 +70,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. NoLogo="true" OutputFile="%(VSCTCompile.FileName).cto" Source="%(VSCTCompile.Identity)" - Verbose="$(VsctVerboseOutput)" - SDKVersion="$(VsSDKVersion)"> + Verbose="$(VsctVerboseOutput)"> diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Setup.Common.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Setup.Common.dll new file mode 100644 index 0000000..b7487ad Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Setup.Common.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Threading.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Threading.dll new file mode 100644 index 0000000..93c89e6 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Threading.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Validation.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Validation.dll new file mode 100644 index 0000000..e4e493b Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VisualStudio.Validation.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Cpp.Overrides.targets b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VsSDK.Cpp.Overrides.targets similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Cpp.Overrides.targets rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VsSDK.Cpp.Overrides.targets diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Cpp.targets b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VsSDK.Cpp.targets similarity index 92% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Cpp.targets rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VsSDK.Cpp.targets index b720f53..bde8030 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.Cpp.targets +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VsSDK.Cpp.targets @@ -10,7 +10,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. ************************************************************************* --> - + @@ -52,5 +52,5 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.targets b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VsSDK.targets similarity index 84% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.targets rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VsSDK.targets index 9847c62..4c7f662 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/Microsoft.VsSDK.targets +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Microsoft.VsSDK.targets @@ -10,44 +10,54 @@ IMPLIED WARRANTIES OF FITNESS FOR A PARTICULAR PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. ************************************************************************* --> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + false + false true + VerifyTargetVersion;$(BuildDependsOn) + true $(GetVsixItemsToBundleDependsOn);Compile $(DeployVsixExtensionFilesDependsOn);Compile - Microsoft\VisualStudio\$(VSSDKTargetPlatformVersion)$(VSSDKTargetPlatformRegRootSuffix)\Extensions\ $(VSSDKTargetPlatformVersion) true false true true + $(TargetPath) + true - - + + + + + + + + + + + true true @@ -195,55 +226,68 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. $(AssemblyVSIXSubPath) + $(InstallRoot) + $(Ngen) + $(NgenApplication) + $(NgenArchitecture) + $(NgenPriority) $(AssemblyVSIXSubPath) + $(InstallRoot) $(AssemblyVSIXSubPath) + $(InstallRoot) $(AssemblyVSIXSubPath) + $(InstallRoot) $(AssemblyVSIXSubPath) + $(InstallRoot) $(AssemblyVSIXSubPath) + $(InstallRoot) $(AssemblyVSIXSubPath) + $(InstallRoot) $(AssemblyVSIXSubPath) + $(InstallRoot) $(AssemblyVSIXSubPath) + $(InstallRoot) - + @@ -278,7 +322,9 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. + + @@ -309,9 +355,8 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - - - + + @@ -321,6 +366,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. + @@ -333,6 +379,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. + @@ -351,6 +398,10 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. + + + + @@ -364,6 +415,8 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. + + @@ -393,8 +446,35 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -406,14 +486,8 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - - - - - - %(Content.RelativeDir) @@ -422,14 +496,13 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - - BuiltProjectOutputGroup;BuiltProjectOutputGroupDependencies;GetCopyToOutputDirectoryItems;SatelliteDllsProjectOutputGroup DebugSymbolsProjectOutputGroup; @@ -440,10 +513,10 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. The IncludeOutputGroupsInVSIX values on items in the FilteredGroups list will only be BuiltProjectOutputGroupDependencies. The IncludeOutputGroupsInVSIX values on items in the UnfilteredGroups list will only be all other output groups. - + This is done because we only want to filter out items in the CreateVsixSourceItemFromReferences task that were build dependencies to avoid unintentially excluding output groups explicitly requested in IncludeOutputGroupsInVSIX. - + The task properly handles escaped values for IncludeOutputGroupsInVSIX (e.g. Target1%3bTarget2). --> @@ -456,6 +529,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. + + + + + + + + - + + + + <_VsixManifest Include="$(IntermediateVsixManifest)" /> + + CompressionLevel="$(ZipPackageCompressionLevel)" + IsProductComponent="$(IsProductComponent)" + AreDependenciesSetOnPackage="$(AreDependenciesSetOnPackage)" + ItemsToConsider="@(None)" + InstallationRoot="$(ExtensionInstallationRoot)" + InstallationFolder="$(ExtensionInstallationFolder)"> @@ -540,17 +639,19 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - + + VsixManifest="$(IntermediateVsixManifest)" + RootSuffix="$(VSSDKTargetPlatformRegRootSuffix)"> @@ -568,7 +669,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - - - - - - - - - + + @@ -654,6 +729,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. @@ -662,7 +738,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. ======================================================================================================= Copy Vsix Extension Files - Target to do a raw copy of extension files. Does not use Extension Manager API to + Target to do a raw copy of extension files. Does not use Extension Manager API to enable/manage an extension. Typically only used for Isolated Shell solutions. ======================================================================================================= --> @@ -674,7 +750,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. DependsOnTargets="$(CopyVsixExtensionFilesDependsOn)"> - + @@ -708,7 +784,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. @@ -1002,7 +1079,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. @@ -1188,7 +1265,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - + @@ -1263,7 +1340,7 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - + @@ -1273,19 +1350,4 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. - - - - - - - - - - - - - diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Newtonsoft.Json.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Newtonsoft.Json.dll new file mode 100644 index 0000000..be6558d Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/Newtonsoft.Json.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/PkgDefMgmt.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/PkgDefMgmt.dll new file mode 100644 index 0000000..ac103ff Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/PkgDefMgmt.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/ProjectItemsSchema.xml b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/ProjectItemsSchema.xml similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/ProjectItemsSchema.xml rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/ProjectItemsSchema.xml diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/ConvertCTCToVSCT.pl b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/ConvertCTCToVSCT.pl similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/ConvertCTCToVSCT.pl rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/ConvertCTCToVSCT.pl diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/CreatePkgDef.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/CreatePkgDef.exe new file mode 100644 index 0000000..d33e182 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/CreatePkgDef.exe differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/CreatePkgDef.exe.config b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/CreatePkgDef.exe.config similarity index 60% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/CreatePkgDef.exe.config rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/CreatePkgDef.exe.config index 71c2baa..8fc1afb 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/CreatePkgDef.exe.config +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/CreatePkgDef.exe.config @@ -9,6 +9,11 @@ + + + + + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/DebugSamples.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/DebugSamples.dll new file mode 100644 index 0000000..1e6a701 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/DebugSamples.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.Build.Framework.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.Build.Framework.dll new file mode 100644 index 0000000..e549293 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.Build.Framework.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.Build.Utilities.Core.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.Build.Utilities.Core.dll new file mode 100644 index 0000000..9f8abde Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.Build.Utilities.Core.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/Microsoft.VSDebugger.Native.targets b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.VSDebugger.Native.targets similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/Microsoft.VSDebugger.Native.targets rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.VSDebugger.Native.targets diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/Microsoft.VSDebugger.targets b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.VSDebugger.targets similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/Microsoft.VSDebugger.targets rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/Microsoft.VSDebugger.targets diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegPkg.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegPkg.exe new file mode 100644 index 0000000..b33806c Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegPkg.exe differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegPkg.exe.config b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegPkg.exe.config new file mode 100644 index 0000000..392f84b --- /dev/null +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegPkg.exe.config @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegRiched20.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegRiched20.exe new file mode 100644 index 0000000..62fda5d Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/RegRiched20.exe differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/SetEngineLogMode.cmd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/SetEngineLogMode.cmd similarity index 65% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/SetEngineLogMode.cmd rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/SetEngineLogMode.cmd index 60aba13..75487d6 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/SetEngineLogMode.cmd +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/SetEngineLogMode.cmd @@ -5,36 +5,41 @@ if /i "%~1"=="" goto Help if /i "%~1"=="-?" goto Help if /i "%~1"=="/?" goto Help -:: Change this for SxS -set VSVersion=14.0 +if /i "%~1"=="default" set EngineDiagEnableState=0& goto FindVS +if /i "%~1"=="error" set EngineDiagEnableState=1& goto FindVS +if /i "%~1"=="method" set EngineDiagEnableState=2& goto FindVS +if /i "%~1"=="dump" set DumpValue=1& goto FindVS -set MainRegRoot=HKLM\SOFTWARE\Microsoft\VisualStudio\%VSVersion% -set OptionalRegRoots=HKCU\SOFTWARE\Microsoft\VisualStudio\%VSVersion%_Config HKCU\SOFTWARE\Microsoft\VisualStudio\%VSVersion%Exp_Config HKLM\SOFTWARE\Microsoft\VSWinExpress\%VSVersion% HKCU\SOFTWARE\Microsoft\VSWinExpress\%VSVersion%_Config HKLM\SOFTWARE\Microsoft\Glass\%VSVersion% +echo ERROR: Unknown argument '%1'. +exit /b -1 -set reg_exe=reg.exe +:FindVS +REM Find a default VS installation or use one specified by the cmdline. +set VSInstallDir=%~2 +if NOT "%VSInstallDir%"=="" goto :HaveVSDir +set ProgRoot=%ProgramFiles(x86)% +if "%ProgRoot%"=="" set ProgRoot=%ProgramFiles% +call :TryVSPaths "%ProgRoot%\Microsoft Visual Studio\2017\*" -if /i "%PROCESSOR_ARCHITECTURE%"=="AMD64" set reg_exe=%windir%\syswow64\reg.exe +:TryVSPaths +for /d %%d in (%1) do call :TryVSPath "%%d" +goto :EOF -if /i "%~1"=="default" set EngineDiagEnableState=0& goto Set -if /i "%~1"=="error" set EngineDiagEnableState=1& goto Set -if /i "%~1"=="method" set EngineDiagEnableState=2& goto Set -if /i "%~1"=="dump" goto Dump +:TryVSPath +REM Arg1: path to VS Root +if not exist "%~1" goto :EOF +if not exist "%~1\Common7\IDE\vsregedit.exe" goto :EOF +set VSInstallDir=%~1 +goto :HaveVSDir -echo ERROR: Unknown argument '%1'. -exit /b -1 +:HaveVSDir +pushd "%VSInstallDir%" +set reg_exe=".\Common7\IDE\vsregedit.exe" +if "%DumpValue%"=="1" goto Dump :Set -call :SetRegRoot %MainRegRoot% -for %%r in (%OptionalRegRoots%) do call :SetForRegRootIfExists %%r -exit /b 0 - -:SetForRegRootIfExists -REM check if the registry root exists -call %reg_exe% query %1 /ve 1>NUL 2>NUL -if NOT %ERRORLEVEL%==0 goto eof - -:SetRegRoot -call %reg_exe% add %1\Debugger /v EngineDiagEnableState /t REG_DWORD /d %EngineDiagEnableState% /f +call %reg_exe% set "%CD%" HKLM Debugger EngineDiagEnableState DWORD %EngineDiagEnableState% +popd if not %ERRORLEVEL%==0 echo ERROR: failed to write to the registry (%1) & exit /b -1 goto eof @@ -42,11 +47,12 @@ goto eof echo. echo Listing current settings (0=default, 1=error, 2=method)... echo ---------------------------------------------------------- -for %%r in (%MainRegRoot% %OptionalRegRoots%) do call call %reg_exe% query %%r\Debugger /v EngineDiagEnableState 2>NUL +call %reg_exe% read "%CD%" HKLM Debugger EngineDiagEnableState DWORD 2>NUL +popd exit /b 0 :Help -echo SetEngineLogMode.cmd ^ +echo SetEngineLogMode.cmd ^ [VSInstancePath] echo. echo SetEngineLogMode.cmd is used to configure the logging mode used by echo vsdebugeng.dll. Three modes of operation are available: @@ -71,6 +77,10 @@ echo there are 'Skipped' lines explaining why components are not called. echo. echo 'dump' mode displays the current log mode. echo. +echo If VSInstancePath is not specified the default installation path is searched +echo and any the command is run on any instances found. +echo Otherwise only the VS instance at VSInstancePath is affected. +echo. echo Example method logging output: echo CALL: IDkmRuntimeMonitorBreakpointHandler.EnableRuntimeBreakpoint (ThreadId=6080 Class=Win32BDM.CBaseDebugMonitor IP=0x577D3B00 Object=0x10BD4F90 TickCount=217496250 ComponentId={F50FC269-4428-4680-8A45-462B8C5D37CD}) echo Skipped: ManagedDM::CCommonEntryPoint {38A59583-E6B1-4EE4-A53C-133BE0F45E55} for object visibility diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/DebugSamples.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/System.Threading.Thread.dll similarity index 54% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/DebugSamples.dll rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/System.Threading.Thread.dll index 0825995..6c40831 100644 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/DebugSamples.dll and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/System.Threading.Thread.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCT.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCT.exe new file mode 100644 index 0000000..ec5a7f9 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCT.exe differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCTCompress.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCTCompress.dll new file mode 100644 index 0000000..9511142 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCTCompress.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCTLibrary.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCTLibrary.dll new file mode 100644 index 0000000..3d6f4a9 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/VSCTLibrary.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/lib/Microsoft.VisualStudio.Shell.Framework.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/lib/Microsoft.VisualStudio.Shell.Framework.dll new file mode 100644 index 0000000..b9d07ed Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/lib/Microsoft.VisualStudio.Shell.Framework.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/lib/Microsoft.VisualStudio.Shell.Immutable.10.0.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/lib/Microsoft.VisualStudio.Shell.Immutable.10.0.dll new file mode 100644 index 0000000..14243be Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/lib/Microsoft.VisualStudio.Shell.Immutable.10.0.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/vsdconfigtool.exe b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/vsdconfigtool.exe similarity index 64% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/vsdconfigtool.exe rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/vsdconfigtool.exe index f7cc7f6..a9bbd3a 100644 Binary files a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/bin/vsdconfigtool.exe and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/bin/vsdconfigtool.exe differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/AppIDCmdUsed.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/AppIDCmdUsed.vsct similarity index 97% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/AppIDCmdUsed.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/AppIDCmdUsed.vsct index 9776d62..8d5344a 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/AppIDCmdUsed.vsct +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/AppIDCmdUsed.vsct @@ -120,6 +120,7 @@ + @@ -268,7 +269,7 @@ - + @@ -348,7 +349,6 @@ - @@ -569,6 +569,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1177,6 +1202,11 @@ + + + + + @@ -1185,7 +1215,6 @@ - @@ -1208,7 +1237,6 @@ - @@ -1227,7 +1255,7 @@ - + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/EmulatorCmdUsed.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/EmulatorCmdUsed.vsct similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/EmulatorCmdUsed.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/EmulatorCmdUsed.vsct diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/KnownImageIds.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/KnownImageIds.vsct similarity index 98% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/KnownImageIds.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/KnownImageIds.vsct index cedf362..30134f8 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/KnownImageIds.vsct +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/KnownImageIds.vsct @@ -142,6 +142,13 @@ + + + + + + + @@ -265,6 +272,7 @@ + @@ -407,6 +415,7 @@ + @@ -631,6 +640,7 @@ + @@ -833,6 +843,7 @@ + @@ -1225,6 +1236,7 @@ + @@ -1332,6 +1344,7 @@ + @@ -1700,6 +1713,7 @@ + @@ -2060,6 +2074,7 @@ + @@ -2256,12 +2271,16 @@ + + + + @@ -2494,6 +2513,19 @@ + + + + + + + + + + + + + @@ -2654,6 +2686,7 @@ + @@ -2933,9 +2966,11 @@ + + @@ -3050,6 +3085,8 @@ + + @@ -3176,9 +3213,23 @@ + + + + + + + + + + + + + + @@ -3213,6 +3264,7 @@ + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/Menus.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/Menus.vsct similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/Menus.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/Menus.vsct diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/MnuHelpIds.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/MnuHelpIds.h similarity index 91% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/MnuHelpIds.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/MnuHelpIds.h index 611f622..2936157 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/MnuHelpIds.h +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/MnuHelpIds.h @@ -125,19 +125,6 @@ #define icmdHelpF1AsyncComplete 0x0300 -/////////////////////////////////////////////////////////////////////////////// -//Tool window Bitmap IDs - -#define bmpidVsHelpContents 1 -#define bmpidVsHelpIndex 2 -#define bmpidVsHelpIndexResults 3 -#define bmpidFavWindow 4 -#define bmpidHowDoIWindow 5 -#define bmpidSearchWindow 6 -#define bmpidDynamicHelpWindow 7 -#define bmpidWebBrowserWindow 8 - - /////////////////////////////////////////////////////////////////////////////// //Menu cmds Bitmap IDs diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/RazorCmdId.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/RazorCmdId.h similarity index 87% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/RazorCmdId.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/RazorCmdId.h index 9f5acc4..c4b7587 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/RazorCmdId.h +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/RazorCmdId.h @@ -42,6 +42,13 @@ #define IDM_MANAGEDMEMORYANALYSIS_SUBMENU 0x0222 #define IDG_MANAGEDMEMORYANALYSIS_SUBMENU 0x0223 +// These values must be synced with intellitrace\Includes\PackageCommandIds.h +#define IDM_IntelliTraceHubDetailsViewFilterContextMenu 0x0225 +#define IDM_IntelliTraceHubDetailsViewFilterCategorySubMenu 0x0226 +#define IDG_IntelliTraceHubDetailsViewFilterCategoryEventsGroup 0x0227 +#define IDG_IntelliTraceHubDetailsViewFilterCategorySubMenuGroup 0x0228 + + // TODO: re-enabled this constant #define cmdidClearAllTips 0x00000101 #define cmdidRazorThreadWindowToolbarExpandStacks 0x00000103 @@ -84,6 +91,12 @@ #define cmdidRazorDisassemblyWindowToolbarAddressCombo 0x00000360 #define cmdidLaunchManagedMemoryAnalysis 0x00000600 +// This must match values in HubExtensions/UIConstants.cs +#define cmdidIntelliTraceHubDetailsViewFilterCategoryTopLevelBase 0x00000700 +#define cmdidIntelliTraceHubDetailsViewFilterCategoryTopLevelLast 0x0000072A // excluded +#define cmdidIntelliTraceHubDetailsViewFilterCategorySecondLevelBase 0x0000072A +#define cmdidIntelliTraceHubDetailsViewFilterCategorySecondLevelLast 0x00000750 // excluded + // Bitmaps #define bmpShieldIcon 1 diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/RazorCmdUsed.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/RazorCmdUsed.vsct similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/RazorCmdUsed.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/RazorCmdUsed.vsct diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/RazorGuids.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/RazorGuids.h similarity index 81% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/RazorGuids.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/RazorGuids.h index 21f1c34..9587163 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/RazorGuids.h +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/RazorGuids.h @@ -20,6 +20,10 @@ // Guid of the App Thumbnail icon #define guidAppThumbnailIcon { 0xa879711, 0xd2f9, 0x4312, { 0x93, 0x12, 0xf7, 0xd7, 0x3c, 0xb6, 0x6a, 0x9 } } +// This must match values in HubExtensions/UIConstants.cs +// and intellitrace/Includes/PackageGuids.h +#define guidIntelliTraceHubExtensionCmdSet { 0x11A58127, 0xDD59, 0x4506, { 0x83, 0x9B, 0xF6, 0xF6, 0x27, 0x61, 0x15, 0x21 } } + // ///////////////////////////////////////////////////////////////////////////// diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/SharedCmdDef.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/SharedCmdDef.vsct similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/SharedCmdDef.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/SharedCmdDef.vsct diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/SharedCmdPlace.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/SharedCmdPlace.vsct similarity index 99% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/SharedCmdPlace.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/SharedCmdPlace.vsct index 6943f6c..fbc4dbf 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/SharedCmdPlace.vsct +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/SharedCmdPlace.vsct @@ -634,7 +634,7 @@ - Class View Settings + Settings @@ -1354,9 +1354,15 @@ + + + + + + @@ -2558,7 +2564,7 @@ - + @@ -2990,7 +2996,13 @@ - + + + + + + + @@ -4147,6 +4159,14 @@ + + + + + + + + @@ -4351,7 +4371,6 @@ - @@ -4459,8 +4478,6 @@ - - @@ -4523,6 +4540,7 @@ cmdidShowQuickFixesForPosition (global one) is placed into the editor context menu (and so will help users to learn about Ctrl+. shortcut), while hitting Ctrl+. will always invoke cmdidShowQuickFixes (text editor scoped one) as more specific of them. --> + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/ShellCmdDef.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/ShellCmdDef.vsct new file mode 100644 index 0000000..3142b7b --- /dev/null +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/ShellCmdDef.vsct @@ -0,0 +1,7154 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + DynamicVisibility + + Load/Save Window UI + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + + Find + Go To Find Combo + Go To Find Combo + Go To Find Combo + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Object Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Search + + + + DynamicVisibility + DefaultInvisible + DefaultDisabled + IconAndText + CommandWellOnly + + Browse: + Object Browsing Scope: + Choose object browsing scope + Object Browsing Scope + Object Browsing Scope + Object Browsing Scope + + + + DynamicVisibility + DefaultInvisible + CommandWellOnly + + Solution Configurations + + + + DynamicVisibility + DefaultInvisible + CommandWellOnly + + Solution Platforms + + + + DynamicVisibility + IconAndText + + &Show output from: + + + + DynamicVisibility + StretchHorizontally + + &Categories + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + CaseSensitive + NoAutoComplete + CommandWellOnly + FilterKeys + StretchHorizontally + + Call Browser Search + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/ShellCmdPlace.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/ShellCmdPlace.vsct similarity index 96% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/ShellCmdPlace.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/ShellCmdPlace.vsct index 0d42099..a071fd7 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/ShellCmdPlace.vsct +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/ShellCmdPlace.vsct @@ -180,6 +180,15 @@ Error List + + + + AlwaysCreate + + Find All References Window Toolbar + Find All References Window Toolbar + + @@ -519,6 +528,12 @@ &Find and Replace + + + + &Go To + + @@ -909,6 +924,12 @@ Find Symbol + + + + Find All References + + @@ -955,6 +976,24 @@ + + + + + Snippet + &Snippet + + + + + + + + Annotation + &Annotation + + + @@ -972,7 +1011,7 @@ - Show issues contained by + Show items contained by @@ -982,6 +1021,14 @@ Show issues generated + + + + IconAndText + + Group by: + + @@ -1392,6 +1439,12 @@ + + + + + + @@ -1403,6 +1456,24 @@ + + + + + + + + + + + + + + + + + + @@ -1514,9 +1585,12 @@ - + + + + @@ -1741,6 +1815,10 @@ + + + + @@ -1787,15 +1865,15 @@ - + - + - + @@ -1982,24 +2060,27 @@ - + - + - + - + - + + + + @@ -2007,6 +2088,13 @@ + + + + + + + @@ -2392,6 +2480,13 @@ Show &Columns + + + + Grouping + &Grouping + + @@ -2431,6 +2526,9 @@ + + + @@ -2474,6 +2572,9 @@ + + + @@ -2628,6 +2729,20 @@ + + + + + + + + + + + + + + @@ -2651,7 +2766,7 @@ - + @@ -3730,7 +3845,7 @@ - + @@ -4084,7 +4199,7 @@ - + @@ -4407,9 +4522,6 @@ - - - @@ -4431,6 +4543,9 @@ + + + @@ -4525,15 +4640,15 @@ - + + + @@ -4594,6 +4709,17 @@ + + + + + + + + + + + @@ -4967,6 +5093,16 @@ + + + + + + + + + + @@ -5401,6 +5537,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6085,6 +6296,9 @@ + + + @@ -6300,6 +6514,11 @@ + + + + + @@ -6490,5 +6709,14 @@ + + + + + + + + + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/VsDbgCmd.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/VsDbgCmd.h similarity index 91% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/VsDbgCmd.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/VsDbgCmd.h index 362c846..9d75146 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/VsDbgCmd.h +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/VsDbgCmd.h @@ -228,72 +228,22 @@ #define IDG_WATCH_SYMBOLS_SETTINGS 0x0217 #define IDG_DATATIP_SYMBOLS_SETTINGS 0x0218 +#define IDG_VS_CODEWIN_DEBUG_BP 0x0230 // this group is for commands that are available in the command window, // but are not on any menus by default #define IDG_COMMAND_WINDOW 0x0300 +#define IDG_INTELLITRACE_STEP 0x0400 +#define IDG_INTELLITRACE_TOOLBAR_STEP 0x0401 + /////////////////////////////////////////////////////////////////////////////// // Indexes into bitmaps (image wells) -// DbgIcons.bmp -#define IDBI_THREADS 1 -#define IDBI_RUNNING_DOCS 2 -#define IDBI_EXECUTE 3 -#define IDBI_BREAKPOINTS_WINDOW 4 -#define IDBI_ATTACH_TO_PROCESS 5 -#define IDBI_EXCEPTIONS 6 // not used. TODO: should be removed next time we replace the DbgIcons.bmp strip. -#define IDBI_ENABLE_BREAKPOINT 7 -#define IDBI_STACK 8 -#define IDBI_LOCALS 9 -#define IDBI_AUTOS 10 -#define IDBI_DETACH 11 -#define IDBI_DISASM 12 -#define IDBI_MEMORY 13 -#define IDBI_REGISTERS 14 -#define IDBI_WATCH 15 -#define IDBI_MODULES 16 -#define IDBI_CONSOLE_WINDOW 17 -#define IDBI_BREAKPOINT 18 -#define IDBI_VIEW_BREAKPOINT 19 -#define IDBI_AUTO_REEVALUATE 20 -#define IDBI_PROCESSES 21 -#define IDBI_GO_TO_SOURCE 22 -#define IDBI_GO_TO_DISASSEMBLY 23 -#define IDBI_APPLY_CODE_CHANGES 24 -#define IDBI_STOP_APPLY_CODE_CHANGES 25 -#define IDBI_BREAKPOINT_PROPERTIES 26 -#define IDBI_DELETE_ALL_BREAKPOINTS 27 -#define IDBI_DISABLE_ALL_BREAKPOINTS 28 // not used. -#define IDBI_ENABLE_ALL_BREAKPOINTS 29 // not used. -#define IDBI_TOGGLE_ALL_BREAKPOINTS 30 -#define IDBI_DELETE 31 -#define IDBI_UP 32 -#define IDBI_DOWN 33 -#define IDBI_NEWFOLDER 34 -#define IDBI_REFRESH 35 -#define IDBI_TERMINATE_PROCESS 36 -#define IDBI_DELETE_BREAKPOINT 37 -#define IDBI_FLAG 38 -#define IDBI_TOGGLE_FLAG 39 -#define IDBI_TOGGLE_THREAD_IPS 40 -#define IDBI_BREAKPOINT_IMPORT 45 -#define IDBI_BREAKPOINT_EXPORT 46 -#define IDBI_REAL_FUNC_EVAL 47 -#define IDBI_SHOW_CURRENT_PROCESS_ONLY 48 - //Instructions for adding new icons: -//1) Edit vsdebug\resource\DbgIcons.bmp, adding the new icon to the right of the existing icons. -//2) Add a new #define in this file, defining the new IDBI_ constant as the 1-based (not 0-based) index of the image in the bitmap file, that is, -// 1 + (x / 16) where x is the leftmost x-coordinate of the image in the bitmap. -//3) Add the new value to the enum definition inside vsdebug\package\imagelists.h -//4) Add the references to vsdebug\resource\VSDbgCmdBase.vsct as needed. -//5) In vsdebug\resource\VSDbgCmdBase.vsct, search for the following code: -// - Columns - Columns + Show Columns + Show Columns Sort By: - Sort by + S&ort by @@ -107,7 +107,7 @@ - + &Breakpoint @@ -433,6 +433,9 @@ + + + @@ -570,6 +573,9 @@ + + + @@ -982,6 +988,10 @@ + + + + @@ -1008,6 +1018,9 @@ + + + @@ -1636,6 +1649,9 @@ + + + @@ -1648,9 +1664,6 @@ - - - @@ -2066,9 +2079,6 @@ - - - @@ -2087,9 +2097,6 @@ - - - @@ -2188,6 +2195,8 @@ + + @@ -2238,6 +2247,7 @@ + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/VsDbgCmdUsed.VSCT b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/VsDbgCmdUsed.vsct similarity index 98% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/VsDbgCmdUsed.VSCT rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/VsDbgCmdUsed.vsct index d4a0ccd..0192ec1 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/VsDbgCmdUsed.VSCT +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/VsDbgCmdUsed.vsct @@ -24,6 +24,7 @@ + @@ -275,7 +276,6 @@ - @@ -374,7 +374,6 @@ - @@ -384,12 +383,13 @@ + - - - - + + + + @@ -478,7 +478,6 @@ - diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/editids.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/editids.h similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/editids.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/editids.h diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/sccmnid.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/sccmnid.h similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/sccmnid.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/sccmnid.h diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/sharedids.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/sharedids.h similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/sharedids.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/sharedids.h diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/stdidcmd.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/stdidcmd.h similarity index 98% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/stdidcmd.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/stdidcmd.h index 35502d2..6f6746f 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/stdidcmd.h +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/stdidcmd.h @@ -52,6 +52,10 @@ // DEFINE_GUID(CMDSETID_StandardCommandSet14, // 0x4c7763bf, 0x5faf, 0x4264, 0xa3, 0x66, 0xb7, 0xe1, 0xf2, 0x7b, 0xa9, 0x58); // +// {712C6C80-883B-4AAD-B430-BBCA5256FA9D} +// DEFINE_GUID(CMDSETID_StandardCommandSet15, +// 0x712c6c80, 0x883b, 0x4aad, 0xb4, 0x30, 0xbb, 0xca, 0x52, 0x56, 0xfa, 0x9d); +// // NOTE that new commands should be added to the end of StandardCommandSet2K // and that CLSID_StandardCommandSet97 should not be further added to. // NOTE also that in StandardCommandSet2K all commands up to ECMD_FINAL are @@ -463,7 +467,8 @@ enum #define cmdidDebugContextWindow 327 -#define cmdidHelpSamples 328 +// Samples are no longer supported post d15 +// #define cmdidHelpSamples 328 #define cmdidToolboxAddItem 329 #define cmdidToolboxReset 330 @@ -2041,6 +2046,9 @@ enum #define cmdidExploreFolderInWindows 1635 +#define cmdidEnableDPLSolution 1636 +#define cmdidDisableDPLSolution 1637 + #define cmdidNewSolutionFolderBar 1638 #define cmdidDataShortcut 1639 @@ -2600,6 +2608,9 @@ enum #define cmdidHexadecimalNumberMap 2526 #define cmdidIntegersDecimalsMap 2527 +#define cmdidBuildFullPDB 2528 +#define cmdidBuildFullPDBSolution 2529 + ////////////////////////////////////////////////////////////////// // // The following commands form CMDSETID_StandardCommandSet10. @@ -2856,6 +2867,42 @@ enum ////////////////////////////////////////////////////////////////// +////////////////////////////////////////////////////////////////// +// +// The following commands form CMDSETID_StandardCommandSet15. +// NOTE that all these commands are shareable and may be used +// in any appropriate menu. +// +////////////////////////////////////////////////////////////////// + +#define cmdidNavigateToFile 1 +#define cmdidNavigateToType 2 +#define cmdidNavigateToSymbol 3 +#define cmdidNavigateToMember 4 +// Please start after 25 or after to reserve a few for filtered NavigateTo commands. + +// Find All References preset groupings +#define cmdidFindAllRefPresetGroupingComboList 0x2A +#define cmdidFindAllRefPresetGroupingComboGetList 0x2B +#define cmdidFindAllRefLockWindow 0x2C + +#define cmdidGetToolsAndFeatures 0x3C + +#define cmdidShowLineAnnotations 0x4C +#define cmdidMoveToNextAnnotation 0x4D +#define cmdidMoveToPreviousAnnotation 0x4E + +#define cmdidShowStructure 0x4F + +#define cmdidHelpAccessibility 0x70 + +////////////////////////////////////////////////////////////////// +// +// End CMDSETID_StandardCommandSet15 commands. +// +////////////////////////////////////////////////////////////////// + + ////////////////////////////////////////////////////////////////// // // The following commands form guidDataCmdId. @@ -3380,6 +3427,32 @@ enum #define cmdidTaskListColumnSort24 223 #define cmdidTaskListColumnSort25 224 +#define cmdidTaskListColumnGroup1 600 +#define cmdidTaskListColumnGroup2 601 +#define cmdidTaskListColumnGroup3 602 +#define cmdidTaskListColumnGroup4 603 +#define cmdidTaskListColumnGroup5 604 +#define cmdidTaskListColumnGroup6 605 +#define cmdidTaskListColumnGroup7 606 +#define cmdidTaskListColumnGroup8 607 +#define cmdidTaskListColumnGroup9 608 +#define cmdidTaskListColumnGroup10 609 +#define cmdidTaskListColumnGroup11 610 +#define cmdidTaskListColumnGroup12 611 +#define cmdidTaskListColumnGroup13 612 +#define cmdidTaskListColumnGroup14 613 +#define cmdidTaskListColumnGroup15 614 +#define cmdidTaskListColumnGroup16 615 +#define cmdidTaskListColumnGroup17 616 +#define cmdidTaskListColumnGroup18 617 +#define cmdidTaskListColumnGroup19 618 +#define cmdidTaskListColumnGroup20 619 +#define cmdidTaskListColumnGroup21 620 +#define cmdidTaskListColumnGroup22 621 +#define cmdidTaskListColumnGroup23 622 +#define cmdidTaskListColumnGroup24 623 +#define cmdidTaskListColumnGroup25 624 + ////////////////////////////////////////////////////////////////// // // Command ids for the ReferenceManager commands diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/venusids.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/venusids.h similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/venusids.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/venusids.h diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/venusmenu.vsct b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/venusmenu.vsct similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/venusmenu.vsct rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/venusmenu.vsct diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/virtkeys.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/virtkeys.h similarity index 94% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/virtkeys.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/virtkeys.h index b1635e9..03c5f06 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/virtkeys.h +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/virtkeys.h @@ -113,10 +113,10 @@ #define VK_OEM_1 0xBA // ;: for USA #define VK_OEM_5 0xDC // |\ for USA -#define VK_OEM_PLUS 0xBB // '+' any country -#define VK_OEM_COMMA 0xBC // ',' any country -#define VK_OEM_MINUS 0xBD // '-' any country -#define VK_OEM_PERIOD 0xBE // '.' any country +#define VK_OEM_PLUS 0xBB // '+' any country/region +#define VK_OEM_COMMA 0xBC // ',' any country/region +#define VK_OEM_MINUS 0xBD // '-' any country/region +#define VK_OEM_PERIOD 0xBE // '.' any country/region #define VK_OEM_7 0xDE // '" for USA #define VK_PROCESSKEY 0xE5 diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/vsdebugguids.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/vsdebugguids.h similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/vsdebugguids.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/vsdebugguids.h diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/vsshlids.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/vsshlids.h similarity index 97% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/vsshlids.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/vsshlids.h index 38cd3b2..f26d3d6 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/vsshlids.h +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/vsshlids.h @@ -85,6 +85,11 @@ DEFINE_GUID(CMDSETID_StandardCommandSet14, 0x4c7763bf, 0x5faf, 0x4264, 0xa3, 0x66, 0xb7, 0xe1, 0xf2, 0x7b, 0xa9, 0x58); + // new command set for Dev15 + // {712C6C80-883B-4AAD-B430-BBCA5256FA9D} + DEFINE_GUID(CMDSETID_StandardCommandSet15, + 0x712c6c80, 0x883b, 0x4aad, 0xb4, 0x30, 0xbb, 0xca, 0x52, 0x56, 0xfa, 0x9d); + // {489EE5BF-F001-41c9-91C7-6E89D9C111AD} DEFINE_GUID(CMDSETID_EzMDI, 0x489ee5bf, 0xf001, 0x41c9, 0x91, 0xc7, 0x6e, 0x89, 0xd9, 0xc1, 0x11, 0xad); @@ -266,6 +271,10 @@ DEFINE_GUID(guidAppidSupportsConnectToServer, 0x9bf70368, 0xf5f7, 0x4ddf, 0x8c, 0xd2, 0xfb, 0x27, 0xfb, 0xe0, 0xbd, 0x9c); + // SQL Server Object Explorer command ID guid + // {03f46784-2f90-4122-91ec-72ff9e11d9a3} + DEFINE_GUID(guidSqlObjectExplorerCmdSet, + 0x03f46784, 0x2f90, 0x4122, 0x91, 0xec, 0x72, 0xff, 0x9e, 0x11, 0xd9, 0xa3); /////////////////////////////////////////////// // @@ -320,6 +329,8 @@ #define CMDSETID_StandardCommandSet12 {0x2A8866DC, 0x7BDE, 0x4dc8, {0xA3, 0x60, 0xA6, 0x06, 0x79, 0x53, 0x43, 0x84}}; // Guid for Standard Shell Commands (Dev14 set) #define CMDSETID_StandardCommandSet14 {0x4c7763bf, 0x5faf, 0x4264, {0xa3, 0x66, 0xb7, 0xe1, 0xf2, 0x7b, 0xa9, 0x58}}; + // Guid for Standard Shell Commands (Dev15 set) + #define CMDSETID_StandardCommandSet15 {0x712c6c80, 0x883b, 0x4aad, {0xb4, 0x30, 0xbb, 0xca, 0x52, 0x56, 0xfa, 0x9d}}; // Guid for the EzMDI file list menu private command set #define CMDSETID_EzMDI {0x489ee5bf, 0xf001, 0x41c9, {0x91, 0xc7, 0x6e, 0x89, 0xd9, 0xc1, 0x11, 0xad}} // Guid for the Emacs editor emulation command group @@ -379,6 +390,8 @@ #define guid_SE_MenuGroup { 0x74d21310, 0x2aee, 0x11d1, { 0x8b, 0xfb, 0x0, 0xa0, 0xc9, 0xf, 0x26, 0xf7 } } // Server Explorer command ID guid {74D21311-2AEE-11d1-8BFB-00A0C90F26F7} #define guid_SE_CommandID { 0x74d21311, 0x2aee, 0x11d1, { 0x8b, 0xfb, 0x0, 0xa0, 0xc9, 0xf, 0x26, 0xf7 } } + // SQL Server Object Explorer command ID guid {03f46784-2f90-4122-91ec-72ff9e11d9a3} + #define guidSqlObjectExplorerCmdSet { 0x03f46784, 0x2f90, 0x4122, {0x91, 0xec, 0x72, 0xff, 0x9e, 0x11, 0xd9, 0xa3 } } // UI Context GUID to enable the Tools->Connect To Server command {9BF70368-F5F7-4ddf-8CD2-FB27FBE0BD9C} #define guidAppidSupportsConnectToServer { 0x9bf70368, 0xf5f7, 0x4ddf, { 0x8c, 0xd2, 0xfb, 0x27, 0xfb, 0xe0, 0xbd, 0x9c } } //Guid for Extension Manager Package @@ -533,6 +546,8 @@ #define guidDavDataCmdId CMDSETID_DaVinciDataToolsCommandSet #define guidVSStd14 CMDSETID_StandardCommandSet14 #define CLSID_StandardCommandSet14 CMDSETID_StandardCommandSet14 +#define guidVSStd15 CMDSETID_StandardCommandSet15 +#define CLSID_StandardCommandSet15 CMDSETID_StandardCommandSet15 // Standard editor guid. #define guidStdEditor {0x9ADF33D0, 0x8AAD, 0x11d0, {0xB6, 0x06, 0x00, 0xA0, 0xC9, 0x22, 0xE8, 0x51} } @@ -566,7 +581,7 @@ #define IDM_VS_TOOL_OBJECT_BROWSER_GO 0x0007 #define IDM_VS_TOOL_CLASSVIEW_GO 0x0008 #define IDM_VS_TOOL_OBJSEARCH 0x0009 -//UNUSED 0x000a +#define IDM_VS_TOOL_FINDALLREF 0x000a #define IDM_VS_TOOL_OPENWINDOWS 0x000b #define IDM_VS_TOOL_VIEWBAR 0x000c #define IDM_VS_TOOL_BUILD 0x000d @@ -662,6 +677,7 @@ #define IDM_VS_EDITOR_INTELLISENSE_MENU 0x3EA2 #define IDM_VS_EDITOR_FIND_MENU 0x3EA3 #define IDM_VS_EDITOR_PASTE_MENU 0x3EA4 +#define IDM_VS_EDITOR_GOTO_MENU 0x3EA5 ////////////////////////////////////////////////////////////////////////////// // @@ -778,6 +794,7 @@ #define IDG_VS_TOOLS_OPTIONS 0x015A #define IDG_VS_TOOLS_OTHER2 0x015B #define IDG_VS_TOOLS_OBJSUBSET 0x015C +#define IDG_VS_TOOLS_EXTENSIBILITY 0x015F // Addins Menu Groups #define IDG_VS_ADDIN_BUILTIN 0x015D @@ -794,7 +811,8 @@ // Help Menu Groups #define IDG_VS_HELP_SUPPORT 0x016A #define IDG_VS_HELP_ABOUT 0x016B -#define IDG_VS_HELP_SAMPLES 0x016C +#define IDG_VS_HELP_ACCESSIBILITY 0x016D +//#define IDG_VS_HELP_SAMPLES 0x016C // Standard Toolbar Groups @@ -903,7 +921,7 @@ // Code Window context menu groups #define IDG_VS_CODEWIN_TEXTEDIT 0x01C0 -#define IDG_VS_CODEWIN_DEBUG_BP 0x01C1 +//#define unused menu ID 0x01C1 #define IDG_VS_CODEWIN_DEBUG_WATCH 0x01C2 #define IDG_VS_CODEWIN_DEBUG_STEP 0x01C3 #define IDG_VS_CODEWIN_MARKER 0x01C4 @@ -921,7 +939,20 @@ #define IDG_VS_CODEWIN_REFACTORING_JS 0x02b8 // VS 2005 bug #275998 #define IDG_VS_CODEWIN_LANGUAGE 0x02D0 #define IDG_VS_CODEWIN_ADVANCED 0x02D1 + +// Snippet flyout menu and groups #define IDG_VS_CODEWIN_SNIPPETS 0x02D2 +#define IDM_VS_CODEWIN_SNIPPET_ROOT 0x02D3 +#define IDG_VS_CODEWIN_SNIPPET_ROOT 0x02D4 + + +// Annotation flyout menu and groups +#define IDG_VS_CODEWIN_ANNOTATION 0x02D5 +#define IDM_VS_CODEWIN_ANNOTATION_ROOT 0x02D6 +#define IDG_VS_CODEWIN_ANNOTATION_ROOT 0x02D7 + +// IntelliTrace step menu groups. +#define IDG_VS_CODEWIN_INTELLITRACE_STEP 0x02D8 // Task List context menu groups #define IDG_VS_TASKLIST 0x01C7 @@ -934,7 +965,7 @@ // 0x01CB used above (IDG_VS_ERRORLIST) #define IDG_VS_ERRORLIST_CLIENT 0x01CC #define IDG_VS_ERRORLIST_NEXTPREV_ERR 0x01CD -// UNUSED: 0x01CE +#define IDG_VS_TASKLIST_GROUPS 0x01CE #define IDG_VS_TASKLIST_COLUMNS 0x01CF #define IDG_VS_TASKLIST_SORT_COLUMN 0x01D0 @@ -1133,6 +1164,12 @@ #define IDG_VS_OBJSEARCH_BROWSE 0x026a #define IDG_VS_OBJSEARCH_COMMON 0x026b +// Find All References toolbar groups +#define IDG_VS_FINDALLREF_COMMON 0x026c +#define IDG_VS_FINDALLREF_PRESETGROUPINGS 0x026d +#define IDG_VS_FINDALLREF_LOCKWINGROUP 0x026e +#define IDG_VS_FINDALLREF_PRESERVED 0x026f + // Object Browser menu groups #define IDG_VS_OBJBROWSER_SUBSETS 0x0270 #define IDG_VS_OBJBROWSER_DISPLAY 0x0271 @@ -1326,6 +1363,8 @@ #define IDM_VS_CSCD_PROJECT_SCC 0x0362 #define IDM_VS_CSCD_WINDOW_LAYOUTS 0x0363 +#define IDM_VS_CSCD_TASKLIST_GROUPS 0x0364 + ////////////////////////////////////////////////////////////////////////////// // // Context Menu Identifiers, created by Visual Studio Shell @@ -1448,7 +1487,8 @@ #define IDM_VS_CTXT_WEBREFFOLDER 0x0452 // App Designer Folder context menu #define IDM_VS_CTXT_APPDESIGNERFOLDER 0x0453 - +// Find All References context menu +#define IDM_VS_CTXT_FINDALLREF 0x0454 ////////////////////////////////////////////////////////////////////////////// // Right drag menu group #define IDM_VS_CTXT_RIGHT_DRAG 0x0460 @@ -1664,6 +1704,10 @@ #define IDG_VS_CTXT_PROJECT_BUILD_ORDER 0x0620 #define IDG_VS_CTXT_PROJECT_BUILD_PGO 0x0621 +// Goto menu +#define IDG_VS_GOTO 0x0622 + + /////////////////////////////////////////////// // // EzMDI files command group @@ -1897,6 +1941,15 @@ #define IDM_SE_TOOLBAR_VIEW 0x0504 #define IDM_SE_TOOLBAR_SERVEREXPLORER 0x0600 +/////////////////////////////////////////////// +// +// SQL Server Object Explorer menu groups +// +/////////////////////////////////////////////// + +//Context Menu +#define mnuIdSqlServerObjectExplorerContextMenu 0x2003 + /////////////////////////////////////////////// // // Data Explorer menu groups diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/wbids.h b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/wbids.h similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/inc/wbids.h rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/inc/wbids.h diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/offreg.dll b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/offreg.dll new file mode 100644 index 0000000..13acc52 Binary files /dev/null and b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/offreg.dll differ diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageLanguagePackManifestSchema.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageLanguagePackManifestSchema.xsd similarity index 92% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageLanguagePackManifestSchema.xsd rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageLanguagePackManifestSchema.xsd index 0bc9abf..c1c2969 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageLanguagePackManifestSchema.xsd +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageLanguagePackManifestSchema.xsd @@ -15,6 +15,7 @@ + @@ -29,6 +30,7 @@ + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Assets.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Assets.xsd similarity index 76% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Assets.xsd rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Assets.xsd index b294766..3b3ed0f 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Assets.xsd +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Assets.xsd @@ -43,6 +43,14 @@ + + + + The range of Visual Studio versions that this asset should be loaded for e.g. [15.0,16.0). Does not apply to assets of type ToolboxControl or VsPackage. + + + + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Dependencies.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Dependencies.xsd similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Dependencies.xsd rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Dependencies.xsd diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Installation.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Installation.xsd similarity index 89% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Installation.xsd rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Installation.xsd index 39ea14c..a808504 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Installation.xsd +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Installation.xsd @@ -60,6 +60,20 @@ + + + + + Indicates how the embedded catalog manifest should be applied. + + + + + + + + + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Installer.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Installer.xsd new file mode 100644 index 0000000..e409f40 --- /dev/null +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Installer.xsd @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Metadata.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Metadata.xsd similarity index 90% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Metadata.xsd rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Metadata.xsd index 9c23a6d..16665ed 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.Metadata.xsd +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Metadata.xsd @@ -9,7 +9,7 @@ - The Author element is the person or company creating the extension. + The DisplayName element specifies the user-friendly package name that is displayed in the Extension Manager UI. @@ -23,7 +23,7 @@ - The Description element is used to describe the extension. + The Description element is a short description of the package and its contents that is displayed in the Extension Manager UI. @@ -83,7 +83,7 @@ - The Preview element allows the developer to provide an image that appears in the Extension Manager UI preview pane when browsing + The PreviewImage element allows the developer to provide an image that appears in the Extension Manager UI preview pane when browsing for the extension. @@ -92,8 +92,7 @@ - The Preview element allows the developer to provide an image that appears in the Extension Manager UI preview pane when browsing - for the extension. + The Tags element is an optional element that lists additional semicolon-delimeted text tags that are used for search hints. @@ -107,7 +106,7 @@ - The Name element is the product name. + The Identity element defines identification information for the package. diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Prerequisites.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Prerequisites.xsd new file mode 100644 index 0000000..647f56c --- /dev/null +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.Prerequisites.xsd @@ -0,0 +1,23 @@ + + + + + + + + This schema is used for installing extensions to Visual Studio. + + + + + + + + + + + + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.xsd similarity index 83% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.xsd rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.xsd index 9121e10..bf6228b 100644 --- a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/PackageManifestSchema.xsd +++ b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/PackageManifestSchema.xsd @@ -15,10 +15,12 @@ + + - + @@ -29,8 +31,10 @@ + + - + diff --git a/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/VSIXManifestSchema.xsd b/FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/VSIXManifestSchema.xsd similarity index 100% rename from FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.14.3.25420/tools/vssdk/schemas/VSIXManifestSchema.xsd rename to FASTBuildMonitorVSIX/packages/Microsoft.VSSDK.BuildTools.15.5.100/tools/vssdk/schemas/VSIXManifestSchema.xsd