Skip to content

Commit afeb973

Browse files
Scottj1sScottj1s
authored
Merge pull request #373 from wjk/fix-vsix-build
Fix build
2 parents 87a28ef + 1e1e5b2 commit afeb973

File tree

12 files changed

+69
-21
lines changed

12 files changed

+69
-21
lines changed

‎cppwinrt.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test_component", "test\test
3434
EndProject
3535
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "test\test\test.vcxproj", "{D2961EA1-A8CA-4A62-B760-948403DC8494}"
3636
ProjectSection(ProjectDependencies) = postProject
37+
{D613FB39-5035-4043-91E2-BAB323908AF4} = {D613FB39-5035-4043-91E2-BAB323908AF4}
3738
{F1C915B3-2C64-4992-AFB7-7F035B1A7607} = {F1C915B3-2C64-4992-AFB7-7F035B1A7607}
3839
{A91B8BF3-28E4-4D9E-8DBA-64B70E4F0270} = {A91B8BF3-28E4-4D9E-8DBA-64B70E4F0270}
3940
EndProjectSection

‎natvis/cppwinrt_visualizer.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,7 @@ using namespace Microsoft::VisualStudio::Debugger::Telemetry;
99
using namespace Microsoft::VisualStudio::Debugger::DefaultPort;
1010
using namespace std::filesystem;
1111
using namespace winrt;
12-
using namespace xlang;
13-
using namespace xlang::meta;
14-
using namespace xlang::meta::reader;
12+
using namespace winmd::reader;
1513

1614
std::vector<std::string> db_files;
1715
std::unique_ptr<cache> db;

‎natvis/cppwinrtvisualizer.vcxproj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\Microsoft.Windows.WinMD.1.0.191006.1\build\native\Microsoft.Windows.WinMD.props" Condition="Exists('packages\Microsoft.Windows.WinMD.1.0.191006.1\build\native\Microsoft.Windows.WinMD.props')" />
34
<ItemGroup Label="ProjectConfigurations">
45
<ProjectConfiguration Include="Debug|Win32">
56
<Configuration>Debug</Configuration>
@@ -101,7 +102,7 @@
101102
<Optimization>Disabled</Optimization>
102103
<SDLCheck>false</SDLCheck>
103104
<PreprocessorDefinitions>WIN32;_DEBUG;VISUALIZER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104-
<AdditionalIncludeDirectories>$(IntDir);..\..\..\library;$(DIASDKInc);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
105+
<AdditionalIncludeDirectories>$(IntDir);..\cppwinrt;$(DIASDKInc);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
105106
<LanguageStandard>stdcpp17</LanguageStandard>
106107
<AdditionalOptions>/await</AdditionalOptions>
107108
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
@@ -127,7 +128,7 @@
127128
<Optimization>Disabled</Optimization>
128129
<SDLCheck>false</SDLCheck>
129130
<PreprocessorDefinitions>_DEBUG;VISUALIZER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
130-
<AdditionalIncludeDirectories>$(IntDir);..\..\..\library;$(DIASDKInc);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131+
<AdditionalIncludeDirectories>$(IntDir);..\cppwinrt;$(DIASDKInc);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
131132
<LanguageStandard>stdcpp17</LanguageStandard>
132133
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
133134
<AdditionalOptions>/await</AdditionalOptions>
@@ -154,7 +155,7 @@
154155
<IntrinsicFunctions>true</IntrinsicFunctions>
155156
<SDLCheck>false</SDLCheck>
156157
<PreprocessorDefinitions>WIN32;NDEBUG;VISUALIZER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
157-
<AdditionalIncludeDirectories>$(IntDir);..\..\..\library;$(DIASDKInc);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158+
<AdditionalIncludeDirectories>$(IntDir);..\cppwinrt;$(DIASDKInc);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158159
<LanguageStandard>stdcpp17</LanguageStandard>
159160
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
160161
<AdditionalOptions>/await</AdditionalOptions>
@@ -183,7 +184,7 @@
183184
<IntrinsicFunctions>true</IntrinsicFunctions>
184185
<SDLCheck>false</SDLCheck>
185186
<PreprocessorDefinitions>NDEBUG;VISUALIZER_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
186-
<AdditionalIncludeDirectories>$(IntDir);..\..\..\library;$(DIASDKInc);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
187+
<AdditionalIncludeDirectories>$(IntDir);..\cppwinrt;$(DIASDKInc);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
187188
<LanguageStandard>stdcpp17</LanguageStandard>
188189
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
189190
<AdditionalOptions>/await</AdditionalOptions>
@@ -256,5 +257,6 @@
256257
</PropertyGroup>
257258
<Error Condition="!Exists('packages\Microsoft.VSSDK.Debugger.VSDConfigTool.16.0.2012201-preview\build\Microsoft.VSSDK.Debugger.VSDConfigTool.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.Debugger.VSDConfigTool.16.0.2012201-preview\build\Microsoft.VSSDK.Debugger.VSDConfigTool.targets'))" />
258259
<Error Condition="!Exists('packages\Microsoft.VSSDK.Debugger.VSDebugEng.16.0.2012201-preview\Microsoft.VSSDK.Debugger.VSDebugEng.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.VSSDK.Debugger.VSDebugEng.16.0.2012201-preview\Microsoft.VSSDK.Debugger.VSDebugEng.targets'))" />
260+
<Error Condition="!Exists('packages\Microsoft.Windows.WinMD.1.0.191006.1\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.WinMD.1.0.191006.1\build\native\Microsoft.Windows.WinMD.props'))" />
259261
</Target>
260262
</Project>

