Commit 8e226eb
authored
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- eng
- devices
- src
- Controls/src/Xaml
- Essentials/src
- Graphics/src
- Graphics.Skia
- Graphics.Win2D
- TestUtils/src/Microsoft.Maui.IntegrationTests
8 files changed
+10
-15
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
| 125 | + | |
126 | 126 | | |
127 | | - | |
128 | 127 | | |
129 | 128 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
71 | | - | |
72 | | - | |
| 71 | + | |
| 72 | + | |
73 | 73 | | |
74 | 74 | | |
75 | 75 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
| 83 | + | |
83 | 84 | | |
84 | 85 | | |
85 | 86 | | |
| |||
99 | 100 | | |
100 | 101 | | |
101 | 102 | | |
102 | | - | |
| 103 | + | |
103 | 104 | | |
104 | 105 | | |
105 | 106 | | |
| |||
119 | 120 | | |
120 | 121 | | |
121 | 122 | | |
122 | | - | |
123 | | - | |
124 | 123 | | |
125 | 124 | | |
126 | 125 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
16 | 19 | | |
17 | 20 | | |
18 | 21 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
39 | 39 | | |
40 | 40 | | |
41 | 41 | | |
42 | | - | |
43 | 42 | | |
44 | 43 | | |
45 | 44 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
34 | 34 | | |
35 | 35 | | |
36 | 36 | | |
37 | | - | |
38 | 37 | | |
39 | 38 | | |
40 | 39 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
30 | | - | |
31 | 30 | | |
32 | 31 | | |
33 | 32 | | |
| |||
Lines changed: 2 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
167 | 167 | | |
168 | 168 | | |
169 | 169 | | |
170 | | - | |
171 | | - | |
172 | | - | |
173 | | - | |
174 | | - | |
| 170 | + | |
| 171 | + | |
175 | 172 | | |
176 | 173 | | |
177 | 174 | | |
| |||
0 commit comments