Skip to content
This repository was archived by the owner on Jul 15, 2023. It is now read-only.

Fix warnings showing in the wrong pane in Visual Studio 2015 #166

Merged
SergeyTeplyakov merged 7 commits into from
Jul 23, 2015
Merged

Fix warnings showing in the wrong pane in Visual Studio 2015 #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0c1060b
Interact with the SVsErrorList service instead of SVsTaskList
sharwell Jul 22, 2015
acab546
Use the correct interfaces when requesting services
sharwell Jul 22, 2015
1e0abee
Update MSBuild references
sharwell Jul 22, 2015
56e778f
Fix the Code Tools build and incorporate it into buildCC
sharwell Jul 22, 2015
8ef6173
Remove unnecessary reference to MFC header afxres.h
sharwell Jul 22, 2015
df349bc
Updated path to tlbexp.exe
sharwell Jul 22, 2015
27ebcaf
Update to use Visual Studio 2015 RTM build machines
sharwell Jul 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7,110 changes: 7,110 additions & 0 deletions Common/Include/msobtnid.h
View file
Open in desktop

Large diffs are not rendered by default.

3,339 changes: 3,339 additions & 0 deletions Common/Include/stdidcmd.h
View file
Open in desktop

Large diffs are not rendered by default.

1,928 changes: 1,928 additions & 0 deletions Common/Include/vsshlids.h
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 2 additions & 4 deletions Microsoft.Research/MsBuildCodeContracts/MsBuildCodeContracts10.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,8 @@
</Reference>
<Reference Include="Microsoft.Build.Engine" />
<Reference Include="Microsoft.Build.Framework" />
<Reference Include="Microsoft.Build.Tasks" />
<Reference Include="Microsoft.Build.Utilities.v3.5">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
<Reference Include="Microsoft.Build.Tasks.v4.0" />
<Reference Include="Microsoft.Build.Utilities.v4.0" />
<Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<HintPath>..\..\packages\VSSDK.OLE.Interop.7.0.4\lib\net20\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
<Private>False</Private>
Expand Down
Binary file added Microsoft.VisualStudio.CodeTools/CodeToolsSetup/Tools/TlbExp.exe
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions Microsoft.VisualStudio.CodeTools/CodeToolsSetup/buildMSM.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
@echo off

rem Make sure NuGet packages are restored before proceeding with the build
..\..\.nuget\NuGet.exe restore ..\CodeTools10.sln

if "%1" == "" goto default
if "%1" == "export" goto export

Expand Down
24 changes: 23 additions & 1 deletion Microsoft.VisualStudio.CodeTools/CodeToolsSetup/buildMSM.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,28 @@
</Otherwise>
</Choose>

<!--==========================================================

Common properties for building the solution configuration

===========================================================-->
<PropertyGroup>
<SolutionDir>..\</SolutionDir>
<SolutionName>CodeTools10.sln</SolutionName>
<Platform>Mixed Platforms</Platform>
</PropertyGroup>

<Target Name="BuildSolutionConfig"
DependsOnTargets="Validate">
<MsBuild
Projects="$(SolutionDir)$(SolutionName)"
Properties='Configuration=$(BuildConfig);Platform=$(Platform)'
Targets="Rebuild"
/>

<Exec Command="Tools\tlbexp ..\ITaskManager\bin\$(BuildConfig)\ITaskManager.dll /out:..\TLB\ITaskManager.tlb"/>
</Target>

<!--==========================================================

Common properties used by many targets
Expand All @@ -59,7 +81,7 @@
</PropertyGroup>

<Target Name="All"
DependsOnTargets="Validate;CopyBinaries;MakeMSI"
DependsOnTargets="Validate;BuildSolutionConfig;CopyBinaries;MakeMSI"
/>

