Add CsWinRT projection producing project for deployment API (#4949)

## Change Produce a CsWinRT projection for Microsoft.Management.Deployment. Move to CsWinRT 2.1.6 across the solution.
microsoft · Nov 18, 2024 · 5645e0c · 5645e0c
1 parent ff86443
commit 5645e0c
Show file tree

Hide file tree

Showing 16 changed files with 327 additions and 246 deletions.
diff --git a/.github/actions/spelling/expect.txt b/.github/actions/spelling/expect.txt
@@ -19,6 +19,7 @@ AMap
 Amd
 amrutha
 ansistring
+Aot
 APARTMENTTHREADED
 apfn
 apicontract

diff --git a/src/AppInstallerCLI.sln b/src/AppInstallerCLI.sln
diff --git a/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj b/src/AppInstallerCLIE2ETests/AppInstallerCLIE2ETests.csproj
@@ -9,10 +9,9 @@
     <DocumentationFile>$(OutDir)\AppInstallerCLIE2ETests.xml</DocumentationFile>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -30,7 +29,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Microsoft.Msix.Utils" Version="2.1.1" />
     <PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
     <PackageReference Include="nunit" Version="3.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.15.1" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />

diff --git a/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj b/src/ConfigurationRemotingServer/ConfigurationRemotingServer.csproj
@@ -11,10 +11,9 @@
     <SelfContained>true</SelfContained>
     <RuntimeIdentifiers>win10-x64;win10-x86;win10-arm;win10-arm64</RuntimeIdentifiers>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Platform)' == 'x64' ">
@@ -34,7 +33,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj b/...ft.Management.Configuration.Processor/Microsoft.Management.Configuration.Processor.csproj
@@ -19,10 +19,9 @@
     <Configurations>Debug;Release;ReleaseStatic</Configurations>
     <CsWinRTEnableLogging>true</CsWinRTEnableLogging>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -43,7 +42,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.8" GeneratePathProperty="true">
       <ExcludeAssets>contentFiles</ExcludeAssets>
     </PackageReference>

diff --git a/....Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj b/....Management.Configuration.Projection/Microsoft.Management.Configuration.Projection.csproj
@@ -7,11 +7,11 @@
     <Nullable>enable</Nullable>
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
     <Configurations>Debug;Release;ReleaseStatic</Configurations>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -28,7 +28,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj b/...ft.Management.Configuration.UnitTests/Microsoft.Management.Configuration.UnitTests.csproj
@@ -8,10 +8,9 @@
     <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
     <RuntimeIdentifiers>win10-x64;win10-x86;win10-arm;win10-arm64</RuntimeIdentifiers>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -24,7 +23,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

diff --git a/...ent.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj b/...ent.Deployment.CsWinRTProjection/Microsoft.Management.Deployment.CsWinRTProjection.csproj
@@ -0,0 +1,44 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFrameworks>net8.0-windows10.0.22000.0</TargetFrameworks>
+    <Platform>AnyCpu</Platform>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\$(MSBuildProjectName)\</OutputPath>
+    <Configurations>Debug;Release;ReleaseStatic</Configurations>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <IsAotCompatible>true</IsAotCompatible>
+    <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
+    <!--
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    -->
+    <WindowsSdkPackageVersion>10.0.22000.53</WindowsSdkPackageVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <CsWinRTIncludes>Microsoft.Management.Deployment</CsWinRTIncludes>
+    <CsWinRTGeneratedFilesDir>$(OutDir)</CsWinRTGeneratedFilesDir>
+    <CsWinRTWindowsMetadata>10.0.22000.0</CsWinRTWindowsMetadata>
+    <!-- Ensure Support for Windows 10, Version 1809 -->
+    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Workaround for MSB3271 error on processor architecture mismatch -->
+    <ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>None</ResolveAssemblyWarnOrErrorOnTargetArchitectureMismatch>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Microsoft.Management.Deployment\Microsoft.Management.Deployment.vcxproj">
+      <OutputItemType>Content</OutputItemType>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ReferenceOutputAssembly>True</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+
+</Project>
diff --git a/...rosoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj b/...rosoft.Management.Deployment.Projection/Microsoft.Management.Deployment.Projection.csproj
@@ -8,14 +8,13 @@
     <OutputType>Library</OutputType>
     <Configurations>Debug;Release;ReleaseStatic</Configurations>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
   </ItemGroup>
 
   <!-- CsWinRT properties -->

