Skip to content

Commit 1c4b5f5

Browse files
authored
Ingest updated Microsoft.Windows.WinMD to fix bug around "-exclude" (#937)
* Ingest updated Microsoft.Windows.WinMD to fix bug around "-exclude" option. * Clean up weirdness from VS updating the NuGet
1 parent 2e05b07 commit 1c4b5f5

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

cppwinrt/cppwinrt.vcxproj

Lines changed: 4 additions & 4 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.210311.4\build\native\Microsoft.Windows.WinMD.props" Condition="Exists('..\packages\Microsoft.Windows.WinMD.1.0.210311.4\build\native\Microsoft.Windows.WinMD.props')" />
3+
<Import Project="..\packages\Microsoft.Windows.WinMD.1.0.210505.3\build\native\Microsoft.Windows.WinMD.props" Condition="Exists('..\packages\Microsoft.Windows.WinMD.1.0.210505.3\build\native\Microsoft.Windows.WinMD.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|ARM">
66
<Configuration>Debug</Configuration>
@@ -111,10 +111,10 @@
111111
<ResourceCompile Include="$(OutDir)version.rc" />
112112
</ItemGroup>
113113
<ItemGroup>
114-
<None Include="packages.config" />
114+
<Manifest Include="app.manifest" />
115115
</ItemGroup>
116116
<ItemGroup>
117-
<Manifest Include="app.manifest" />
117+
<None Include="packages.config" />
118118
</ItemGroup>
119119
<PropertyGroup Label="Globals">
120120
<VCProjectVersion>15.0</VCProjectVersion>
@@ -364,6 +364,6 @@
364364
<PropertyGroup>
365365
<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>
366366
</PropertyGroup>
367-
<Error Condition="!Exists('..\packages\Microsoft.Windows.WinMD.1.0.210311.4\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.WinMD.1.0.210311.4\build\native\Microsoft.Windows.WinMD.props'))" />
367+
<Error Condition="!Exists('..\packages\Microsoft.Windows.WinMD.1.0.210505.3\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.WinMD.1.0.210505.3\build\native\Microsoft.Windows.WinMD.props'))" />
368368
</Target>
369369
</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.210311.4" targetFramework="native" />
3+
<package id="Microsoft.Windows.WinMD" version="1.0.210505.3" targetFramework="native" />
44
</packages>

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.210311.4\build\native\Microsoft.Windows.WinMD.props" Condition="Exists('packages\Microsoft.Windows.WinMD.1.0.210311.4\build\native\Microsoft.Windows.WinMD.props')" />
3+
<Import Project="packages\Microsoft.Windows.WinMD.1.0.210505.3\build\native\Microsoft.Windows.WinMD.props" Condition="Exists('packages\Microsoft.Windows.WinMD.1.0.210505.3\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.210311.4\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.WinMD.1.0.210311.4\build\native\Microsoft.Windows.WinMD.props'))" />
264+
<Error Condition="!Exists('packages\Microsoft.Windows.WinMD.1.0.210505.3\build\native\Microsoft.Windows.WinMD.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Microsoft.Windows.WinMD.1.0.210505.3\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.210311.4" targetFramework="native" />
5+
<package id="Microsoft.Windows.WinMD" version="1.0.210505.3" targetFramework="native" />
66
</packages>

0 commit comments

Comments
 (0)