Skip to content

Commit 39c062e

Browse files
authored
Pick up newest viersion of WinMD library to allow for updating winmd … (#862)
1 parent 386cd60 commit 39c062e

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

cppwinrt/cppwinrt.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\Microsoft.Windows.WinMD.1.0.191022.1\build\native\Microsoft.Windows.WinMD.props" Condition="Exists('..\packages\Microsoft.Windows.WinMD.1.0.191022.1\build\native\Microsoft.Windows.WinMD.props')" />
3+
<Import Project="..\packages\Microsoft.Windows.WinMD.1.0.210225.2\build\native\Microsoft.Windows.WinMD.props" Condition="Exists('..\packages\Microsoft.Windows.WinMD.1.0.210225.2\build\native\Microsoft.Windows.WinMD.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|ARM">
66
<Configuration>Debug</Configuration>
@@ -356,6 +356,6 @@
356356
<PropertyGroup>
357357
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
358358
</PropertyGroup>
359-
<Error Condition="!Exists('..\packages\Microsoft.Windows.WinMD.1.0.191022.1\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.WinMD.1.0.191022.1\build\native\Microsoft.Windows.WinMD.props'))" />
359+
<Error Condition="!Exists('..\packages\Microsoft.Windows.WinMD.1.0.210225.2\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.WinMD.1.0.210225.2\build\native\Microsoft.Windows.WinMD.props'))" />
360360
</Target>
361361
</Project>

cppwinrt/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.Windows.WinMD" version="1.0.191022.1" targetFramework="native" />
3+
<package id="Microsoft.Windows.WinMD" version="1.0.210225.2" targetFramework="native" />
44
</packages>

natvis/cppwinrt_visualizer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ void LoadMetadata(DkmProcess* process, WCHAR const* processPath, std::string_vie
101101
{
102102
MetadataDiagnostic(process, L"Loaded ", winmd_path);
103103
db_files.push_back(winmd_path.string());
104+
db->add_database(winmd_path.string());
104105
}
105106
auto pos = probe_file.rfind('.');
106107
if (pos == std::string::npos)
@@ -109,7 +110,6 @@ void LoadMetadata(DkmProcess* process, WCHAR const* processPath, std::string_vie
109110
}
110111
probe_file = probe_file.substr(0, pos);
111112
} while (true);
112-
db.reset(new cache(db_files));
113113
}
114114

115115
TypeDef FindType(DkmProcess* process, std::string_view const& typeName)

natvis/cppwinrtvisualizer.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +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')" />
3+
<Import Project="packages\Microsoft.Windows.WinMD.1.0.210225.2\build\native\Microsoft.Windows.WinMD.props" Condition="Exists('packages\Microsoft.Windows.WinMD.1.0.210225.2\build\native\Microsoft.Windows.WinMD.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>
@@ -261,6 +261,6 @@
261261
</PropertyGroup>
262262
<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'))" />
263263
<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'))" />
264-
<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'))" />
264+
<Error Condition="!Exists('packages\Microsoft.Windows.WinMD.1.0.210225.2\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.WinMD.1.0.210225.2\build\native\Microsoft.Windows.WinMD.props'))" />
265265
</Target>
266266
</Project>

natvis/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Microsoft.VSSDK.Debugger.VSDConfigTool" version="16.0.2012201-preview" developmentDependency="true" />
44
<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" />
5+
<package id="Microsoft.Windows.WinMD" version="1.0.210225.2" targetFramework="native" />
66
</packages>

0 commit comments

Comments
 (0)