diff --git a/src/PowerShell/CommonFiles/WinGetAssemblyLoadContext.cs b/src/PowerShell/CommonFiles/WinGetAssemblyLoadContext.cs
@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="WinGetAssemblyLoadContext.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -81,6 +81,17 @@ internal static Assembly ResolvingHandler(AssemblyLoadContext context, AssemblyN
             return null;
         }
 
+        /// <summary>
+        /// Handler to resolve unmanaged assemblies.
+        /// </summary>
+        /// <param name="assembly">Assembly initiating the unmanaged load.</param>
+        /// <param name="unmanagedDllName">Unmanaged dll name.</param>
+        /// <returns>The assembly ptr, zero if not in our assembly location.</returns>
+        internal static IntPtr ResolvingUnmanagedDllHandler(Assembly assembly, string unmanagedDllName)
+        {
+            return WinGetAcl.LoadUnmanagedDll(unmanagedDllName);
+        }
+
         /// <inheritdoc/>
         protected override Assembly Load(AssemblyName assemblyName)
         {

diff --git a/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj b/src/PowerShell/Microsoft.WinGet.Client.Cmdlets/Microsoft.WinGet.Client.Cmdlets.csproj
@@ -7,11 +7,11 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DesktopFramework>net48</DesktopFramework>
     <Configurations>Debug;Release;ReleaseStatic</Configurations>
+    <CsWinRTCcwLookupTableGeneratorEnabled>false</CsWinRTCcwLookupTableGeneratorEnabled>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -57,7 +57,7 @@
 
   <!-- This project doesn't reference it directly, but if I don't add it here it will fail with NETSDK1130 *.winmd cannot be referenced. -->
   <ItemGroup Condition="'$(TargetFramework)' == '$(CoreFramework)'">
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj b/src/PowerShell/Microsoft.WinGet.Client.Engine/Microsoft.WinGet.Client.Engine.csproj
@@ -8,11 +8,11 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <DesktopFramework>net48</DesktopFramework>
     <Configurations>Debug;Release;ReleaseStatic</Configurations>
+    <CsWinRTCcwLookupTableGeneratorEnabled>false</CsWinRTCcwLookupTableGeneratorEnabled>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -54,7 +54,7 @@
     <PackageReference Include="System.Security.Principal.Windows" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" Condition="'$(TargetFramework)' == '$(DesktopFramework)'" />
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" Condition="'$(TargetFramework)' == '$(CoreFramework)'" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" Condition="'$(TargetFramework)' == '$(CoreFramework)'" />
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.22000.196" PrivateAssets="all" Condition="'$(TargetFramework)' == '$(DesktopFramework)'" />
     <PackageReference Include="System.Net.Http" Version="4.3.4" Condition="'$(TargetFramework)' == '$(DesktopFramework)'" />
   </ItemGroup>

diff --git a/...hell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj b/...hell/Microsoft.WinGet.Configuration.Cmdlets/Microsoft.WinGet.Configuration.Cmdlets.csproj
@@ -11,11 +11,11 @@
     <BuildOutputDirectory>$(SolutionDir)$(Platform)\$(Configuration)\</BuildOutputDirectory>
     <RootNamespace>Microsoft.WinGet.Configuration</RootNamespace>
     <Configurations>Debug;Release;ReleaseStatic</Configurations>
+    <CsWinRTCcwLookupTableGeneratorEnabled>false</CsWinRTCcwLookupTableGeneratorEnabled>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -48,7 +48,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Resolver/ModuleInit.cs b/src/PowerShell/Microsoft.WinGet.Configuration.Cmdlets/Resolver/ModuleInit.cs
@@ -1,4 +1,4 @@
-// -----------------------------------------------------------------------------
+// -----------------------------------------------------------------------------
 // <copyright file="ModuleInit.cs" company="Microsoft Corporation">
 //     Copyright (c) Microsoft Corporation. Licensed under the MIT License.
 // </copyright>
@@ -30,11 +30,13 @@ public void OnImport()
             }
 
             AssemblyLoadContext.Default.Resolving += WinGetAssemblyLoadContext.ResolvingHandler;
