C++/WinRT 2.0 updates

src/library/impl/meta_reader/filter.h

@@ -20,7 +20,8 @@ namespace xlang::meta::reader
 
             std::sort(m_rules.begin(), m_rules.end(), [](auto const& lhs, auto const& rhs)
             {
-                return lhs.first.size() > rhs.first.size();
+                auto size_compare = int(lhs.first.size()) - int(rhs.first.size());
+                return (size_compare > 0) || ((size_compare == 0) && !lhs.second);
             });
         }
 

src/package/natvis/cppwinrtvisualizer.vcxproj

@@ -26,7 +26,15 @@
     <TargetName>cppwinrtvisualizer</TargetName>
     <NugetPackagesDirectory>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)packages\))</NugetPackagesDirectory>
   </PropertyGroup>
-  <Import Project="Cpp.props" />
+  <PropertyGroup Condition="'$(VisualStudioVersion)' &gt;= '16.0'">
+    <PlatformToolset>v142</PlatformToolset>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(VisualStudioVersion)' &lt; '16.0'">
+    <PlatformToolset>v141</PlatformToolset>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>

src/package/nuget/CMakeLists.txt

@@ -1,21 +1,23 @@
 cmake_minimum_required(VERSION 3.9)
 
 # The Microsoft.Windows.CppWinRT NuGet package is only targeted at Visual Studio (on Windows)
-if (WIN32)
+if (WIN32 AND ("$ENV{VSCMD_ARG_TGT_ARCH}" STREQUAL "x86"))
 
 file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/build_tools/nuget.exe" nuget_exe)
 file(TO_NATIVE_PATH "${CMAKE_CURRENT_BINARY_DIR}" cppwinrt_nupkg_dir)
 file(TO_NATIVE_PATH "${cppwinrt_nupkg_dir}/Microsoft.Windows.CppWinRT.${XLANG_BUILD_VERSION}.nupkg" cppwinrt_nupkg)
 
+get_target_property(cppwinrt_exe cppwinrt "cppwinrt_exe")
+
 file(DOWNLOAD https://dist.nuget.org/win-x86-commandline/latest/nuget.exe ${nuget_exe})
 
 add_custom_command(OUTPUT ${cppwinrt_nupkg}
-    COMMAND ${nuget_exe} pack ${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Windows.CppWinRT.nuspec -Version ${XLANG_BUILD_VERSION} -OutputDirectory ${CMAKE_CURRENT_BINARY_DIR}
-    DEPENDS ${XLANG_BUILD_VERSION_h}
+    COMMAND ${nuget_exe} pack ${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Windows.CppWinRT.nuspec -Properties cppwinrt_exe=${cppwinrt_exe}; -Version ${XLANG_BUILD_VERSION} -OutputDirectory ${CMAKE_CURRENT_BINARY_DIR} -NonInteractive -Verbosity Detailed
+    DEPENDS ${XLANG_BUILD_VERSION_h} ${CMAKE_CURRENT_SOURCE_DIR}/Microsoft.Windows.CppWinRT.nuspec
 )
 
-add_custom_target(make_cppwinrt_nupkg ALL DEPENDS ${cppwinrt_nupkg})
+add_custom_target(make_cppwinrt_nupkg ALL DEPENDS ${cppwinrt_nupkg} cppwinrt)
 
 set_target_properties(make_cppwinrt_nupkg PROPERTIES "cppwinrt_nupkg_dir" ${cppwinrt_nupkg_dir})
 
-endif(WIN32)
+endif()

src/package/nuget/Microsoft.Windows.CppWinRT.nuspec

@@ -13,10 +13,13 @@
     <copyright>© Microsoft Corporation. All rights reserved.</copyright>
     <license type="file">LICENSE</license>
     <projectUrl>https://github.com/Microsoft/xlang/tree/master/src/package/nuget</projectUrl>
+    <iconUrl>https://aka.ms/cppwinrt.ico</iconUrl>
   </metadata>
   <files>
     <file src="..\LICENSE"/>
+    <file src="$cppwinrt_exe$" target="bin"/>
     <file src="Microsoft.Windows.CppWinRT.targets" target="build\native"/>
     <file src="Microsoft.Windows.CppWinRT.props" target="build\native"/>
+    <file src="readme.txt" target="" />
   </files>
 </package>

src/package/nuget/Microsoft.Windows.CppWinRT.props

@@ -3,24 +3,21 @@
 Copyright (C) Microsoft Corporation. All rights reserved.
 ***********************************************************************************************
 -->
-<!--Set compiler and linker options for projects requiring C++/WinRT. As these options can
-    potentially break builds, they must be explicitly opted into by adding a reference to the 
-    Microsoft.Cpp.CppWinRT Nuget package, or by adding the CppWinRTEnabled project property. -->
+<!--Set compiler and linker options for projects requiring C++/WinRT. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
     <PropertyGroup>
         <PreferredToolArchitecture>x64</PreferredToolArchitecture>
         <CanReferenceWinRT>true</CanReferenceWinRT>
-        <GeneratedFilesDir Condition="'$(GeneratedFilesDir)' == ''">Generated Files\</GeneratedFilesDir>
         <CppWinRTPackage Condition="'$(CppWinRTEnabled)' != 'true'">true</CppWinRTPackage>
         <CppWinRTPackage Condition="'$(CppWinRTPackage)' != 'true'">false</CppWinRTPackage>
-        <XamlLanguage>CppWinRT</XamlLanguage>
+        <XamlLanguage Condition="'$(CppWinRTProjectLanguage)' != 'C++/CX'">CppWinRT</XamlLanguage>
         <IsNativeLanguage>true</IsNativeLanguage>
     </PropertyGroup>
 
     <ItemDefinitionGroup>
         <ClCompile>
-            <CompileAsWinRT Condition="'%(ClCompile.CompileAsWinRT)' == ''">false</CompileAsWinRT>
+            <CompileAsWinRT Condition="'$(CppWinRTProjectLanguage)' != 'C++/CX' And '%(ClCompile.CompileAsWinRT)' == ''">false</CompileAsWinRT>
             <LanguageStandard Condition="'%(ClCompile.LanguageStandard)' == ''">stdcpp17</LanguageStandard>
             <AdditionalOptions>/bigobj /await %(AdditionalOptions)</AdditionalOptions>
             <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(GeneratedFilesDir)</AdditionalIncludeDirectories>