Improved failure logging

Weatherlights · Mar 8, 2022 · 1b84f84 · Calnimptewa2 · Dec 1, 2022 · 1b84f84
1 parent 34fd066
commit 1b84f84
Show file tree

Hide file tree

Showing 29 changed files with 58 additions and 38 deletions.
diff --git a/Code/Program/.vs/NetworkShareMapper/v17/.suo b/Code/Program/.vs/NetworkShareMapper/v17/.suo
diff --git a/Code/Program/NetworkShareMapper/DriveSettings.cs b/Code/Program/NetworkShareMapper/DriveSettings.cs
@@ -95,19 +95,33 @@ public static void MapNetworkDrive(string sDriveLetter, string sNetworkPath, boo
 
             //If Drive is already mapped disconnect the current 
             //mapping before adding the new mapping
+            bool mapDrive = false;
             if (IsDriveMapped(sDriveLetter))
             {
                 if (GetMappedDriveLocation(sDriveLetter) != sNetworkPath)
                 {
-                    myLogWriter.LogWrite("The mapped drive on " + sDriveLetter + " is not " + sNetworkPath + ". Will reconnect.");
+                    myLogWriter.LogWrite("The mapped drive on " + sDriveLetter + " is not " + sNetworkPath + ". Will disconnect.");
                     DisconnectNetworkDrive(sDriveLetter, true);
+                    mapDrive = true;
                 }
             } else
             {
-                myLogWriter.LogWrite("Will now connect " + sDriveLetter + " to " + sNetworkPath);
+                mapDrive = true;
+
             }
 
-            WNetAddConnection2(ref oNetworkResource, Username, Password, 0);
+            if (mapDrive == true)
+            {
+                myLogWriter.LogWrite("Will now connect " + sDriveLetter + " to " + sNetworkPath);
+                int connectionResult = WNetAddConnection2(ref oNetworkResource, Username, Password, 0);
+
+                if (connectionResult == 0)
+                    myLogWriter.LogWrite("Drive mapping completed successfully.");
+                else if ( connectionResult == 85 )
+                    myLogWriter.LogWrite("Drive was allready mapped",1);
+                else
+                    myLogWriter.LogWrite("Drive mapping failed with code: " + connectionResult, 2);
+            }
         }
 
         public static int DisconnectNetworkDrive(string sDriveLetter, bool bForceDisconnect)

diff --git a/Code/Program/NetworkShareMapper/bin/Debug/NetworkShareMapper.exe b/Code/Program/NetworkShareMapper/bin/Debug/NetworkShareMapper.exe
diff --git a/Code/Program/NetworkShareMapper/bin/Debug/NetworkShareMapper.pdb b/Code/Program/NetworkShareMapper/bin/Debug/NetworkShareMapper.pdb
diff --git a/Code/Program/NetworkShareMapper/bin/Release/NetworkShareMapper.exe b/Code/Program/NetworkShareMapper/bin/Release/NetworkShareMapper.exe
diff --git a/Code/Program/NetworkShareMapper/bin/Release/NetworkShareMapper.pdb b/Code/Program/NetworkShareMapper/bin/Release/NetworkShareMapper.pdb
diff --git a/Code/Program/NetworkShareMapper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Code/Program/NetworkShareMapper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper.csproj.CoreCompileInputs.cache b/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-74cc5652f8c6842ded39e4ecea271779a6f3fdc6
+86ae6defac78c0ac07daa57fe8ca4fd7377ce992
diff --git a/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper.csproj.FileListAbsolute.txt b/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper.csproj.FileListAbsolute.txt
@@ -30,3 +30,4 @@ C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\Netwo
 C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Debug\NetworkShareMapper.exe
 C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Debug\NetworkShareMapper.pdb
 C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Debug\NetworkShareMapper.csproj.AssemblyReference.cache
+C:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Debug\NetworkShareMapper.csproj.AssemblyReference.cache
diff --git a/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper.exe b/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper.exe
diff --git a/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper.pdb b/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper.pdb
diff --git a/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper_MarkupCompile.cache b/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper_MarkupCompile.cache
@@ -4,7 +4,7 @@
 winexe
 C#
 .cs
-C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Debug\
+C:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Debug\
 NetworkShareMapper
 none
 false
@@ -13,7 +13,7 @@ DEBUG;TRACE
 1-1862082461
 
 111075033338
-209-2131610073
+2091569583699
 UnconfiguredNoticeWindow.xaml;
 
 False

diff --git a/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper_MarkupCompile.i.cache b/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper_MarkupCompile.i.cache
@@ -4,7 +4,7 @@
 winexe
 C#
 .cs
-C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Debug\
+C:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Debug\
 NetworkShareMapper
 none
 false
@@ -13,7 +13,7 @@ DEBUG;TRACE
 1-1862082461
 
 12-1298155837
