logging

StephenHodgson · StephenHodgson · commit 96799b280ded · 2025-07-28T09:34:23.000-04:00
diff --git a/dist/index.js b/dist/index.js
@@ -34970,7 +34970,7 @@ async function getAvailableWindowsSDKVersion() {
             const entries = await fs.promises.readdir(basePath);
             const versions = entries.filter(entry => /^10\.0\.\d+\.\d+$/.test(entry));
             allVersions.push(...versions);
-            core.debug(`Found Windows SDK versions in ${basePath}:`);
+            core.debug(`Found Windows SDK versions in "${basePath}"`);
             versions.forEach(version => core.debug(`  - ${version}`));
         }
         catch (error) {
@@ -35001,7 +35001,7 @@ async function isWindowsSDKVersionAvailable(version) {
         try {
             const versionPath = path.join(basePath, version);
             await fs.promises.access(versionPath, fs.constants.R_OK);
-            core.info(`Found Windows SDK version ${version} at: ${versionPath}`);
+            core.info(`Found Windows SDK version ${version} at: "${versionPath}"`);
             return true;
         }
         catch (error) {
@@ -35049,17 +35049,14 @@ async function printFileContents(filePath) {
 }
 async function removeWindowsMobileSDKReference(vcxprojPath) {
     let vcxprojContent = await fs.promises.readFile(vcxprojPath, 'utf8');
-    const itemGroupRegex = /([ \t]*<ItemGroup>\r?\n[ \t]*<SDKReference Include="WindowsMobile, Version=10.0.26100.0" \/>\r?\n[ \t]*<\/ItemGroup>\r?\n)/;
+    const itemGroupRegex = /([ \t]*<ItemGroup>\r?\n[ \t]*<SDKReference Include="WindowsMobile, Version=[^"\s]+" \/>\r?\n[ \t]*<\/ItemGroup>\r?\n)/;
     const found = itemGroupRegex.test(vcxprojContent);
     if (found) {
-        core.info(`Removing WindowsMobile SDKReference ItemGroup from ${vcxprojPath}...`);
+        core.info(`Removing WindowsMobile SDKReference ItemGroup from "${vcxprojPath}"`);
         vcxprojContent = vcxprojContent.replace(itemGroupRegex, '');
         await fs.promises.writeFile(vcxprojPath, vcxprojContent, 'utf8');
         await printFileContents(vcxprojPath);
     }
-    else {
-        core.info(`No WindowsMobile SDKReference ItemGroup found in ${vcxprojPath}`);
-    }
     return found;
 }
 async function associateAppWithStore(vcxprojPath, sourcePackageAssociationFilePath) {
@@ -35084,7 +35081,7 @@ async function associateAppWithStore(vcxprojPath, sourcePackageAssociationFilePa
         }
     }
     await writeXml(appxManifestPath, appxManifestXml);
-    core.info(`Updated Package.appxmanifest with identity information from ${packageStoreAssociationFilePath}`);
+    core.info(`Updated Package.appxmanifest with identity information from "${packageStoreAssociationFilePath}"`);
     await printFileContents(appxManifestPath);
 }
 async function copyPackageStoreAssociationFile(vcxprojPath, sourcePackageAssociationFilePath) {
@@ -35099,13 +35096,13 @@ async function copyPackageStoreAssociationFile(vcxprojPath, sourcePackageAssocia
     }
     if (!/<None[^>]*Include="Package\.StoreAssociation\.xml"/.test(vcxprojContent)) {
         const itemGroup = '  <ItemGroup>\n    <None Include="Package.StoreAssociation.xml" />\n  </ItemGroup>\n';
-        vcxprojContent = vcxprojContent.replace(/([ \t]*<\/ItemGroup>\r?\n)([ \t]*<Import Project="\$\(VCTargetsPath\)\\Microsoft\.Cpp\.targets" \/>)/, '$1' + itemGroup + '$2');
+        vcxprojContent = vcxprojContent.replace(/([ \t]*<\/ItemGroup>\r?\n)([ \t]*<Import Project="\$\(VCTargetsPath\)\\Microsoft\.Cpp\.targets" \/>)/, `$1${itemGroup}$2`);
         updated = true;
     }
     if (updated) {
         await fs.promises.writeFile(vcxprojPath, vcxprojContent, 'utf8');
+        await printFileContents(vcxprojPath);
     }
-    await printFileContents(vcxprojPath);
     return packageStoreAssociationFilePath;
 }
 
@@ -37108,7 +37105,7 @@ const main = async () => {
         catch (error) {
             throw new Error(`Output directory not found: "${outputDirectory}".`);
         }
-        core.info(`outputDirectory: ${outputDirectory}`);
+        core.info(`outputDirectory: "${outputDirectory}"`);
         core.setOutput(`output-directory`, outputDirectory);
         const allGlobber = await glob.create(path.join(outputDirectory, '**/*'));
         const allFiles = await allGlobber.glob();
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -84,7 +84,7 @@ const main = async () => {
         } catch (error) {
             throw new Error(`Output directory not found: "${outputDirectory}".`);
         }
-        core.info(`outputDirectory: ${outputDirectory}`);
+        core.info(`outputDirectory: "${outputDirectory}"`);
         core.setOutput(`output-directory`, outputDirectory);
         const allGlobber = await glob.create(path.join(outputDirectory, '**/*'));
         const allFiles = await allGlobber.glob();
diff --git a/src/utils.ts b/src/utils.ts
@@ -21,7 +21,7 @@ export async function getAvailableWindowsSDKVersion(): Promise<string | null> {
       const entries = await fs.promises.readdir(basePath);
       const versions = entries.filter(entry => /^10\.0\.\d+\.\d+$/.test(entry));
       allVersions.push(...versions);
-      core.debug(`Found Windows SDK versions in ${basePath}:`);
+      core.debug(`Found Windows SDK versions in "${basePath}"`);
       versions.forEach(version => core.debug(`  - ${version}`));
     } catch (error) {
       continue;
@@ -55,7 +55,7 @@ export async function isWindowsSDKVersionAvailable(version: string): Promise<boo
     try {
       const versionPath = path.join(basePath, version);
       await fs.promises.access(versionPath, fs.constants.R_OK);
-      core.info(`Found Windows SDK version ${version} at: ${versionPath}`);
+      core.info(`Found Windows SDK version ${version} at: "${versionPath}"`);
       return true;
     } catch (error) {
       continue;
@@ -117,16 +117,13 @@ export async function printFileContents(filePath: string): Promise<void> {
  */
 export async function removeWindowsMobileSDKReference(vcxprojPath: string): Promise<boolean> {
   let vcxprojContent = await fs.promises.readFile(vcxprojPath, 'utf8');
-  // Match the exact ItemGroup block for WindowsMobile SDKReference as in the diff, preserving whitespace
-  const itemGroupRegex = /([ \t]*<ItemGroup>\r?\n[ \t]*<SDKReference Include="WindowsMobile, Version=10.0.26100.0" \/>\r?\n[ \t]*<\/ItemGroup>\r?\n)/;
+  const itemGroupRegex = /([ \t]*<ItemGroup>\r?\n[ \t]*<SDKReference Include="WindowsMobile, Version=[^"\s]+" \/>\r?\n[ \t]*<\/ItemGroup>\r?\n)/;
   const found = itemGroupRegex.test(vcxprojContent);
   if (found) {
-    core.info(`Removing WindowsMobile SDKReference ItemGroup from ${vcxprojPath}...`);
+    core.info(`Removing WindowsMobile SDKReference ItemGroup from "${vcxprojPath}"`);
     vcxprojContent = vcxprojContent.replace(itemGroupRegex, '');
     await fs.promises.writeFile(vcxprojPath, vcxprojContent, 'utf8');
     await printFileContents(vcxprojPath);
-  } else {
-    core.info(`No WindowsMobile SDKReference ItemGroup found in ${vcxprojPath}`);
   }
   return found;
 }
@@ -163,7 +160,7 @@ export async function associateAppWithStore(vcxprojPath: string, sourcePackageAs
     }
   }
   await writeXml(appxManifestPath, appxManifestXml);
-  core.info(`Updated Package.appxmanifest with identity information from ${packageStoreAssociationFilePath}`);
+  core.info(`Updated Package.appxmanifest with identity information from "${packageStoreAssociationFilePath}"`);
   await printFileContents(appxManifestPath);
 }
 /**
@@ -189,12 +186,12 @@ export async function copyPackageStoreAssociationFile(vcxprojPath: string, sourc
     // Insert before </Project>, on a new line, matching the expected diff formatting
     const itemGroup = '  <ItemGroup>\n    <None Include="Package.StoreAssociation.xml" />\n  </ItemGroup>\n';
     // Find the last closing ItemGroup and ensure the new ItemGroup is on its own line
-    vcxprojContent = vcxprojContent.replace(/([ \t]*<\/ItemGroup>\r?\n)([ \t]*<Import Project="\$\(VCTargetsPath\)\\Microsoft\.Cpp\.targets" \/>)/, '$1' + itemGroup + '$2');
+    vcxprojContent = vcxprojContent.replace(/([ \t]*<\/ItemGroup>\r?\n)([ \t]*<Import Project="\$\(VCTargetsPath\)\\Microsoft\.Cpp\.targets" \/>)/, `$1${itemGroup}$2`);
     updated = true;
   }
   if (updated) {
     await fs.promises.writeFile(vcxprojPath, vcxprojContent, 'utf8');
+    await printFileContents(vcxprojPath);
   }
-  await printFileContents(vcxprojPath);
   return packageStoreAssociationFilePath;
 }

Original file line number	Diff line number	Diff line change
`@@ -34970,7 +34970,7 @@ async function getAvailableWindowsSDKVersion() {`
`34970`	`34970`	`const entries = await fs.promises.readdir(basePath);`
`34971`	`34971`	`const versions = entries.filter(entry => /^10\.0\.\d+\.\d+$/.test(entry));`
`34972`	`34972`	`allVersions.push(...versions);`
`34973`		- core.debug(`Found Windows SDK versions in ${basePath}:`);
	`34973`	+ core.debug(`Found Windows SDK versions in "${basePath}"`);
`34974`	`34974`	versions.forEach(version => core.debug(` - ${version}`));
`34975`	`34975`	`}`
`34976`	`34976`	`catch (error) {`
`@@ -35001,7 +35001,7 @@ async function isWindowsSDKVersionAvailable(version) {`
`35001`	`35001`	`try {`
`35002`	`35002`	`const versionPath = path.join(basePath, version);`
`35003`	`35003`	`await fs.promises.access(versionPath, fs.constants.R_OK);`
`35004`		- core.info(`Found Windows SDK version ${version} at: ${versionPath}`);
	`35004`	+ core.info(`Found Windows SDK version ${version} at: "${versionPath}"`);
`35005`	`35005`	`return true;`
`35006`	`35006`	`}`
`35007`	`35007`	`catch (error) {`
`@@ -35049,17 +35049,14 @@ async function printFileContents(filePath) {`
`35049`	`35049`	`}`
`35050`	`35050`	`async function removeWindowsMobileSDKReference(vcxprojPath) {`
`35051`	`35051`	`let vcxprojContent = await fs.promises.readFile(vcxprojPath, 'utf8');`
`35052`		`- const itemGroupRegex = /([ \t]<ItemGroup>\r?\n[ \t]<SDKReference Include="WindowsMobile, Version=10.0.26100.0" \/>\r?\n[ \t]*<\/ItemGroup>\r?\n)/;`
	`35052`	`+ const itemGroupRegex = /([ \t]<ItemGroup>\r?\n[ \t]<SDKReference Include="WindowsMobile, Version=[^"\s]+" \/>\r?\n[ \t]*<\/ItemGroup>\r?\n)/;`
`35053`	`35053`	`const found = itemGroupRegex.test(vcxprojContent);`
`35054`	`35054`	`if (found) {`
`35055`		- core.info(`Removing WindowsMobile SDKReference ItemGroup from ${vcxprojPath}...`);
	`35055`	+ core.info(`Removing WindowsMobile SDKReference ItemGroup from "${vcxprojPath}"`);
`35056`	`35056`	`vcxprojContent = vcxprojContent.replace(itemGroupRegex, '');`
`35057`	`35057`	`await fs.promises.writeFile(vcxprojPath, vcxprojContent, 'utf8');`
`35058`	`35058`	`await printFileContents(vcxprojPath);`
`35059`	`35059`	`}`
`35060`		`- else {`
`35061`		- core.info(`No WindowsMobile SDKReference ItemGroup found in ${vcxprojPath}`);
`35062`		`- }`
`35063`	`35060`	`return found;`
`35064`	`35061`	`}`
`35065`	`35062`	`async function associateAppWithStore(vcxprojPath, sourcePackageAssociationFilePath) {`
`@@ -35084,7 +35081,7 @@ async function associateAppWithStore(vcxprojPath, sourcePackageAssociationFilePa`
`35084`	`35081`	`}`
`35085`	`35082`	`}`
`35086`	`35083`	`await writeXml(appxManifestPath, appxManifestXml);`
`35087`		- core.info(`Updated Package.appxmanifest with identity information from ${packageStoreAssociationFilePath}`);
	`35084`	+ core.info(`Updated Package.appxmanifest with identity information from "${packageStoreAssociationFilePath}"`);
`35088`	`35085`	`await printFileContents(appxManifestPath);`
`35089`	`35086`	`}`
`35090`	`35087`	`async function copyPackageStoreAssociationFile(vcxprojPath, sourcePackageAssociationFilePath) {`
`@@ -35099,13 +35096,13 @@ async function copyPackageStoreAssociationFile(vcxprojPath, sourcePackageAssocia`
`35099`	`35096`	`}`
`35100`	`35097`	`if (!/<None[^>]*Include="Package\.StoreAssociation\.xml"/.test(vcxprojContent)) {`
`35101`	`35098`	`const itemGroup = ' <ItemGroup>\n <None Include="Package.StoreAssociation.xml" />\n </ItemGroup>\n';`
`35102`		`- vcxprojContent = vcxprojContent.replace(/([ \t]<\/ItemGroup>\r?\n)([ \t]<Import Project="\$\(VCTargetsPath\)\\Microsoft\.Cpp\.targets" \/>)/, '$1' + itemGroup + '$2');`
	`35099`	+ vcxprojContent = vcxprojContent.replace(/([ \t]<\/ItemGroup>\r?\n)([ \t]<Import Project="\$\(VCTargetsPath\)\\Microsoft\.Cpp\.targets" \/>)/, `$1${itemGroup}$2`);
`35103`	`35100`	`updated = true;`
`35104`	`35101`	`}`
`35105`	`35102`	`if (updated) {`
`35106`	`35103`	`await fs.promises.writeFile(vcxprojPath, vcxprojContent, 'utf8');`
	`35104`	`+ await printFileContents(vcxprojPath);`
`35107`	`35105`	`}`
`35108`		`- await printFileContents(vcxprojPath);`
`35109`	`35106`	`return packageStoreAssociationFilePath;`
`35110`	`35107`	`}`
`35111`	`35108`
`@@ -37108,7 +37105,7 @@ const main = async () => {`
`37108`	`37105`	`catch (error) {`
`37109`	`37106`	throw new Error(`Output directory not found: "${outputDirectory}".`);
`37110`	`37107`	`}`
`37111`		- core.info(`outputDirectory: ${outputDirectory}`);
	`37108`	+ core.info(`outputDirectory: "${outputDirectory}"`);
`37112`	`37109`	core.setOutput(`output-directory`, outputDirectory);
`37113`	`37110`	`const allGlobber = await glob.create(path.join(outputDirectory, '*/'));`
`37114`	`37111`	`const allFiles = await allGlobber.glob();`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ const main = async () => {`
`84`	`84`	`} catch (error) {`
`85`	`85`	throw new Error(`Output directory not found: "${outputDirectory}".`);
`86`	`86`	`}`
`87`		- core.info(`outputDirectory: ${outputDirectory}`);
	`87`	+ core.info(`outputDirectory: "${outputDirectory}"`);
`88`	`88`	core.setOutput(`output-directory`, outputDirectory);
`89`	`89`	`const allGlobber = await glob.create(path.join(outputDirectory, '*/'));`
`90`	`90`	`const allFiles = await allGlobber.glob();`