Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use root xmlns #297

Merged
merged 11 commits into from
Jun 19, 2024
Merged

Use root xmlns #297

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2522f46
fix: use root xmlns
dansiegel Jun 18, 2024
934a18c
test: updating AppxManifest Tests
dansiegel Jun 18, 2024
8aa8f36
chore: ensure document has XML declaration
dansiegel Jun 18, 2024
c2878f2
test: Updating tests to correctly track expected outputs
dansiegel Jun 18, 2024
f563024
fix: use correct uap namespace
dansiegel Jun 18, 2024
789eeb1
chore: normalize line endings
dansiegel Jun 18, 2024
18915f1
chore: revert naming
dansiegel Jun 18, 2024
dc0b2bd
ci: adding GitHub logging
dansiegel Jun 18, 2024
d00756a
chore: fixing ShowOn xmlns
dansiegel Jun 19, 2024
050e6b2
chore: fixing expected output
dansiegel Jun 19, 2024
91cdad5
fix: uno 17199
dansiegel Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 18 additions & 20 deletions src/Resizetizer/src/GeneratePackageAppxManifest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ public class GeneratePackageAppxManifest_v0 : Task

const string ErrorVersionNumberCombination = "ApplicationDisplayVersion '{0}' was not a valid 3 part semver version number and/or ApplicationVersion '{1}' was not a valid integer.";

static readonly XNamespace xmlnsUap = "http://schemas.microsoft.com/appx/manifest/uap/windows10";

[Required]
public string IntermediateOutputPath { get; set; } = null!;

Expand Down Expand Up @@ -181,7 +179,7 @@ void UpdateManifest(XDocument appx)
}

// <uap:VisualElements>
var xvisual = xmlnsUap + "VisualElements";
var xvisual = xmlns + "VisualElements";
var visual = application.Element(xvisual);
if (visual == null)
dansiegel marked this conversation as resolved.
Show resolved Hide resolved
{
Expand All @@ -190,7 +188,7 @@ void UpdateManifest(XDocument appx)
}

// <uap:DefaultTile>
var xtile = xmlnsUap + "DefaultTile";
var xtile = xmlns + "DefaultTile";
var tile = visual.Element(xtile);
if (tile == null)
{
Expand All @@ -199,7 +197,7 @@ void UpdateManifest(XDocument appx)
}

// <uap:ShowNameOnTiles>
var xshowname = xmlnsUap + "ShowNameOnTiles";
var xshowname = xmlns + "ShowNameOnTiles";
var showname = tile.Element(xshowname);
if (showname == null)
{
Expand All @@ -226,7 +224,7 @@ void UpdateManifest(XDocument appx)
UpdateDefaultTileSquare310Logo(tile, appIconInfo);

// <ShowOn>
var xshowon = xmlnsUap + "ShowOn";
var xshowon = xmlns + "ShowOn";
var showons = showname.Elements(xshowon).ToArray();
if (showons.All(x => x.Attribute("Tile")?.Value != "square150x150Logo"))
{
Expand All @@ -242,7 +240,7 @@ void UpdateManifest(XDocument appx)
if (splashInfo != null)
{
// <uap:SplashScreen>
var xsplash = xmlnsUap + "SplashScreen";
var xsplash = xmlns + "SplashScreen";
var splash = visual.Element(xsplash);
if (splash == null)
{
Expand Down Expand Up @@ -523,19 +521,19 @@ private static void SetVersion(XElement target, XName attributeName, string vers
}
}

static bool IsVersionAttribute(XAttribute attribute, XName attributeName)
{
var currentAttributeName = attribute.Name.LocalName;
var expectedAttributeName = attributeName.LocalName;
var currentAttributeNamespace = attribute.Name.Namespace.NamespaceName;
var expectedAttributeNamespace = attributeName.NamespaceName;
// The Version may not have a current Namespace and should use the default namespace
if (string.IsNullOrEmpty(currentAttributeNamespace))
return currentAttributeName == expectedAttributeName;
return currentAttributeName == expectedAttributeName && currentAttributeNamespace == expectedAttributeNamespace;
static bool IsVersionAttribute(XAttribute attribute, XName attributeName)
{
var currentAttributeName = attribute.Name.LocalName;
var expectedAttributeName = attributeName.LocalName;

var currentAttributeNamespace = attribute.Name.Namespace.NamespaceName;
var expectedAttributeNamespace = attributeName.NamespaceName;

// The Version may not have a current Namespace and should use the default namespace
if (string.IsNullOrEmpty(currentAttributeNamespace))
return currentAttributeName == expectedAttributeName;

return currentAttributeName == expectedAttributeName && currentAttributeNamespace == expectedAttributeNamespace;
}

public static bool TryMergeVersionNumbers(string? displayVersion, string? version, out string? finalVersion)
Expand Down
Loading