Merge pull request #663 from microsoft/staging

Release - 5/21/23
microsoft · May 22, 2023 · 6128210 · 6128210
2 parents 86b5d4e + 6884f98
commit 6128210
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 2 deletions.
diff --git a/build/azure-pipelines.yml b/build/azure-pipelines.yml
@@ -23,7 +23,7 @@ parameters:
     - Release
 
 variables:
-  MSIXVersion: '0.107'
+  MSIXVersion: '0.137'
   SDKVersion: '0.100'
   solution: '**/DevHome.sln'
   appxPackageDir: 'AppxPackages'

diff --git a/src/DevHome.csproj b/src/DevHome.csproj
@@ -36,6 +36,9 @@
         <PackageReference Include="System.Management" Version="7.0.0" />
         <PackageReference Include="WinUIEx" Version="1.8.0" />
         <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.1" />
+        <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.8" GeneratePathProperty="true">
+            <ExcludeAssets>contentFiles</ExcludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
@@ -100,4 +103,42 @@
         <DefineConstants Condition="'$(BuildRing)'=='Canary'">$(DefineConstants);CANARY_BUILD</DefineConstants>
         <DefineConstants Condition="'$(BuildRing)'=='Stable'">$(DefineConstants);STABLE_BUILD</DefineConstants>
     </PropertyGroup>
+
+    <!-- PowerShell requires the content files from their nuget package to be next to System.Management.Automation.dll
+         This won't happen automatically for 'dotnet publish -r <RID>'
+         Here we explicitly exclude the content files, copy them manually to the output directory
+         and then add them as payload to the package to the right location.
+         https://github.com/PowerShell/PowerShell/issues/15274#issuecomment-984028028
+    -->
+    <Target Name="PwshFiles" AfterTargets="BeforeBuild">
+        <ItemGroup>
+            <RefFiles Include="$(PkgMicrosoft_PowerShell_SDK)\contentFiles\any\any\ref\*.*" />
+            <WinModuleFiles Include="$(PkgMicrosoft_PowerShell_SDK)\contentFiles\any\any\runtimes\win\lib\net6.0\Modules\**\*.*" />
+        </ItemGroup>
+        <Copy SourceFiles="@(RefFiles)" DestinationFolder="$(TargetDir)\ref\" />
+        <Copy SourceFiles="@(WinModuleFiles)" DestinationFolder="$(TargetDir)\Modules\%(RecursiveDir)\" />
+    </Target>
+
+    <Target Name="ExtraAppxFilesInPackage" AfterTargets="_ComputeAppxPackagePayload">
+
+        <!-- If the binary is not here, then it was a 'dotnet publish' or 'dotnet build' -->
+        <PropertyGroup Condition="!Exists('$(TargetDir)\System.Management.Automation.dll')">
+            <ModulePath>runtimes\win\lib\net6.0\</ModulePath>
+        </PropertyGroup>
+
+        <ItemGroup>
+            <AdditionalPackageFile Include="$(TargetDir)\ref\*.*">
+                <PackagePath>ref</PackagePath>
+            </AdditionalPackageFile>
+            <AdditionalPackageFile Include="$(TargetDir)\Modules\**\*.*">
+              <PackagePath>$(ModulePath)Modules</PackagePath>
+            </AdditionalPackageFile>
+        </ItemGroup>
+
+        <ItemGroup>
+            <AppxPackagePayload Include="%(AdditionalPackageFile.Identity)" KeepDuplicates="false">
+                <TargetPath>%(AdditionalPackageFile.PackagePath)\%(AdditionalPackageFile.RecursiveDir)%(AdditionalPackageFile.Filename)%(AdditionalPackageFile.Extension)</TargetPath>
+            </AppxPackagePayload>
+        </ItemGroup>
+    </Target>
 </Project>
diff --git a/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj b/tools/SetupFlow/DevHome.SetupFlow/DevHome.SetupFlow.csproj
@@ -20,7 +20,7 @@
     <PackageReference Include="Microsoft.Internal.Windows.DevHome.Helpers" Version="1.0.*-*" />
     <PackageReference Include="Microsoft.WindowsPackageManager.Configuration" Version="0.0.5" />
     <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.2.8" GeneratePathProperty="true">
-      <IncludeAssets>contentFiles</IncludeAssets>
+        <ExcludeAssets>contentFiles</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.1" />
     <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.2.188-beta">