Merged Master into IDynamicInterfaceCastable

microsoft · Sep 25, 2020 · 4418c1b · 4418c1b
2 parents 1cb8c01 + e57b67c
commit 4418c1b
Show file tree

Hide file tree

Showing 97 changed files with 3,255 additions and 1,457 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,6 @@ global.json
 .nuget
 .nupkg
 nuget/Microsoft.Windows.CsWinRT.Prerelease.targets
+*.binlog
+vs_buildtools.exe
+.buildtools
diff --git a/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.exe.manifest b/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.exe.manifest
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+ <assemblyIdentity version="1.0.0.0" name="CppTestApp"/>
+ <file name="WinRT.Host.dll">
+ <activatableClass
+ name="AuthoringSample.BasicClass"
+ threadingModel="both"
+ xmlns="urn:schemas-microsoft-com:winrt.v1" />
+ <activatableClass
+ name="AuthoringSample.CustomWWW"
+ threadingModel="both"
+ xmlns="urn:schemas-microsoft-com:winrt.v1" />
+ <activatableClass
+ name="AuthoringSample.TestClass"
+ threadingModel="both"
+ xmlns="urn:schemas-microsoft-com:winrt.v1" />
+ </file>
+</assembly>
diff --git a/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj b/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props')" />
+ <ItemGroup Label="ProjectConfigurations">
+ <ProjectConfiguration Include="Debug|Win32">
+ <Configuration>Debug</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|Win32">
+ <Configuration>Release</Configuration>
+ <Platform>Win32</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Debug|x64">
+ <Configuration>Debug</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ <ProjectConfiguration Include="Release|x64">
+ <Configuration>Release</Configuration>
+ <Platform>x64</Platform>
+ </ProjectConfiguration>
+ </ItemGroup>
+ <PropertyGroup Label="Globals">
+ <ProjectGuid>{0212a7c5-8d3f-443c-9ebc-1f28091fdf88}</ProjectGuid>
+ <Keyword>Win32Proj</Keyword>
+ <RootNamespace>AuthoringConsumptionTest</RootNamespace>
+ <WindowsTargetPlatformVersion>10.0.19592.0</WindowsTargetPlatformVersion>
+ <ConfigurationType>Application</ConfigurationType>
+ <PlatformToolset>v142</PlatformToolset>
+ <CharacterSet>Unicode</CharacterSet>
+ <_WinMDPlatform>$(Platform)</_WinMDPlatform>
+ <_WinMDPlatform Condition="'$(Platform)' == 'Win32'">x86</_WinMDPlatform>
+ </PropertyGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+ <ImportGroup Label="ExtensionSettings" />
+ <ImportGroup Label="Shared" />
+ <ImportGroup Label="PropertySheets" />
+ <PropertyGroup Label="UserMacros" />
+ <ItemGroup>
+ <ClInclude Include="pch.h" />
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="test.cpp" />
+ <ClCompile Include="pch.cpp">
+ <PrecompiledHeader>Create</PrecompiledHeader>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="Directory.Build.targets" />
+ <None Include="packages.config" />
+ <None Include="WinRT.Host.runtimeconfig.json">
+ <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</DeploymentContent>
+ <DeploymentContent Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</DeploymentContent>
+ </None>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Projections\Windows\Windows.csproj">
+ <Project>{ffa9a78b-f53f-43ee-af87-24a80f4c330a}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\WinRT.Host.Shim\WinRT.Host.Shim.csproj">
+ <Project>{0bb8f82d-874e-45aa-bca3-20ce0562164a}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\WinRT.Host\WinRT.Host.vcxproj">
+ <Project>{7e33bcb7-19c5-4061-981d-ba695322708a}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\..\WinRT.Runtime\WinRT.Runtime.csproj">
+ <Project>{25244ced-966e-45f2-9711-1f51e951ff89}</Project>
+ </ProjectReference>
+ <ProjectReference Include="..\AuthoringSample\AuthoringSample.csproj">
+ <Project>{41e2a272-150f-42f5-ad40-047aad9088a0}</Project>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="AuthoringSample">
+ <HintPath>..\AuthoringSample\bin\$(_WinMDPlatform)\$(Configuration)\net5.0\AuthoringSample.winmd</HintPath>
+ <IsWinMDFile>true</IsWinMDFile>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="AuthoringConsumptionTest.exe.manifest" />
+ </ItemGroup>
+ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets')" />
+ <Import Project="..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets" Condition="Exists('..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" />
+ </ImportGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <ClCompile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <Optimization>Disabled</Optimization>
+ <PreprocessorDefinitions>X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>DebugFull</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <ClCompile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ </Link>
+ </ItemDefinitionGroup>
+ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <ClCompile>
+ <PrecompiledHeader>Use</PrecompiledHeader>
+ <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <PreprocessorDefinitions>X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+ <WarningLevel>Level3</WarningLevel>
+ <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+ </ClCompile>
+ <Link>
+ <GenerateDebugInformation>true</GenerateDebugInformation>
+ <SubSystem>Console</SubSystem>
+ <OptimizeReferences>true</OptimizeReferences>
+ <EnableCOMDATFolding>true</EnableCOMDATFolding>
+ </Link>
+ </ItemDefinitionGroup>
+ <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+ <PropertyGroup>
+ <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>
+ </PropertyGroup>
+ <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.props'))" />
+ <Error Condition="!Exists('..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Windows.CppWinRT.2.0.200703.9\build\native\Microsoft.Windows.CppWinRT.targets'))" />
+ <Error Condition="!Exists('..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.1.8.1.3\build\native\Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn.targets'))" />
+ </Target>
+</Project>
diff --git a/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj.filters b/Authoring/AuthoringConsumptionTest/AuthoringConsumptionTest.vcxproj.filters
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemGroup>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+ <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+ </Filter>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+ <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+ <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+ </Filter>
+ </ItemGroup>
+ <ItemGroup>
+ <ClInclude Include="pch.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ </ItemGroup>
+ <ItemGroup>
+ <ClCompile Include="pch.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="test.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ </ItemGroup>
+ <ItemGroup>
+ <None Include="packages.config" />
+ <None Include="Directory.Build.targets" />
+ <None Include="WinRT.Host.runtimeconfig.json" />
+ </ItemGroup>
+ <ItemGroup>
+ <Manifest Include="AuthoringConsumptionTest.exe.manifest" />
+ </ItemGroup>
+</Project>
diff --git a/Authoring/AuthoringConsumptionTest/Directory.Build.targets b/Authoring/AuthoringConsumptionTest/Directory.Build.targets
@@ -0,0 +1,15 @@
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <PropertyGroup>
+ <PrepareForRunDependsOn>CopyTestAssets;$(PrepareForRunDependsOn)</PrepareForRunDependsOn>
+ </PropertyGroup>
+
+ <Target Name="CopyTestAssets">
+ <Copy SourceFiles="$(BuildOutDir)WinRT.Host\bin\WinRT.Host.dll"
+ DestinationFiles="$(OutDir)WinRT.Host.dll" 
+ UseHardlinksIfPossible="false" SkipUnchangedFiles="true" />
+ </Target> 
+
+ <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.targets', '$(MSBuildThisFileDirectory)../'))" />
+
+</Project>
diff --git a/Authoring/AuthoringConsumptionTest/WinRT.Host.runtimeconfig.json b/Authoring/AuthoringConsumptionTest/WinRT.Host.runtimeconfig.json
@@ -0,0 +1,10 @@
+{
+ "runtimeOptions": {
+ "tfm": "net5.0",
+ "rollForward": "LatestMinor",
+ "framework": {
+ "name": "Microsoft.NETCore.App",
+ "version": "5.0.0-preview"
+ }
+ }
+}
diff --git a/Authoring/AuthoringConsumptionTest/packages.config b/Authoring/AuthoringConsumptionTest/packages.config
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1.3" targetFramework="native" />
+ <package id="Microsoft.Windows.CppWinRT" version="2.0.200703.9" targetFramework="native" />
+</packages>
diff --git a/Authoring/AuthoringConsumptionTest/pch.cpp b/Authoring/AuthoringConsumptionTest/pch.cpp
@@ -0,0 +1 @@
+#include "pch.h"
diff --git a/Authoring/AuthoringConsumptionTest/pch.h b/Authoring/AuthoringConsumptionTest/pch.h
@@ -0,0 +1,6 @@
+#pragma once
+#include <winrt/Windows.Foundation.h>
+#include <winrt/Windows.Foundation.Collections.h>
+#include <winrt/AuthoringSample.h>
+
+#include "gtest/gtest.h"