Skip to content

Commit f563024

Browse files
committed
fix: use correct uap namespace
1 parent c2878f2 commit f563024

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/Resizetizer/src/GeneratePackageAppxManifest.cs

+11-5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ public class GeneratePackageAppxManifest_v0 : Task
1616
const string PackageVersionPlaceholder = "0.0.0.0";
1717
const string ImageExtension = ".png";
1818

19+
const string UapNamespace = "http://schemas.microsoft.com/appx/manifest/uap/windows10";
20+
1921
const string ErrorVersionNumberCombination = "ApplicationDisplayVersion '{0}' was not a valid 3 part semver version number and/or ApplicationVersion '{1}' was not a valid integer.";
2022

2123
[Required]
@@ -117,7 +119,11 @@ void UpdateManifest(XDocument appx)
117119
var appIconInfo = AppIcon?.Length > 0 ? ResizeImageInfo.Parse(AppIcon[0]) : null;
118120
var splashInfo = SplashScreen?.Length > 0 ? ResizeImageInfo.Parse(SplashScreen[0]) : null;
119121

120-
var xmlns = appx.Root!.GetDefaultNamespace();
122+
var uapXmlns = appx.Root.Attributes()
123+
.Where(a => a.IsNamespaceDeclaration && a.Value == UapNamespace)
124+
.Select(a => XNamespace.Get(a.Value))
125+
.FirstOrDefault();
126+
var xmlns = appx.Root!.GetDefaultNamespace();
121127

122128
// <Identity Name="" Version="" />
123129
// <Identity>
@@ -189,7 +195,7 @@ void UpdateManifest(XDocument appx)
189195
}
190196

191197
// <uap:VisualElements>
192-
var xvisual = xmlns + "VisualElements";
198+
var xvisual = uapXmlns + "VisualElements";
193199
var visual = application.Element(xvisual);
194200
if (visual == null)
195201
{
@@ -198,7 +204,7 @@ void UpdateManifest(XDocument appx)
198204
}
199205

200206
// <uap:DefaultTile>
201-
var xtile = xmlns + "DefaultTile";
207+
var xtile = uapXmlns + "DefaultTile";
202208
var tile = visual.Element(xtile);
203209
if (tile == null)
204210
{
@@ -207,7 +213,7 @@ void UpdateManifest(XDocument appx)
207213
}
208214

209215
// <uap:ShowNameOnTiles>
210-
var xshowname = xmlns + "ShowNameOnTiles";
216+
var xshowname = uapXmlns + "ShowNameOnTiles";
211217
var showname = tile.Element(xshowname);
212218
if (showname == null)
213219
{
@@ -250,7 +256,7 @@ void UpdateManifest(XDocument appx)
250256
if (splashInfo != null)
251257
{
252258
// <uap:SplashScreen>
253-
var xsplash = xmlns + "SplashScreen";
259+
var xsplash = uapXmlns + "SplashScreen";
254260
var splash = visual.Element(xsplash);
255261
if (splash == null)
256262
{

0 commit comments

Comments
 (0)