Port WinMD generator

nuget/Microsoft.Windows.CsWinMD.Generator.targets

@@ -0,0 +1,100 @@
+<!--
+***********************************************************************************************
+Copyright (C) Microsoft Corporation. All rights reserved.
+***********************************************************************************************
+-->
+<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Setup common properties for '_RunCsWinRTWinMDGenerator' below -->
+  <PropertyGroup>
+
+    <!-- Output paths -->
+    <CsWinRTWinMDOutputDirectory Condition="'$(CsWinRTWinMDOutputDirectory)' == ''">$(IntermediateOutputPath)</CsWinRTWinMDOutputDirectory>
+    <_CsWinRTWinMDOutputPath>$(CsWinRTWinMDOutputDirectory)$(AssemblyName).winmd</_CsWinRTWinMDOutputPath>
+
+    <!--
+      Set the path of the file with the hash of all input properties for 'cswinrtwinmdgen'.
+      This is needed to make the target incremental with respect to property changes.
+    -->
+    <_RunCsWinRTWinMDGeneratorPropertyInputsCachePath Condition="'$(_RunCsWinRTWinMDGeneratorPropertyInputsCachePath)' == ''">$(IntermediateOutputPath)$(MSBuildProjectName).cswinrtwinmdgen.cache</_RunCsWinRTWinMDGeneratorPropertyInputsCachePath>
+    <_RunCsWinRTWinMDGeneratorPropertyInputsCachePath>$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '$(_RunCsWinRTWinMDGeneratorPropertyInputsCachePath)'))</_RunCsWinRTWinMDGeneratorPropertyInputsCachePath>
+  </PropertyGroup>
+
+  <!--
+    ============================================================
+                    _ResolveCsWinRTWinMDGenToolsDirectory
+
+    Resolves the location of the WinMD generator tools.
+    Uses the shared _CsWinRTToolsDirectory from _ResolveCsWinRToolsDirectory
+    when available (NuGet package), with a dev-only fallback.
+    ============================================================
+  -->
+  <Target Name="_ResolveCsWinRTWinMDGenToolsDirectory" DependsOnTargets="ResolveAssemblyReferences;_ResolveCsWinRToolsDirectory" BeforeTargets="_ComputeRunCsWinRTWinMDGeneratorCache">
+    <PropertyGroup>
+      <CsWinRTWinMDGenEffectiveToolsDirectory Condition="'$(CsWinRTWinMDGenEffectiveToolsDirectory)' == ''">$(_CsWinRTToolsDirectory)</CsWinRTWinMDGenEffectiveToolsDirectory>
+    </PropertyGroup>
+  </Target>
+
+  <!--
+    ============================================================
+                    _ComputeRunCsWinRTWinMDGeneratorCache
+
+    Computes a hash of all input properties to detect when re-generation is needed.
+    ============================================================
+  -->
+  <Target
+    Name="_ComputeRunCsWinRTWinMDGeneratorCache"
+    DependsOnTargets="CoreCompile;_ResolveCsWinRTWinMDGenToolsDirectory">
+
+    <ItemGroup>
+      <_RunCsWinRTWinMDGeneratorInputsCacheToHash Include="$(CsWinRTWinMDGenEffectiveToolsDirectory)" />
+      <_RunCsWinRTWinMDGeneratorInputsCacheToHash Include="$(CsWinRTUseWindowsUIXamlProjections)" />
+      <_RunCsWinRTWinMDGeneratorInputsCacheToHash Include="$(AssemblyVersion)" />
+    </ItemGroup>
+
+    <Hash ItemsToHash="@(_RunCsWinRTWinMDGeneratorInputsCacheToHash)">
+      <Output TaskParameter="HashResult" PropertyName="_RunCsWinRTWinMDGeneratorInputsCacheHash" />
+    </Hash>
+
+    <WriteLinesToFile
+      Lines="$(_RunCsWinRTWinMDGeneratorInputsCacheHash)"
+      File="$(_RunCsWinRTWinMDGeneratorPropertyInputsCachePath)"
+      Overwrite="true"
+      WriteOnlyWhenDifferent="true" />
+  </Target>
+
+  <!--
+    ============================================================
+                    _RunCsWinRTWinMDGenerator
+
+    Runs 'cswinrtwinmdgen' to produce a .winmd file from the compiled assembly.
+    This target runs after CoreCompile since it needs the compiled DLL.
+    ============================================================
+  -->
+  <UsingTask Condition="'$(CsWinRTGeneratorTasksOverriden2)' != 'true'" TaskName="RunCsWinRTWinMDGenerator" AssemblyFile="$(CsWinRTGenTasksAssembly)" />
+  <Target
+    Name="_RunCsWinRTWinMDGenerator"
+    DependsOnTargets="CoreCompile;_ComputeRunCsWinRTWinMDGeneratorCache"
+    AfterTargets="CoreCompile"
+    Inputs="@(IntermediateAssembly);@(ReferencePathWithRefAssemblies);$(_RunCsWinRTWinMDGeneratorPropertyInputsCachePath)"
+    Outputs="$(_CsWinRTWinMDOutputPath)"
+    Condition="'$(CsWinRTComponent)' == 'true'">
+
+    <!-- Invoke 'cswinrtwinmdgen' -->
+    <RunCsWinRTWinMDGenerator
+      InputAssemblyPath="@(IntermediateAssembly)"
+      ReferenceAssemblyPaths="@(ReferencePathWithRefAssemblies)"
+      OutputWinmdPath="$(_CsWinRTWinMDOutputPath)"
+      AssemblyVersion="$(AssemblyVersion)"
+      UseWindowsUIXamlProjections="$(CsWinRTUseWindowsUIXamlProjections)"
+      CsWinRTToolsDirectory="$(CsWinRTWinMDGenEffectiveToolsDirectory)"
+      CsWinRTToolsArchitecture="$(CsWinRTToolsArchitecture)"
+      StandardOutputImportance="$(CsWinRTGeneratorStandardOutputImportance)"
+      StandardErrorImportance="$(CsWinRTGeneratorStandardErrorImportance)"
+      LogStandardErrorAsError="$(CsWinRTGeneratorLogStandardErrorAsError)" />
+
+    <!-- Make the .winmd available as an output -->
+    <ItemGroup>
+      <FileWrites Include="$(_CsWinRTWinMDOutputPath)" />
+    </ItemGroup>
+  </Target>
+</Project>

