@@ -16,6 +16,8 @@ public class GeneratePackageAppxManifest_v0 : Task
16
16
const string PackageVersionPlaceholder = "0.0.0.0" ;
17
17
const string ImageExtension = ".png" ;
18
18
19
+ const string UapNamespace = "http://schemas.microsoft.com/appx/manifest/uap/windows10" ;
20
+
19
21
const string ErrorVersionNumberCombination = "ApplicationDisplayVersion '{0}' was not a valid 3 part semver version number and/or ApplicationVersion '{1}' was not a valid integer." ;
20
22
21
23
[ Required ]
@@ -117,7 +119,11 @@ void UpdateManifest(XDocument appx)
117
119
var appIconInfo = AppIcon ? . Length > 0 ? ResizeImageInfo . Parse ( AppIcon [ 0 ] ) : null ;
118
120
var splashInfo = SplashScreen ? . Length > 0 ? ResizeImageInfo . Parse ( SplashScreen [ 0 ] ) : null ;
119
121
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 ( ) ;
121
127
122
128
// <Identity Name="" Version="" />
123
129
// <Identity>
@@ -189,7 +195,7 @@ void UpdateManifest(XDocument appx)
189
195
}
190
196
191
197
// <uap:VisualElements>
192
- var xvisual = xmlns + "VisualElements" ;
198
+ var xvisual = uapXmlns + "VisualElements" ;
193
199
var visual = application . Element ( xvisual ) ;
194
200
if ( visual == null )
195
201
{
@@ -198,7 +204,7 @@ void UpdateManifest(XDocument appx)
198
204
}
199
205
200
206
// <uap:DefaultTile>
201
- var xtile = xmlns + "DefaultTile" ;
207
+ var xtile = uapXmlns + "DefaultTile" ;
202
208
var tile = visual . Element ( xtile ) ;
203
209
if ( tile == null )
204
210
{
@@ -207,7 +213,7 @@ void UpdateManifest(XDocument appx)
207
213
}
208
214
209
215
// <uap:ShowNameOnTiles>
210
- var xshowname = xmlns + "ShowNameOnTiles" ;
216
+ var xshowname = uapXmlns + "ShowNameOnTiles" ;
211
217
var showname = tile . Element ( xshowname ) ;
212
218
if ( showname == null )
213
219
{
@@ -250,7 +256,7 @@ void UpdateManifest(XDocument appx)
250
256
if ( splashInfo != null )
251
257
{
252
258
// <uap:SplashScreen>
253
- var xsplash = xmlns + "SplashScreen" ;
259
+ var xsplash = uapXmlns + "SplashScreen" ;
254
260
var splash = visual . Element ( xsplash ) ;
255
261
if ( splash == null )
256
262
{
0 commit comments