Skip to content

Commit 44352b6

Browse files
mitchcappermitchcapper
committed
Update WinuI3 SDK to .17
1 parent 1923c26 commit 44352b6

3 files changed

Lines changed: 45 additions & 45 deletions

File tree

‎EasyWindowsTerminalControl.WinUI/EasyWindowsTerminalControl.WinUI.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515
<ItemGroup>
1616
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
17-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
17+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<Compile Include="..\EasyWindowsTerminalControl\EasyTerminalControl.cs" Link="EasyTerminalControl.cs" />
@@ -26,10 +26,10 @@
2626
<Compile Include="..\EasyWindowsTerminalControl\ReadDelimitedTermPTY.cs" Link="ReadDelimitedTermPTY.cs" />
2727
<Compile Include="..\EasyWindowsTerminalControl\TermPTY.cs" Link="TermPTY.cs" />
2828
</ItemGroup>
29-
<!--<ItemGroup>
30-
<None Include="..\TermExample\Microsoft.Terminal.Control.dll" Link="Microsoft.Terminal.Control.dll">
31-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
32-
</None>
29+
<!--<ItemGroup>
30+
<None Include="..\TermExample\Microsoft.Terminal.Control.dll" Link="Microsoft.Terminal.Control.dll">
31+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
32+
</None>
3333
</ItemGroup>-->
3434
<ItemGroup>
3535
<PackageReference Include="CI.Microsoft.Windows.Console.ConPTY" Version="1.22.250314001" />
@@ -38,7 +38,7 @@
3838
<PrivateAssets>all</PrivateAssets>
3939
</PackageReference>
4040
</ItemGroup>
41-
<ItemGroup>
41+
<!--<ItemGroup>
4242
<ProjectReference Include="..\Microsoft.Terminal.WinUI3\Microsoft.Terminal.WinUI3.csproj" />
43-
</ItemGroup>
43+
</ItemGroup>-->
4444
</Project>

‎Microsoft.Terminal.WinUI3/Microsoft.Terminal.WinUI3.csproj‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -26,31 +26,31 @@
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
</PackageReference>
2828
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
29-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
30-
<PackageReference Include="WinUIEx" Version="2.5.0" />
29+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
30+
<PackageReference Include="WinUIEx" Version="2.5.1" />
3131
<PackageReference Include="CI.Microsoft.Terminal.Wpf" GeneratePathProperty="true" ExcludeAssets="all" Version="1.22.250204002" />
32-
<!--<PackageReference Include="CI.Microsoft.Terminal.Wpf" Version="1.22.250204002" ExcludeAssets="all" />-->
32+
3333
</ItemGroup>
3434

3535
<ItemGroup>
3636
<Page Update="TerminalControl.xaml">
3737
<Generator>MSBuild:Compile</Generator>
3838
</Page>
3939
</ItemGroup>
40-
<!--<Target Name="CopyCustomContent" AfterTargets="AfterBuild">
41-
<Copy SourceFiles="$(CI_Microsoft_Terminal_Wpf)\runtimes\win-x64\native\*" DestinationFolder="$(OutDir)" />
40+
<!--<Target Name="CopyCustomContent" AfterTargets="AfterBuild">
41+
<Copy SourceFiles="$(CI_Microsoft_Terminal_Wpf)\runtimes\win-x64\native\*" DestinationFolder="$(OutDir)" />
4242
</Target>-->
4343

4444
<PropertyGroup>
4545
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
4646
</PropertyGroup>
47-
<!--<PropertyGroup>
48-
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
49-
<DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences>
47+
<!--<PropertyGroup>
48+
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
49+
<DisableTransitiveProjectReferences>true</DisableTransitiveProjectReferences>
5050
-->
5151
<!--<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>-->
52-
<!--
53-
52+
<!--
53+
5454
</PropertyGroup>-->
5555
<ItemGroup>
5656
<Content Include="runtimes\**\*">
@@ -71,10 +71,10 @@
7171
<FrameworkReference Remove="Microsoft.WindowsDesktop.App.WPF" />
7272
</ItemGroup>
7373
</Target>
74-
<!--<ItemGroup>
75-
<CustomPackageFile Include="bin\x64\Debug\net8.0-windows10.0.19041.0\Microsoft.Terminal.WinUI3\TerminalControl.xbf">
76-
<PackagePath>lib\net8.0-windows10.0.19041.0\Microsoft.Terminal.WinUI3</PackagePath>
77-
</CustomPackageFile>
74+
<!--<ItemGroup>
75+
<CustomPackageFile Include="bin\x64\Debug\net8.0-windows10.0.19041.0\Microsoft.Terminal.WinUI3\TerminalControl.xbf">
76+
<PackagePath>lib\net8.0-windows10.0.19041.0\Microsoft.Terminal.WinUI3</PackagePath>
77+
</CustomPackageFile>
7878
</ItemGroup>-->
7979