‎natvis/object_visualizer.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55

66
using namespace Microsoft::VisualStudio::Debugger;
77
using namespace Microsoft::VisualStudio::Debugger::Evaluation;
8+
using namespace std::literals;
89
using namespace winrt;
9-
using namespace xlang;
10-
using namespace xlang::meta;
11-
using namespace xlang::meta::reader;
10+
using namespace winmd::impl;
11+
using namespace winmd::reader;
1212

1313
template <typename...T> struct overloaded : T... { using T::operator()...; };
1414
template <typename...T> overloaded(T...)->overloaded<T...>;

‎natvis/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.VSSDK.Debugger.VSDebugEng" version="16.0.2012201-preview" developmentDependency="true" />
43
<package id="Microsoft.VSSDK.Debugger.VSDConfigTool" version="16.0.2012201-preview" developmentDependency="true" />
4+
<package id="Microsoft.VSSDK.Debugger.VSDebugEng" version="16.0.2012201-preview" developmentDependency="true" />
5+
<package id="Microsoft.Windows.WinMD" version="1.0.191006.1" targetFramework="native" />
56
</packages>

‎natvis/pch.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <memory>
1818
#include <variant>
1919
#include <cmd_reader.h>
20-
#include <meta_reader.h>
20+
#include <winmd_reader.h>
2121

2222
#ifndef IF_FAIL_RET
2323
#define IF_FAIL_RET(expr) { HRESULT _hr = (expr); if(FAILED(_hr)) { return(_hr); } }
@@ -31,7 +31,7 @@ winrt::com_ptr<T> make_com_ptr(T* ptr)
3131
return result;
3232
}
3333

34-
xlang::meta::reader::TypeDef FindType(Microsoft::VisualStudio::Debugger::DkmProcess* process, std::string_view const& typeName);
34+
winmd::reader::TypeDef FindType(Microsoft::VisualStudio::Debugger::DkmProcess* process, std::string_view const& typeName);
3535

3636
enum class NatvisDiagnosticLevel
3737
{

‎natvis/property_visualizer.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@
55
using namespace Microsoft::VisualStudio::Debugger;
66
using namespace Microsoft::VisualStudio::Debugger::Evaluation;
77

8-
using namespace xlang;
9-
using namespace xlang::meta;
10-
using namespace xlang::meta::reader;
8+
using namespace winmd::reader;
119

1210
HRESULT property_visualizer::GetChildren(
1311
_In_ UINT32 InitialRequestSize,

‎nuget/Microsoft.Windows.CppWinRT.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.5">
44
<id>Microsoft.Windows.CppWinRT</id>
@@ -12,8 +12,8 @@
1212
<tags>native C++ WinRT nativepackage</tags>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>
1414
<license type="file">LICENSE</license>
15-
<projectUrl>https://github.com/Microsoft/cppwinrt/tree/master/nuget</projectUrl>
16-
<iconUrl>https://aka.ms/cppwinrt.ico</iconUrl>
15+
<projectUrl>https://github.com/Microsoft/cppwinrt</projectUrl>
16+
<icon>cppwinrt.ico</icon>
1717
</metadata>
1818
<files>
1919
<file src="..\LICENSE"/>
@@ -26,5 +26,6 @@
2626
<file src="Microsoft.Windows.CppWinRT.targets" target="build\native"/>
2727
<file src="CppWinrtRules.Project.xml" target="build\native"/>
2828
<file src="readme.txt"/>
29+
<file src="..\vsix\cppwinrt.ico"/>
2930
</files>
3031
</package>

‎nuget/build.cmd‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
@echo off
2+
3+
setlocal
4+
set my_dir=%~dp0
5+
set build_dir=%my_dir%..\build
6+
7+
set configuration=%1
8+
if "%configuration%" == "" (
9+
set configuration=Release
10+
)
11+
12+
set package_version=%2
13+
if "%package_version%" == "" (
14+
set package_version=2.3.4.5
15+
)
16+
17+
if not exist "%build_dir%\nuget.exe" (
18+
echo Downloading NuGet.exe...
19+
curl.exe -L# -o %build_dir%\nuget.exe "https://dist.nuget.org/win-x86-commandline/v5.3.0/nuget.exe"
20+
)
21+
22+
rem Yes, this must be all on one line.
23+
%build_dir%\nuget.exe pack Microsoft.Windows.CppWinRT.nuspec -Version %package_version% -Properties cppwinrt_exe=%build_dir%\x86\%configuration%\cppwinrt.exe;cppwinrt_fast_fwd_x86=%build_dir%\x86\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_x64=%build_dir%\x64\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm=%build_dir%\ARM\%configuration%\cppwinrt_fast_forwarder.lib;cppwinrt_fast_fwd_arm64=%build_dir%\ARM64\%configuration%\cppwinrt_fast_forwarder.lib
24+
25+
endlocal

‎vsix/Application Type/Windows Store/10.0/Platforms/x64/ImportAfter/Microsoft.Cpp.CppWinRT.props‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<!--
2+
***********************************************************************************************
3+
Copyright (C) Microsoft Corporation. All rights reserved.
4+
***********************************************************************************************
5+
-->
6+
7+
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
8+
9+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.CppWinRT.props" />
10+
11+
</Project>

0 commit comments

Comments
 (0)