Fix Missing Logo File Throwing an Error (#488)

microsoft · Jul 28, 2023 · aa82d14 · aa82d14
1 parent 1e36981
commit aa82d14
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/src/PAModel/Serializers/SourceSerializer.cs b/src/PAModel/Serializers/SourceSerializer.cs
@@ -368,10 +368,6 @@ private static void GetLogoFile(this CanvasDocument app)
                     app._unknownFiles.Remove(key);
                     app._logoFile = logoFile;
                 }
-                else
-                {
-                    throw new InvalidOperationException($"Missing logo file {key}");
-                }
             }
         }
 

diff --git a/src/PAModel/Serializers/TransformLogo.cs b/src/PAModel/Serializers/TransformLogo.cs
@@ -48,15 +48,23 @@ public static (PublishInfoJson, FileEntry) TransformLogoOnSave(this CanvasDocume
             FileEntry logoFile = null;
             var publishInfo = app._publishInfo.JsonClone();
 
-            if (!string.IsNullOrEmpty(publishInfo?.LogoFileName))
-            {
-                app._assetFiles.Remove(app._logoFile.Name);
-                publishInfo.LogoFileName = app._entropy.OldLogoFileName ?? Path.GetFileName(app._logoFile.Name.ToPlatformPath());
-                logoFile = new FileEntry
+            if (app._logoFile != null) {
+                if (!string.IsNullOrEmpty(publishInfo?.LogoFileName))
                 {
-                    Name = FilePath.RootedAt("Resources", FilePath.FromMsAppPath(publishInfo.LogoFileName)),
-                    RawBytes = app._logoFile.RawBytes
-                };
+                    app._assetFiles.Remove(app._logoFile.Name);
+                    publishInfo.LogoFileName = app._entropy.OldLogoFileName ?? Path.GetFileName(app._logoFile.Name.ToPlatformPath());
+                    logoFile = new FileEntry
+                    {
+                        Name = FilePath.RootedAt("Resources", FilePath.FromMsAppPath(publishInfo.LogoFileName)),
+                        RawBytes = app._logoFile.RawBytes
+                    };
+                }
+            }
+            else {
+                if (app._entropy.OldLogoFileName != null)
+                {
+                    publishInfo.LogoFileName = app._entropy.OldLogoFileName;
+                }
             }
 
             return (publishInfo, logoFile);