Merge pull request #3722 from andydotxyz/fix/3195

XML Encode the windows XML data

cmd/fyne/internal/commands/encode.go

@@ -0,0 +1,9 @@
+package commands
+
+import (
+	"html"
+)
+
+func encodeXMLString(in string) string {
+	return html.EscapeString(in)
+}

cmd/fyne/internal/commands/encode_test.go

@@ -0,0 +1,16 @@
+package commands
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestEncodeXMLString(t *testing.T) {
+	assert.Equal(t, "", encodeXMLString(""))
+	assert.Equal(t, "Hello", encodeXMLString("Hello"))
+	assert.Equal(t, "Hi & bye", encodeXMLString("Hi & bye"))
+	assert.Equal(t, "Hi & bye", encodeXMLString("Hi & bye"))
+
+	assert.Equal(t, "Hi &lt;&gt; bye", encodeXMLString("Hi <> bye"))
+}

cmd/fyne/internal/commands/package-windows.go

@@ -35,7 +35,7 @@ func (p *Packager) packageWindows(tags []string) error {
 		return fmt.Errorf("failed to decode source image: %w", err)
 	}
 
-	icoPath := filepath.Join(exePath, p.Name+".ico")
+	icoPath := filepath.Join(exePath, "FyneApp.ico")
 	file, err := os.Create(icoPath)
 	if err != nil {
 		return fmt.Errorf("failed to open image file: %w", err)
@@ -59,7 +59,7 @@ func (p *Packager) packageWindows(tags []string) error {
 		manifestFile, _ := os.Create(manifest)
 
 		tplData := windowsData{
-			Name:            p.Name,
+			Name:            encodeXMLString(p.Name),
 			CombinedVersion: p.combinedVersion(),
 		}
 		err := templates.ManifestWindows.Execute(manifestFile, tplData)

cmd/fyne/internal/commands/release.go

@@ -346,9 +346,9 @@ func (r *Releaser) packageWindowsRelease(outFile string) error {
 	manifestData := struct{ AppID, Developer, DeveloperName, Name, Version string }{
 		AppID: r.AppID,
 		// TODO read this info
-		Developer:     r.developer,
-		DeveloperName: r.nameFromCertInfo(r.developer),
-		Name:          r.Name,
+		Developer:     encodeXMLString(r.developer),
+		DeveloperName: encodeXMLString(r.nameFromCertInfo(r.developer)),
+		Name:          encodeXMLString(r.Name),
 		Version:       r.combinedVersion(),
 	}
 	err = templates.AppxManifestWindows.Execute(manifest, manifestData)