nuget/Microsoft.Windows.CsWinRT.targets

@@ -586,6 +586,7 @@ $(CsWinRTInternalProjection)
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Prerelease.targets" Condition="Exists('$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Prerelease.targets')"/>
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.Authoring.targets" Condition="'$(CsWinRTComponent)' == 'true'"/>
   <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinRT.CsWinRTGen.targets"/>
+  <Import Project="$(MSBuildThisFileDirectory)Microsoft.Windows.CsWinMD.Generator.targets" Condition="'$(CsWinRTComponent)' == 'true'"/>
 
   <!-- Default values for all custom CsWinRT runtime feature switches -->
   <PropertyGroup>

src/Directory.Build.props

@@ -44,6 +44,7 @@
     <CsWinRTInteropGenEffectiveToolsDirectory>$(MSBuildThisFileDirectory)WinRT.Interop.Generator\bin\$(Configuration)\net10.0\$(_CsWinRTToolsArchFolder)</CsWinRTInteropGenEffectiveToolsDirectory>
     <CsWinRTImplEffectiveToolsDirectory>$(MSBuildThisFileDirectory)WinRT.Impl.Generator\bin\$(Configuration)\net10.0\$(_CsWinRTToolsArchFolder)</CsWinRTImplEffectiveToolsDirectory>
     <CsWinRTMergedProjectionEffectiveToolsDirectory>$(MSBuildThisFileDirectory)WinRT.Projection.Generator\bin\$(Configuration)\net10.0\$(_CsWinRTToolsArchFolder)</CsWinRTMergedProjectionEffectiveToolsDirectory>
+    <CsWinRTWinMDGenEffectiveToolsDirectory>$(MSBuildThisFileDirectory)WinRT.WinMD.Generator\bin\$(Configuration)\net10.0\$(_CsWinRTToolsArchFolder)</CsWinRTWinMDGenEffectiveToolsDirectory>
     <CsWinRTToolsArchitecture>AnyCPU</CsWinRTToolsArchitecture>
   </PropertyGroup>
 

src/Tests/AuthoringTest/AuthoringTest.csproj

@@ -42,7 +42,6 @@
   <ItemGroup>    
     <ProjectReference Include="..\..\Projections\Windows\Windows.csproj" />    
     <ProjectReference Include="..\..\Projections\WinAppSDK\WinAppSDK.csproj" />
-    <ProjectReference Include="..\..\Authoring\WinRT.SourceGenerator.Roslyn4120\WinRT.SourceGenerator.Roslyn4120.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
 
     <ProjectReference Include="..\..\cswinrt\cswinrt.vcxproj" />
   </ItemGroup>