Improve hosting support experience

build/AzurePipelineTemplates/CsWinRT-Build-Steps.yml

@@ -255,8 +255,6 @@ steps:
     - task: CopyFiles@2 
       displayName: Stage WinRT.Host.Shim
       condition: and(succeeded(), eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'))
-      enabled: false
-      continueOnError: True
       inputs:
         SourceFolder: $(Build.SourcesDirectory)\src\Authoring\WinRT.Host.Shim\bin\$(BuildConfiguration)\net10.0
         Contents: |
@@ -295,6 +293,16 @@ steps:
           cswinrtprojectiongen.pdb
         TargetFolder: $(StagingFolder)\net10.0\native
 
+    - task: CopyFiles@2
+      displayName: Stage cswinrtwinmdgen
+      condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x64'), eq(variables['BuildPlatform'], 'arm64')), eq(variables['BuildConfiguration'], 'release'))
+      inputs:
+        SourceFolder: $(Build.SourcesDirectory)\src\WinRT.WinMD.Generator\bin\$(BuildConfiguration)\net10.0\win-$(BuildPlatform)\publish
+        Contents: |
+          cswinrtwinmdgen.exe
+          cswinrtwinmdgen.pdb
+        TargetFolder: $(StagingFolder)\net10.0\native
+
     - task: CopyFiles@2
       displayName: Stage WinRT.Generator.Tasks
       condition: and(succeeded(), eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildConfiguration'], 'release'))

build/AzurePipelineTemplates/CsWinRT-BuildAndTest-Stage-OneBranch.yml

@@ -73,6 +73,7 @@ jobs:
           net10.0/native/cswinrtinteropgen.exe;
           net10.0/native/cswinrtimplgen.exe;
           net10.0/native/cswinrtprojectiongen.exe;
+          net10.0/native/cswinrtwinmdgen.exe;
         search_root: $(StagingFolder)
 
     - task: onebranch.pipeline.signing@1

build/AzurePipelineTemplates/CsWinRT-PublishToNuGet-Steps.yml

@@ -95,7 +95,7 @@ steps:
       command: pack
       searchPatternPack: nuget/Microsoft.Windows.CsWinRT.nuspec
       configurationToPack: Release
-      buildProperties: cswinrt_nuget_version=$(NugetVersion);cswinrt_exe=$(Build.SourcesDirectory)\release_x86\native\cswinrt.exe;interop_winmd=$(Build.SourcesDirectory)\release_x86\native\WindowsRuntime.Internal.winmd;net10_runtime=$(Build.SourcesDirectory)\release_x86\net10.0\WinRT.Runtime.dll;net10_runtime_xml=$(Build.SourcesDirectory)\release_x86\net10.0\WinRT.Runtime.xml;source_generator=$(Build.SourcesDirectory)\release_x86\net10.0\WinRT.SourceGenerator.dll;winrt_shim=$(Build.SourcesDirectory)\release_x86\net10.0\WinRT.Host.Shim.dll;winrt_host_x86=$(Build.SourcesDirectory)\release_x86\native\WinRT.Host.dll;winrt_host_x64=$(Build.SourcesDirectory)\release_x64\native\WinRT.Host.dll;winrt_host_arm64=$(Build.SourcesDirectory)\release_arm64\native\WinRT.Host.dll;winrt_host_resource_x86=$(Build.SourcesDirectory)\release_x86\native\WinRT.Host.dll.mui;winrt_host_resource_x64=$(Build.SourcesDirectory)\release_x64\native\WinRT.Host.dll.mui;winrt_host_resource_arm64=$(Build.SourcesDirectory)\release_arm64\native\WinRT.Host.dll.mui;cswinrtinteropgen_x64=$(Build.SourcesDirectory)\release_x64\net10.0\native\cswinrtinteropgen.exe;cswinrtinteropgen_arm64=$(Build.SourcesDirectory)\release_arm64\net10.0\native\cswinrtinteropgen.exe;cswinrtimplgen_x64=$(Build.SourcesDirectory)\release_x64\net10.0\native\cswinrtimplgen.exe;cswinrtimplgen_arm64=$(Build.SourcesDirectory)\release_arm64\net10.0\native\cswinrtimplgen.exe;cswinrtprojectiongen_x64=$(Build.SourcesDirectory)\release_x64\net10.0\native\cswinrtprojectiongen.exe;cswinrtprojectiongen_arm64=$(Build.SourcesDirectory)\release_arm64\net10.0\native\cswinrtprojectiongen.exe;run_cswinrt_generator_task=$(Build.SourcesDirectory)\release_x86\netstandard2.0\WinRT.Generator.Tasks.dll;branch=$(Build.SourceBranchName);commit=$(Build.SourceVersion)
+      buildProperties: cswinrt_nuget_version=$(NugetVersion);cswinrt_exe=$(Build.SourcesDirectory)\release_x86\native\cswinrt.exe;interop_winmd=$(Build.SourcesDirectory)\release_x86\native\WindowsRuntime.Internal.winmd;net10_runtime=$(Build.SourcesDirectory)\release_x86\net10.0\WinRT.Runtime.dll;net10_runtime_xml=$(Build.SourcesDirectory)\release_x86\net10.0\WinRT.Runtime.xml;source_generator=$(Build.SourcesDirectory)\release_x86\net10.0\WinRT.SourceGenerator.dll;winrt_shim=$(Build.SourcesDirectory)\release_x86\net10.0\WinRT.Host.Shim.dll;winrt_host_x86=$(Build.SourcesDirectory)\release_x86\native\WinRT.Host.dll;winrt_host_x64=$(Build.SourcesDirectory)\release_x64\native\WinRT.Host.dll;winrt_host_arm64=$(Build.SourcesDirectory)\release_arm64\native\WinRT.Host.dll;winrt_host_resource_x86=$(Build.SourcesDirectory)\release_x86\native\WinRT.Host.dll.mui;winrt_host_resource_x64=$(Build.SourcesDirectory)\release_x64\native\WinRT.Host.dll.mui;winrt_host_resource_arm64=$(Build.SourcesDirectory)\release_arm64\native\WinRT.Host.dll.mui;cswinrtinteropgen_x64=$(Build.SourcesDirectory)\release_x64\net10.0\native\cswinrtinteropgen.exe;cswinrtinteropgen_arm64=$(Build.SourcesDirectory)\release_arm64\net10.0\native\cswinrtinteropgen.exe;cswinrtimplgen_x64=$(Build.SourcesDirectory)\release_x64\net10.0\native\cswinrtimplgen.exe;cswinrtimplgen_arm64=$(Build.SourcesDirectory)\release_arm64\net10.0\native\cswinrtimplgen.exe;cswinrtprojectiongen_x64=$(Build.SourcesDirectory)\release_x64\net10.0\native\cswinrtprojectiongen.exe;cswinrtprojectiongen_arm64=$(Build.SourcesDirectory)\release_arm64\net10.0\native\cswinrtprojectiongen.exe;cswinrtwinmdgen_x64=$(Build.SourcesDirectory)\release_x64\net10.0\native\cswinrtwinmdgen.exe;cswinrtwinmdgen_arm64=$(Build.SourcesDirectory)\release_arm64\net10.0\native\cswinrtwinmdgen.exe;run_cswinrt_generator_task=$(Build.SourcesDirectory)\release_x86\netstandard2.0\WinRT.Generator.Tasks.dll;branch=$(Build.SourceBranchName);commit=$(Build.SourceVersion)
       packDestination: $(ob_outputDirectory)\packages
 
   - ${{ if eq(parameters.IsGitHub, false) }}:

build/AzurePipelineTemplates/CsWinRT-Test-Steps.yml

@@ -70,6 +70,18 @@ steps:
         dir _build\$(BuildPlatform)\$(BuildConfiguration)\AuthoringConsumptionTest\bin
         _build\$(BuildPlatform)\$(BuildConfiguration)\AuthoringConsumptionTest\bin\AuthoringConsumptionTest.exe --gtest_output=xml:AUTHORINGTEST-$(Build.BuildNumber).xml 
 
+# Run Multi-Component Authoring Consumption Tests
+  - task: CmdLine@2
+    displayName: Run Multi-Component Authoring Consumption Tests
+    enabled: true
+    condition: and(succeeded(), or(eq(variables['BuildPlatform'], 'x86'), eq(variables['BuildPlatform'], 'x64')))
+    continueOnError: True
+    inputs:
+      workingDirectory: $(Build.SourcesDirectory)\src
+      script: |
+        dir _build\$(BuildPlatform)\$(BuildConfiguration)\AuthoringConsumptionTest2\bin
+        _build\$(BuildPlatform)\$(BuildConfiguration)\AuthoringConsumptionTest2\bin\AuthoringConsumptionTest2.exe --gtest_output=xml:AUTHORINGTEST2-$(Build.BuildNumber).xml 
+
 # Run WUX Tests
   - task: CmdLine@2
     displayName: Run WUX Tests

nuget/Microsoft.Windows.CsWinRT.Authoring.targets

@@ -68,7 +68,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
   --> 
   <ItemGroup Condition="'$(CsWinRTAotExportsEnabled)' != 'true'"> 
 
-    <None Condition="Exists('$(CsWinRTPath)lib\net10.0\WinRT.Host.Shim.dll')" Include="$(CsWinRTPath)lib\net10.0\WinRT.Host.Shim.dll">
+    <None Condition="Exists('$(CsWinRTPath)hosting\net10.0\WinRT.Host.Shim.dll')" Include="$(CsWinRTPath)hosting\net10.0\WinRT.Host.Shim.dll">
       <TargetPath>WinRT.Host.Shim.dll</TargetPath>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -172,6 +172,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
         <CsWinRTComponent>true</CsWinRTComponent>
         <!-- Expose TFM so native consumers can generate a compatible temp project -->
         <CsWinRTComponentTargetFramework>$(TargetFramework)</CsWinRTComponentTargetFramework>
+        <!-- Expose WindowsSdkPackageVersion so native consumers' synthesized aggregator
+             csproj resolves the same Microsoft.Windows.SDK.NET.Ref pack version. -->
+        <CsWinRTComponentWindowsSdkPackageVersion>$(WindowsSdkPackageVersion)</CsWinRTComponentWindowsSdkPackageVersion>
       </TargetPathWithTargetPlatformMoniker>
     </ItemGroup>
 
@@ -294,7 +297,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     -->
     <ItemGroup Condition="'$(CsWinRTAotExportsEnabled)' != 'true'">
 
-      <Content  Include="$(CsWinRTPath)lib\net10.0\WinRT.Host.Shim.dll">
+      <Content  Include="$(CsWinRTPath)hosting\net10.0\WinRT.Host.Shim.dll">
         <Pack>true</Pack>
         <PackagePath>lib\$(TargetFramework)</PackagePath>
       </Content>

nuget/Microsoft.Windows.CsWinRT.CsWinRTGen.targets

@@ -350,8 +350,9 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       StandardErrorImportance="$(CsWinRTGeneratorStandardErrorImportance)"
       LogStandardErrorAsError="$(CsWinRTGeneratorLogStandardErrorAsError)" />
 
-    <!-- Set the metadata for the interop .dll item and add it to the required output groups -->
-    <ItemGroup Condition="'$(_HasMergedProjectionWinMDInputs)' == 'true'">
+    <!-- Only wire up the merged projection DLL if it was actually produced
+         (i.e. the generator found types to project). -->
+    <ItemGroup Condition="Exists('$(_CsWinRTGeneratorMergedProjectionAssemblyPath)')">
       <CsWinRTGeneratorMergedProjectionPath Include="$(_CsWinRTGeneratorMergedProjectionAssemblyPath)">
         <AssemblyName>WinRT.Projection</AssemblyName>
         <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>