+            AssemblyLoadContext.Default.ResolvingUnmanagedDll += WinGetAssemblyLoadContext.ResolvingUnmanagedDllHandler;
         }
 
         /// <inheritdoc/>
         public void OnRemove(PSModuleInfo module)
         {
+            AssemblyLoadContext.Default.ResolvingUnmanagedDll -= WinGetAssemblyLoadContext.ResolvingUnmanagedDllHandler;
             AssemblyLoadContext.Default.Resolving -= WinGetAssemblyLoadContext.ResolvingHandler;
         }
     }

diff --git a/...rShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj b/...rShell/Microsoft.WinGet.Configuration.Engine/Microsoft.WinGet.Configuration.Engine.csproj
@@ -10,11 +10,11 @@
     <DocumentationFile>$(OutputPath)\$(MSBuildProjectName).xml</DocumentationFile>
     <RuntimeIdentifier>win</RuntimeIdentifier>
     <Configurations>Debug;Release;ReleaseStatic</Configurations>
+    <CsWinRTCcwLookupTableGeneratorEnabled>false</CsWinRTCcwLookupTableGeneratorEnabled>
     <!--
-    Forcing this version to continue using an older CsWinRT release while issues are resolved.
-    !!! Remove this on the next Microsoft.Windows.CsWinRT package version update. !!!
+    !!! Remove or update this on the next Microsoft.Windows.CsWinRT package version update. !!!
     -->
-    <WindowsSdkPackageVersion>10.0.22000.34</WindowsSdkPackageVersion>
+    <WindowsSdkPackageVersion>10.0.22000.52</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -48,7 +48,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.4" />
+    <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.1.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1 b/src/PowerShell/scripts/Initialize-LocalWinGetModules.ps1
@@ -49,7 +49,8 @@ class WinGetModule
     {
         $this.Name = $n
         $this.ModuleRoot = $m
-        $this.Output = "$o\$($this.Name)\"
+        $this.Output = Join-Path $o $this.Name
+        New-Item $this.Output -ItemType Directory -ErrorAction SilentlyContinue
 
         if (Get-Module -Name $this.Name)
         {
@@ -59,14 +60,15 @@ class WinGetModule
 
     [void]PrepareScriptFiles()
     {
-        Write-Verbose "Copying files: $($this.ModuleRoot) -> $($this.Output)"
+        Write-Verbose "Copying script files: $($this.ModuleRoot) -> $($this.Output)"
         xcopy $this.ModuleRoot $this.Output /d /s /f /y
     }
 
     [void]PrepareBinaryFiles([string] $buildRoot, [string] $config)
     {
+        Write-Verbose "Copying binary files: $buildRoot\AnyCpu\$config\PowerShell\$($this.Name)\* -> $($this.Output)"
         $copyErrors = $null
-        Copy-Item "$buildRoot\AnyCpu\$config\PowerShell\$($this.Name)" $this.Output -Force -Recurse -ErrorVariable copyErrors -ErrorAction SilentlyContinue
+        Copy-Item "$buildRoot\AnyCpu\$config\PowerShell\$($this.Name)\*" $this.Output -Force -Recurse -ErrorVariable copyErrors -ErrorAction SilentlyContinue
         $copyErrors | ForEach-Object { Write-Warning $_ }
     }