<Target Name="Validate">
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.VisualStudio.CodeTools/PropertyPage/Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static public String GetLocalRegistryRoot()
// Get the visual studio root key
if (VsRoot == null)
{
ILocalRegistry2 localReg = GetService(typeof(ILocalRegistry)) as ILocalRegistry2;
ILocalRegistry2 localReg = GetService(typeof(SLocalRegistry)) as ILocalRegistry2;
Copy link
Contributor

@SergeyTeplyakov SergeyTeplyakov Jul 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

❓ Just curious what was the reason for this switch?

Copy link
Contributor Author

@sharwell sharwell Jul 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From the documentation for ILocalRegistry2:

Notes to Callers
Called by any package that wants to register in the Visual Studio section of the registry. This interface is obtained by using the SLocalRegistry service.

if (localReg != null)
{
localReg.GetLocalRegistryRoot(out VsRoot);
Expand Down
54 changes: 50 additions & 4 deletions Microsoft.VisualStudio.CodeTools/PropertyPageUI/PropertyPageUI.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "WinResrc.h"
#define IDC_STATIC -1

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Expand All @@ -34,7 +35,8 @@ END

2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"#include ""WinResrc.h""\r\n"
"#define IDC_STATIC -1\r\n"
"\0"
END

Expand All @@ -44,7 +46,29 @@ BEGIN
"#define VER_FILEDESCRIPTION_STR ""PropertyPage Package Resources\\0""\r\n"
"#define VER_INTERNALNAME_STR ""PropertyPageUI.dll\\0""\r\n"
"#define VER_ORIGINALFILENAME_STR ""PropertyPageUI.dll\\0""\r\n"
"#include ""EnvSdkVersion.ver""\r\n"
"VS_VERSION_INFO VERSIONINFO\r\n"
Copy link
Contributor Author

@sharwell sharwell Jul 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

📝 The other option is creating the EnvSdkVersion.ver file with these contents.

"FILEVERSION 7,0,4,0\r\n"
"PRODUCTVERSION 7,1,1,0\r\n"
"BEGIN\r\n"
" BLOCK ""StringFileInfo""\r\n"
" BEGIN\r\n"
" BLOCK ""040904E4""\r\n"
" BEGIN\r\n"
" VALUE ""FileDescription"", VER_FILEDESCRIPTION_STR\r\n"
" VALUE ""FileVersion"", ""7.0.4.0\\0""\r\n"
" VALUE ""InternalName"", VER_INTERNALNAME_STR\r\n"
" VALUE ""LegalCopyright"", ""Copyright (C) Microsoft Corp.\\0""\r\n"
" VALUE ""OriginalFileName"", VER_ORIGINALFILENAME_STR\r\n"
" VALUE ""ProductName"", ""Microsoft Visual Studio Environment SDK\\0""\r\n"
" VALUE ""ProductVersion"", ""7.01.0001.0\\0""\r\n"
" END\r\n"
" END\r\n"
"\r\n"
" BLOCK ""VarFileInfo""\r\n"
" BEGIN\r\n"
" VALUE ""Translation"", 0x409, 1252\r\n"
" END\r\n"
"END\r\n"
"\0"
END

Expand Down Expand Up @@ -84,7 +108,29 @@ END
#define VER_FILEDESCRIPTION_STR "PropertyPage Package Resources\0"
#define VER_INTERNALNAME_STR "PropertyPageUI.dll\0"
#define VER_ORIGINALFILENAME_STR "PropertyPageUI.dll\0"
#include "EnvSdkVersion.ver"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 7,0,4,0
PRODUCTVERSION 7,1,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", VER_FILEDESCRIPTION_STR
VALUE "FileVersion", "7.0.4.0\0"
VALUE "InternalName", VER_INTERNALNAME_STR
VALUE "LegalCopyright", "Copyright (C) Microsoft Corp.\0"
VALUE "OriginalFileName", VER_ORIGINALFILENAME_STR
VALUE "ProductName", "Microsoft Visual Studio Environment SDK\0"
VALUE "ProductVersion", "7.01.0001.0\0"
END
END

BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END

/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
Expand Down
2 changes: 1 addition & 1 deletion Microsoft.VisualStudio.CodeTools/TaskManager/Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ static public String GetLocalRegistryRoot()
// Get the visual studio root key
if (VsRoot == null)
{
ILocalRegistry2 localReg = GetService(typeof(ILocalRegistry)) as ILocalRegistry2;
ILocalRegistry2 localReg = GetService(typeof(SLocalRegistry)) as ILocalRegistry2;
if (localReg != null)
{
localReg.GetLocalRegistryRoot(out VsRoot);
Expand Down
6 changes: 3 additions & 3 deletions Microsoft.VisualStudio.CodeTools/TaskManager/TaskManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ private void InitializeOutputWindow()
{
try
{ // sometimes failed on VS2010
outputWindow = Common.GetService(typeof(IVsOutputWindow)) as IVsOutputWindow;
outputWindow = Common.GetService(typeof(SVsOutputWindow)) as IVsOutputWindow;
}
catch
{
Expand All @@ -412,7 +412,7 @@ private void DisposeOutputWindow()

private void InitializeTaskProvider()
{
taskList = Common.GetService(typeof(SVsTaskList)) as IVsTaskList;
taskList = Common.GetService(typeof(SVsErrorList)) as IVsTaskList;
if (taskList != null)
{
taskList.RegisterTaskProvider(this, out taskListCookie);
Expand Down Expand Up @@ -504,7 +504,7 @@ public int SubcategoryList(uint cbstr, string[] rgbstr, out uint pcActual)

private void InitializeRunningDocTableEvents()
{
rdt = Common.GetService(typeof(IVsRunningDocumentTable)) as IVsRunningDocumentTable;
rdt = Common.GetService(typeof(SVsRunningDocumentTable)) as IVsRunningDocumentTable;
if (rdt != null)
{
rdt.AdviseRunningDocTableEvents(this, out rdtEventsCookie);
Expand Down
54 changes: 50 additions & 4 deletions Microsoft.VisualStudio.CodeTools/TaskManagerUI/TaskManagerUI.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
//
// Generated from the TEXTINCLUDE 2 resource.
//
#include "afxres.h"
#include "WinResrc.h"
#define IDC_STATIC -1

/////////////////////////////////////////////////////////////////////////////
#undef APSTUDIO_READONLY_SYMBOLS
Expand All @@ -34,7 +35,8 @@ END

2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\r\n"
"#include ""WinResrc.h""\r\n"
"#define IDC_STATIC -1\r\n"
"\0"
END

Expand All @@ -44,7 +46,29 @@ BEGIN
"#define VER_FILEDESCRIPTION_STR ""TaskManager Package Resources\\0""\r\n"
"#define VER_INTERNALNAME_STR ""TaskManagerUI.dll\\0""\r\n"
"#define VER_ORIGINALFILENAME_STR ""TaskManagerUI.dll\\0""\r\n"
"#include ""EnvSdkVersion.ver""\r\n"
"VS_VERSION_INFO VERSIONINFO\r\n"
"FILEVERSION 7,0,4,0\r\n"
"PRODUCTVERSION 7,1,1,0\r\n"
"BEGIN\r\n"
" BLOCK ""StringFileInfo""\r\n"
" BEGIN\r\n"
" BLOCK ""040904E4""\r\n"
" BEGIN\r\n"
" VALUE ""FileDescription"", VER_FILEDESCRIPTION_STR\r\n"
" VALUE ""FileVersion"", ""7.0.4.0\\0""\r\n"
" VALUE ""InternalName"", VER_INTERNALNAME_STR\r\n"
" VALUE ""LegalCopyright"", ""Copyright (C) Microsoft Corp.\\0""\r\n"
" VALUE ""OriginalFileName"", VER_ORIGINALFILENAME_STR\r\n"
" VALUE ""ProductName"", ""Microsoft Visual Studio Environment SDK\\0""\r\n"
" VALUE ""ProductVersion"", ""7.01.0001.0\\0""\r\n"
" END\r\n"
" END\r\n"
"\r\n"
" BLOCK ""VarFileInfo""\r\n"
" BEGIN\r\n"
" VALUE ""Translation"", 0x409, 1252\r\n"
" END\r\n"
"END\r\n"
"\0"
END

Expand Down Expand Up @@ -84,7 +108,29 @@ END
#define VER_FILEDESCRIPTION_STR "TaskManager Package Resources\0"
#define VER_INTERNALNAME_STR "TaskManagerUI.dll\0"
#define VER_ORIGINALFILENAME_STR "TaskManagerUI.dll\0"
#include "EnvSdkVersion.ver"
VS_VERSION_INFO VERSIONINFO
FILEVERSION 7,0,4,0
PRODUCTVERSION 7,1,1,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", VER_FILEDESCRIPTION_STR
VALUE "FileVersion", "7.0.4.0\0"
VALUE "InternalName", VER_INTERNALNAME_STR
VALUE "LegalCopyright", "Copyright (C) Microsoft Corp.\0"
VALUE "OriginalFileName", VER_ORIGINALFILENAME_STR
VALUE "ProductName", "Microsoft Visual Studio Environment SDK\0"
VALUE "ProductVersion", "7.01.0001.0\0"
END
END

BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 1252
END
END

/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version: 1.9.10000.{build}
os: Visual Studio 2015 RC
os: Visual Studio 2015
init:
- ps: git config --global core.autocrlf true
- ps: Update-AppveyorBuild -Version "1.9.1$(Get-Date -format MMdd).$env:appveyor_build_number"
Expand Down
6 changes: 6 additions & 0 deletions buildCC.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
@echo off

cd Microsoft.VisualStudio.CodeTools\CodeToolsSetup
call buildMSM release
call export release
Copy link
Contributor Author

@sharwell sharwell Jul 22, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 It would be better if the return codes from these calls were checked. It's not the only place where this type of check is omitted, but it does cause AppVeyor to report success even if the build fails.

cd ..\..

cd Microsoft.Research\ManagedContract.Setup
call buildmsi %1 devlab9ts
call buildnuget %1 devlab9ts
Expand Down