Skip to content

Commit 8e226eb

Browse files
authored
Revert "Update WindowsAppSDK to 1.8 (#32174)" (#33537)
Reverts the Windows App SDK update from version 1.7 to 1.8 introduced in PR #32174. ## Reverted Changes **Version downgrades:** - `MicrosoftWindowsAppSDKPackageVersion`: `1.8.251106002` → `1.7.250909003` - `MicrosoftWindowsSDKBuildToolsPackageVersion`: `10.0.26100.4654` → `10.0.22621.756` **Package references removed:** - `Microsoft.WindowsAppSDK` from `Essentials.csproj`, `Graphics.Skia.csproj`, `Graphics.Win2D.csproj` **Restored configurations:** - `Controls.Xaml.csproj`: Re-added `WINDOWS` define constant and `AppxGeneratePriEnabled=false` - `Directory.Build.targets`: Removed `GetTypeScriptCopyToOutputDirectoryItems` target - `WindowsTemplateTest.cs`: Restored original RID-based asset path logic - `windows.cake`: Restored `X509KeyUsageFlags.NonRepudiation` in certificate generation This reverts commit 5a39604. > [!WARNING] > > <details> > <summary>Firewall rules blocked me from connecting to one or more addresses (expand for details)</summary> > > #### I tried to connect to the following addresses, but was blocked by firewall rules: > > - `ghcr.io` > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /home/REDACTED/work/maui/maui --branch main --directory src/Controls/src/Xaml --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /tmp/dependabot-base-edeX71/repo --branch main --directory src/Essentials/src --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > - Triggering command: `/tmp/dependabot-cli/dependabot/dependabot /tmp/dependabot-cli/dependabot/dependabot graph nuget org/repo --local /home/REDACTED/work/maui/maui --branch main --directory src/Essentials/src --proxy-cert /home/REDACTED/work/_temp/runtime-logs/mkcert/rootCA.pem --updater-env NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/dbot-ca.crt` (dns block) > > If you need me to access, download, or install something from one of these locations, you can either: > > - Configure [Actions setup steps](https://gh.io/copilot/actions-setup-steps) to set up my environment, which run before the firewall is enabled > - Add the appropriate URLs or hosts to the custom allowlist in this repository's [Copilot coding agent settings](https://github.com/dotnet/maui/settings/copilot/coding_agent) (admins only) > > </details> <!-- START COPILOT CODING AGENT SUFFIX --> <!-- START COPILOT ORIGINAL PROMPT --> <details> <summary>Original prompt</summary> > can you revert the following PR ? #32174 </details> <!-- START COPILOT CODING AGENT TIPS --> --- ✨ Let Copilot coding agent [set things up for you](https://github.com/dotnet/maui/issues/new?title=✨+Set+up+Copilot+instructions&body=Configure%20instructions%20for%20this%20repository%20as%20documented%20in%20%5BBest%20practices%20for%20Copilot%20coding%20agent%20in%20your%20repository%5D%28https://gh.io/copilot-coding-agent-tips%29%2E%0A%0A%3COnboard%20this%20repo%3E&assignees=copilot) — coding agent works faster and does higher quality work when set up for your repo. --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
1 parent e177c97 commit 8e226eb

File tree

8 files changed

+10
-15
lines changed

8 files changed

+10
-15
lines changed

Directory.Build.targets

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,7 @@
122122

123123
<!-- Tell typescript to stop deleting everything before building the next TFM -->
124124
<Target Name="TypeScriptDeleteOutputFromOtherConfigs" />
125-
<!-- Don't add any outputs to any item group, we are embedding things manually -->
125+
<!-- Don't include any JS files in the Content, we will embed it -->
126126
<Target Name="GetTypeScriptOutputForPublishing" />
127-
<Target Name="GetTypeScriptCopyToOutputDirectoryItems" />
128127

129128
</Project>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@
6868
<!-- Samsung/Tizen.NET -->
6969
<SamsungTizenSdkPackageVersion>8.0.148</SamsungTizenSdkPackageVersion>
7070
<!-- wasdk -->
71-
<MicrosoftWindowsAppSDKPackageVersion>1.8.251106002</MicrosoftWindowsAppSDKPackageVersion>
72-
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.26100.4654</MicrosoftWindowsSDKBuildToolsPackageVersion>
71+
<MicrosoftWindowsAppSDKPackageVersion>1.7.250909003</MicrosoftWindowsAppSDKPackageVersion>
72+
<MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.756</MicrosoftWindowsSDKBuildToolsPackageVersion>
7373
<MicrosoftGraphicsWin2DPackageVersion>1.3.2</MicrosoftGraphicsWin2DPackageVersion>
7474
<MicrosoftWindowsWebView2PackageVersion>1.0.3179.45</MicrosoftWindowsWebView2PackageVersion>
7575
<!-- Everything else -->

eng/devices/windows.cake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ Task("GenerateMsixCert")
8080
var currentUserMyStore = new X509Store("My", StoreLocation.CurrentUser);
8181
currentUserMyStore.Open(OpenFlags.ReadWrite);
8282
certificateThumbprint = localTrustedPeopleStore.Certificates.FirstOrDefault(c => c.Subject.Contains(certCN))?.Thumbprint;
83+
Information("Cert thumbprint: " + certificateThumbprint ?? "null");
8384

8485
if (string.IsNullOrEmpty(certificateThumbprint))
8586
{
@@ -99,7 +100,7 @@ Task("GenerateMsixCert")
99100
req.CertificateExtensions.Add(new X509BasicConstraintsExtension(false, false, 0, false));
100101
req.CertificateExtensions.Add(
101102
new X509KeyUsageExtension(
102-
X509KeyUsageFlags.DigitalSignature,
103+
X509KeyUsageFlags.DigitalSignature | X509KeyUsageFlags.NonRepudiation,
103104
false));
104105

105106
req.CertificateExtensions.Add(
@@ -119,8 +120,6 @@ Task("GenerateMsixCert")
119120

120121
localTrustedPeopleStore.Close();
121122
currentUserMyStore.Close();
122-
123-
Information("Cert thumbprint: " + certificateThumbprint ?? "null");
124123
});
125124

126125
Task("buildOnly")

src/Controls/src/Xaml/Controls.Xaml.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@
1313

1414
<PropertyGroup Condition="$(TargetFramework.Contains('-windows')) == true ">
1515
<NoWarn>$(NoWarn);CA1416</NoWarn>
16+
<DefineConstants>$(DefineConstants);WINDOWS</DefineConstants>
17+
<!-- Disable PRI generation to avoid conflicts with Core project's PRI file -->
18+
<AppxGeneratePriEnabled>false</AppxGeneratePriEnabled>
1619
</PropertyGroup>
1720

1821
<PropertyGroup>

src/Essentials/src/Essentials.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
<Compile Include="**\*.windows.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
4040
<Compile Include="**\*.windows.*.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
4141
<PackageReference Include="Microsoft.Web.WebView2" />
42-
<PackageReference Include="Microsoft.WindowsAppSDK" />
4342
</ItemGroup>
4443
<ItemGroup Condition=" '$(TargetPlatformIdentifier)' == 'android' ">
4544
<Compile Include="**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />

src/Graphics/src/Graphics.Skia/Graphics.Skia.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
</ItemGroup>
3535
<ItemGroup Condition="$(TargetFramework.Contains('-windows'))">
3636
<PackageReference Include="SkiaSharp.Views.WinUI" />
37-
<PackageReference Include="Microsoft.WindowsAppSDK" />
3837
</ItemGroup>
3938

4039
<ItemGroup>

src/Graphics/src/Graphics.Win2D/Graphics.Win2D.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727

2828
<ItemGroup>
2929
<PackageReference Include="Microsoft.Graphics.Win2D" />
30-
<PackageReference Include="Microsoft.WindowsAppSDK" />
3130
</ItemGroup>
3231

3332
<ItemGroup>

src/TestUtils/src/Microsoft.Maui.IntegrationTests/WindowsTemplateTest.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,8 @@ public void PublishPackaged(string id, string framework, string config, bool use
167167
Assert.IsTrue(DotnetInternal.Publish(projectFile, config, framework: $"{framework}-windows10.0.19041.0", properties: BuildProps),
168168
$"Project {Path.GetFileName(projectFile)} failed to build. Check test output/attachments for errors.");
169169

170-
var rid = usesRidGraph ? "win10-x64/" : "";
171-
var prefix = framework == DotNetCurrent
172-
? ""
173-
: $"bin/{config}/{framework}-windows10.0.19041.0/";
174-
var assetsRoot = Path.Combine(projectDir, $"{prefix}{rid}AppPackages/{name}_1.0.0.1_Test");
170+
var rid = usesRidGraph ? "win10-x64" : "win-x64";
171+
var assetsRoot = Path.Combine(projectDir, $"bin/{config}/{framework}-windows10.0.19041.0/{rid}/AppPackages/{name}_1.0.0.1_Test");
175172

176173
AssetExists($"{name}_1.0.0.1_x64.msix");
177174

0 commit comments

Comments
 (0)