Fix checking reparse point error code

nirbar · Nov 27, 2023 · 5b7518c · 5b7518c
1 parent 0f1e5b7
commit 5b7518c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/github-actions-build.yml b/.github/workflows/github-actions-build.yml
@@ -11,7 +11,7 @@ on:
       psw_wix_version:
         description: 'PanelSwWix4 version'
         required: true
-        default: 5.0.0-psw-wix.0207-20
+        default: 5.0.0-psw-wix.0211-28
         type: string
 
 jobs:
@@ -37,7 +37,7 @@ jobs:
             Add-Content -Path ${{ github.env }} -Value "PSW_WIX_VERSION=${{ env.DEFAULT_PSW_WIX_VERSION }}"
           }
         env:
-          DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0142-17'
+          DEFAULT_PSW_WIX_VERSION: '5.0.0-psw-wix.0211-28'
 
       - name: Prepare for build
         run: |

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-    <Wix4Version Condition=" '$(Wix4Version)' == '' ">4.0.2</Wix4Version>
-    <PanelSwWix4Version Condition=" '$(PanelSwWix4Version)' == '' ">5.0.0-psw-wix.0207-20</PanelSwWix4Version>
+    <Wix4Version Condition=" '$(Wix4Version)' == '' ">4.0.3</Wix4Version>
+    <PanelSwWix4Version Condition=" '$(PanelSwWix4Version)' == '' ">5.0.0-psw-wix.0211-28</PanelSwWix4Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Nuget/PanelSwWixExtension4.props b/Nuget/PanelSwWixExtension4.props
@@ -4,6 +4,6 @@
     <PanelSwWixExtensionDir>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\tools\lib'))</PanelSwWixExtensionDir>
     <PanelSwWixExtension>$(PanelSwWixExtensionDir)\PanelSwWixExtension.dll</PanelSwWixExtension>
     <PanelSwWixHarvestExtension>$(PanelSwWixExtensionDir)\PanelSwWixHarvestExtension.dll</PanelSwWixHarvestExtension>
-    <DefineConstants>PanelSwWixExtensionDir=$(PanelSwWixExtensionDir);PanelSwWixExtension=$(PanelSwWixExtension);$(DefineConstants)</DefineConstants>
+    <DefineConstants>PanelSwWixExtensionDir=$(PanelSwWixExtensionDir);PanelSwWixExtension=$(PanelSwWixExtension);PanelSwWixHarvestExtension=$(PanelSwWixHarvestExtension);$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/PanelSwCustomActions/FileOperations.cpp b/PanelSwCustomActions/FileOperations.cpp
@@ -69,6 +69,7 @@ extern "C" UINT __stdcall DeletePath(MSIHANDLE hInstall)
 			szFilePath[i] = NULL;
 		}
 
+		WcaLog(LOGLEVEL::LOGMSG_STANDARD, "Will delete path '%ls'", (LPCWSTR)szFilePath);
 		hr = commitCAD.AddDeleteFile((LPCWSTR)szFilePath, flags);
 		ExitOnFailure(hr, "Failed creating custom action data for commit action.");
 	}
@@ -690,7 +691,7 @@ bool CFileOperations::IsSymbolicLinkOrMount(LPCWSTR szPath)
 	{
 		hr = S_FALSE;
 		DWORD dwErr = ::GetLastError();
-		ExitOnNullWithLastError((dwErr == ERROR_FILE_NOT_FOUND), hr, "Path '%ls' can't be checked for reparse point tag", szPath);
+		ExitOnNullWithLastError(((dwErr == ERROR_FILE_NOT_FOUND) || (dwErr == ERROR_PATH_NOT_FOUND)), hr, "Path '%ls' can't be checked for reparse point tag", szPath);
 	}
 
 LExit:

diff --git a/TidyBuild.custom.props b/TidyBuild.custom.props
@@ -2,7 +2,7 @@
 <Project ToolsVersion="16.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildThisFileDirectory)TidyBuild.user.props" Condition="Exists('$(MSBuildThisFileDirectory)TidyBuild.user.props')"/>
   <PropertyGroup>
-    <FullVersion>3.11.2</FullVersion>
+    <FullVersion>3.11.3</FullVersion>
     <FullVersion Condition=" '$(APPVEYOR_BUILD_VERSION)'!='' ">$(APPVEYOR_BUILD_VERSION)</FullVersion>
     <FullVersion Condition=" '$(GITHUB_RUN_NUMBER)'!='' ">$(FullVersion).$(GITHUB_RUN_NUMBER)</FullVersion>
     <ProductName>PanelSwWixExtension</ProductName>

diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "msbuild-sdks": {
-    "WixToolset.Sdk": "4.0.2",
-    "PanelSwWix4.Sdk": "5.0.0-psw-wix.0207-20",
+    "WixToolset.Sdk": "4.0.3",
+    "PanelSwWix4.Sdk": "5.0.0-psw-wix.0211-28",
     "Microsoft.Build.Traversal": "4.0.0"
   },
   "sdk": {