U clean module name for wix toolset

fvarrui · fvarrui · commit 4600a01a1e08 · 2022-02-10T19:00:24.000Z
diff --git a/src/main/resources/windows/msm.wxs.vtl b/src/main/resources/windows/msm.wxs.vtl
@@ -1,4 +1,4 @@
-#set ($name = $info.name.replaceAll("-", "_"))
+#set ($name = $info.name.replaceAll("[^A-Za-z0-9_.]", "_"))
 #set ($id = 0)
 #macro(list $file)
 	#set($guid = $GUID.randomUUID())
diff --git a/src/main/resources/windows/wxs.vtl b/src/main/resources/windows/wxs.vtl
@@ -1,4 +1,4 @@
-#set($moduleName = $info.name.replaceAll("-", "_") + "_Module")
+#set($moduleName = $info.name.replaceAll("[^A-Za-z0-9_.]", "_") + "_Module")
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product Id="*" Codepage="1252" Language="1033" Manufacturer="${info.organizationName}" Name="${info.name}" UpgradeCode="${info.winConfig.msiUpgradeCode}" Version="${info.winConfig.productVersion}">

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#set ($name = $info.name.replaceAll("-", "_"))`
	`1`	`+#set ($name = $info.name.replaceAll("[^A-Za-z0-9_.]", "_"))`
`2`	`2`	`#set ($id = 0)`
`3`	`3`	`#macro(list $file)`
`4`	`4`	`#set($guid = $GUID.randomUUID())`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#set($moduleName = $info.name.replaceAll("-", "_") + "_Module")`
	`1`	`+#set($moduleName = $info.name.replaceAll("[^A-Za-z0-9_.]", "_") + "_Module")`
`2`	`2`	`<?xml version="1.0" encoding="UTF-8" standalone="yes"?>`
`3`	`3`	`<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">`
`4`	`4`	`<Product Id="*" Codepage="1252" Language="1033" Manufacturer="${info.organizationName}" Name="${info.name}" UpgradeCode="${info.winConfig.msiUpgradeCode}" Version="${info.winConfig.productVersion}">`