8080
<!--<Target Name="MergePGOCounts" />-->
@@ -109,20 +109,20 @@
109109
</None>
110110
</ItemGroup>
111111
</Target>
112-
<!--<Target Name="CollectNativePackContents">
113-
<ItemGroup>
114-
<None Include="lib_bins\runtimes\win-x86\Microsoft.Terminal.Control.dll">
115-
<Pack>true</Pack>
116-
<PackagePath>runtimes\win-x86\native\</PackagePath>
117-
</None>
118-
<None Include="lib_bins\runtimes\win-x64\Microsoft.Terminal.Control.dll">
119-
<Pack>true</Pack>
120-
<PackagePath>runtimes\win-x64\native\</PackagePath>
121-
</None>
122-
<None Include="lib_bins\runtimes\win-arm64\Microsoft.Terminal.Control.dll">
123-
<Pack>true</Pack>
124-
<PackagePath>runtimes\win-arm64\native\</PackagePath>
125-
</None>
126-
</ItemGroup>
112+
<!--<Target Name="CollectNativePackContents">
113+
<ItemGroup>
114+
<None Include="lib_bins\runtimes\win-x86\Microsoft.Terminal.Control.dll">
115+
<Pack>true</Pack>
116+
<PackagePath>runtimes\win-x86\native\</PackagePath>
117+
</None>
118+
<None Include="lib_bins\runtimes\win-x64\Microsoft.Terminal.Control.dll">
119+
<Pack>true</Pack>
120+
<PackagePath>runtimes\win-x64\native\</PackagePath>
121+
</None>
122+
<None Include="lib_bins\runtimes\win-arm64\Microsoft.Terminal.Control.dll">
123+
<Pack>true</Pack>
124+
<PackagePath>runtimes\win-arm64\native\</PackagePath>
125+
</None>
126+
</ItemGroup>
127127
</Target>-->
128128
</Project>

‎TermExample.WinUI/TermExample.WinUI.csproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,28 +26,28 @@
2626
<Manifest Include="$(ApplicationManifest)" />
2727
</ItemGroup>
2828

29-
<!--
30-
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
31-
Tools extension to be activated for this project even if the Windows App SDK Nuget
32-
package has not yet been restored.
29+
<!--
30+
Defining the "Msix" ProjectCapability here allows the Single-project MSIX Packaging
31+
Tools extension to be activated for this project even if the Windows App SDK Nuget
32+
package has not yet been restored.
3333
-->
3434
<ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
3535
<ProjectCapability Include="Msix" />
3636
</ItemGroup>
3737
<ItemGroup>
3838
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
39-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
39+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.7.250310001" />
4040
<PackageReference Include="EasyWindowsTerminalControl.WinUI" Version="1.0.1-beta.1" />
4141

4242
</ItemGroup>
4343
<ItemGroup>
4444
<!--<ProjectReference Include="..\EasyWindowsTerminalControl.WinUI\EasyWindowsTerminalControl.WinUI.csproj" />-->
4545
</ItemGroup>
4646

47-
<!--
48-
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
49-
Explorer "Package and Publish" context menu entry to be enabled for this project even if
50-
the Windows App SDK Nuget package has not yet been restored.
47+
<!--
48+
Defining the "HasPackageAndPublishMenuAddedByProject" property here allows the Solution
49+
Explorer "Package and Publish" context menu entry to be enabled for this project even if
50+
the Windows App SDK Nuget package has not yet been restored.
5151
-->
5252
<PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
5353
<HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>

0 commit comments

Comments
 (0)