-209-2131610073
+2091569583699
 UnconfiguredNoticeWindow.xaml;
 
 True

diff --git a/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper_MarkupCompile.i.lref b/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper_MarkupCompile.i.lref
@@ -1,4 +1,4 @@
 
 
-FC:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\UnconfiguredNoticeWindow.xaml;;
+FC:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\UnconfiguredNoticeWindow.xaml;;
 
diff --git a/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper_MarkupCompile.lref b/Code/Program/NetworkShareMapper/obj/Debug/NetworkShareMapper_MarkupCompile.lref
@@ -1,4 +1,4 @@
 
 
-FC:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\UnconfiguredNoticeWindow.xaml;;
+FC:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\UnconfiguredNoticeWindow.xaml;;
 
diff --git a/Code/Program/NetworkShareMapper/obj/NetworkShareMapper.csproj.nuget.dgspec.json b/Code/Program/NetworkShareMapper/obj/NetworkShareMapper.csproj.nuget.dgspec.json
@@ -1,24 +1,24 @@
 {
   "format": 1,
   "restore": {
-    "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj": {}
+    "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj": {}
   },
   "projects": {
-    "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj": {
+    "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj": {
       "version": "1.0.0",
       "restore": {
-        "projectUniqueName": "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
+        "projectUniqueName": "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
         "projectName": "NetworkShareMapper",
-        "projectPath": "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
-        "packagesPath": "C:\\Users\\HaukeGötze\\.nuget\\packages\\",
-        "outputPath": "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\obj\\",
+        "projectPath": "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
+        "packagesPath": "C:\\Users\\hauke\\.nuget\\packages\\",
+        "outputPath": "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\obj\\",
         "projectStyle": "PackageReference",
         "skipContentFileWrite": true,
         "fallbackFolders": [
           "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
         ],
         "configFilePaths": [
-          "C:\\Users\\HaukeGötze\\AppData\\Roaming\\NuGet\\NuGet.Config",
+          "C:\\Users\\hauke\\AppData\\Roaming\\NuGet\\NuGet.Config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
           "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
         ],

diff --git a/Code/Program/NetworkShareMapper/obj/NetworkShareMapper.csproj.nuget.g.props b/Code/Program/NetworkShareMapper/obj/NetworkShareMapper.csproj.nuget.g.props
@@ -5,12 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\HaukeGötze\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\hauke\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
     <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.0.1</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\HaukeGötze\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\hauke\.nuget\packages\" />
     <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
   <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">

diff --git a/Code/Program/NetworkShareMapper/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache b/Code/Program/NetworkShareMapper/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
diff --git a/.../Program/NetworkShareMapper/obj/Release/NetworkShareMapper.csproj.AssemblyReference.cache b/.../Program/NetworkShareMapper/obj/Release/NetworkShareMapper.csproj.AssemblyReference.cache
diff --git a/.../Program/NetworkShareMapper/obj/Release/NetworkShareMapper.csproj.CoreCompileInputs.cache b/.../Program/NetworkShareMapper/obj/Release/NetworkShareMapper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-1df39feaf0946a2996aebf9fa738b8f0b579c0a6
+374b4b34c569487adf9bc355c4a24a4bafcb3497
diff --git a/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper.csproj.FileListAbsolute.txt b/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper.csproj.FileListAbsolute.txt
@@ -28,3 +28,4 @@ C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\Netwo
 C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Release\NetworkShareMapper.csproj.CoreCompileInputs.cache
 C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Release\NetworkShareMapper.exe
 C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Release\NetworkShareMapper.pdb
+C:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Release\NetworkShareMapper.csproj.AssemblyReference.cache
diff --git a/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper.exe b/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper.exe
diff --git a/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper.pdb b/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper.pdb
diff --git a/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper_MarkupCompile.cache b/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper_MarkupCompile.cache
@@ -4,7 +4,7 @@
 winexe
 C#
 .cs
-C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Release\
+C:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Release\
 NetworkShareMapper
 none
 false
@@ -13,7 +13,7 @@ TRACE
 1-1862082461
 
 111075033338
-209-2131610073
+2091569583699
 UnconfiguredNoticeWindow.xaml;
 
 False

diff --git a/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper_MarkupCompile.i.cache b/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper_MarkupCompile.i.cache
@@ -4,7 +4,7 @@
 winexe
 C#
 .cs
-C:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Release\
+C:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\obj\Release\
 NetworkShareMapper
 none
 false
@@ -13,8 +13,8 @@ TRACE
 1-1862082461
 
 12512890755
-15767508510
+171830006697
 UnconfiguredNoticeWindow.xaml;
 
-False
+True
 
diff --git a/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper_MarkupCompile.i.lref b/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper_MarkupCompile.i.lref
@@ -0,0 +1,4 @@
+
+
+FC:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\UnconfiguredNoticeWindow.xaml;;
+
diff --git a/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper_MarkupCompile.lref b/Code/Program/NetworkShareMapper/obj/Release/NetworkShareMapper_MarkupCompile.lref
@@ -1,4 +1,4 @@
 
 
-FC:\Users\HaukeGötze\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\UnconfiguredNoticeWindow.xaml;;
+FC:\Users\hauke\GitHub\Intune-Network-Drive-Mapping-Tool\Code\Program\NetworkShareMapper\UnconfiguredNoticeWindow.xaml;;
 
diff --git a/Code/Program/NetworkShareMapper/obj/project.assets.json b/Code/Program/NetworkShareMapper/obj/project.assets.json
@@ -962,24 +962,24 @@
     ]
   },
   "packageFolders": {
-    "C:\\Users\\HaukeGötze\\.nuget\\packages\\": {},
+    "C:\\Users\\hauke\\.nuget\\packages\\": {},
     "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages": {}
   },
   "project": {
     "version": "1.0.0",
     "restore": {
-      "projectUniqueName": "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
+      "projectUniqueName": "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
       "projectName": "NetworkShareMapper",
-      "projectPath": "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
-      "packagesPath": "C:\\Users\\HaukeGötze\\.nuget\\packages\\",
-      "outputPath": "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\obj\\",
+      "projectPath": "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
+      "packagesPath": "C:\\Users\\hauke\\.nuget\\packages\\",
+      "outputPath": "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\obj\\",
       "projectStyle": "PackageReference",
       "skipContentFileWrite": true,
       "fallbackFolders": [
         "C:\\Program Files (x86)\\Microsoft Visual Studio\\Shared\\NuGetPackages"
       ],
       "configFilePaths": [
-        "C:\\Users\\HaukeGötze\\AppData\\Roaming\\NuGet\\NuGet.Config",
+        "C:\\Users\\hauke\\AppData\\Roaming\\NuGet\\NuGet.Config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.FallbackLocation.config",
         "C:\\Program Files (x86)\\NuGet\\Config\\Microsoft.VisualStudio.Offline.config"
       ],

diff --git a/Code/Program/NetworkShareMapper/obj/project.nuget.cache b/Code/Program/NetworkShareMapper/obj/project.nuget.cache
@@ -1,13 +1,13 @@
 {
   "version": 2,
-  "dgSpecHash": "14XYmimRxm0o+1aE+X4QPXtdBqn447c4x6D53r92prDTZiGuKAnFfxpAOesDggJRQ6V96NRk5XMc9sMhL9NG7A==",
+  "dgSpecHash": "tIyLXVQXd+Xp9iK69PECgSVXMTg25IgbCAf+zMHeTAWdYN5P1BQvcLt+YUMiWySwuCc0T2Ag2aTAvZGkTIN31A==",
   "success": true,
-  "projectFilePath": "C:\\Users\\HaukeGötze\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
+  "projectFilePath": "C:\\Users\\hauke\\GitHub\\Intune-Network-Drive-Mapping-Tool\\Code\\Program\\NetworkShareMapper\\NetworkShareMapper.csproj",
   "expectedPackageFiles": [
-    "C:\\Users\\HaukeGötze\\.nuget\\packages\\microsoft.windows.sdk.contracts\\10.0.22000.196\\microsoft.windows.sdk.contracts.10.0.22000.196.nupkg.sha512",
-    "C:\\Users\\HaukeGötze\\.nuget\\packages\\system.runtime.interopservices.windowsruntime\\4.3.0\\system.runtime.interopservices.windowsruntime.4.3.0.nupkg.sha512",
-    "C:\\Users\\HaukeGötze\\.nuget\\packages\\system.runtime.windowsruntime\\4.7.0\\system.runtime.windowsruntime.4.7.0.nupkg.sha512",
-    "C:\\Users\\HaukeGötze\\.nuget\\packages\\system.runtime.windowsruntime.ui.xaml\\4.7.0\\system.runtime.windowsruntime.ui.xaml.4.7.0.nupkg.sha512"
+    "C:\\Users\\hauke\\.nuget\\packages\\microsoft.windows.sdk.contracts\\10.0.22000.196\\microsoft.windows.sdk.contracts.10.0.22000.196.nupkg.sha512",
+    "C:\\Users\\hauke\\.nuget\\packages\\system.runtime.interopservices.windowsruntime\\4.3.0\\system.runtime.interopservices.windowsruntime.4.3.0.nupkg.sha512",
+    "C:\\Users\\hauke\\.nuget\\packages\\system.runtime.windowsruntime\\4.7.0\\system.runtime.windowsruntime.4.7.0.nupkg.sha512",
+    "C:\\Users\\hauke\\.nuget\\packages\\system.runtime.windowsruntime.ui.xaml\\4.7.0\\system.runtime.windowsruntime.ui.xaml.4.7.0.nupkg.sha512"
   ],
   "logs": []
 }