Merge pull request #1938 from tyrielv/tyrielv/net10-remove-service-ui

Remove GVFS.Service.UI (dead code)

Author: tyrielv

Directory.Packages.props

@@ -25,7 +25,6 @@
     <PackageVersion Include="Microsoft.Windows.ProjFS" Version="1.1.19156.1" />
 
     <!-- Windows -->
-    <PackageVersion Include="Microsoft.Windows.SDK.Contracts" Version="10.0.17134.1000-preview" />
     <PackageVersion Include="System.ServiceProcess.ServiceController" Version="4.5.0" />
 
     <!-- Build / packaging -->

GVFS.sln

@@ -31,8 +31,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GVFS.ReadObjectHook", "GVFS
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Service", "GVFS\GVFS.Service\GVFS.Service.csproj", "{5E236AF3-31D7-4313-A129-F080FF058283}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Service.UI", "GVFS\GVFS.Service.UI\GVFS.Service.UI.csproj", "{D8FB16E2-EAE0-4E05-A993-940062CD7CA7}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Tests", "GVFS\GVFS.Tests\GVFS.Tests.csproj", "{FE70E0D6-B0A6-421D-AA12-F28F822F09A0}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.UnitTests", "GVFS\GVFS.UnitTests\GVFS.UnitTests.csproj", "{1A46C414-7F39-4EF0-B216-A88033D18678}"
@@ -109,10 +107,6 @@ Global
 		{5E236AF3-31D7-4313-A129-F080FF058283}.Debug|x64.Build.0 = Debug|Any CPU
 		{5E236AF3-31D7-4313-A129-F080FF058283}.Release|x64.ActiveCfg = Release|Any CPU
 		{5E236AF3-31D7-4313-A129-F080FF058283}.Release|x64.Build.0 = Release|Any CPU
-		{D8FB16E2-EAE0-4E05-A993-940062CD7CA7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D8FB16E2-EAE0-4E05-A993-940062CD7CA7}.Debug|x64.Build.0 = Debug|Any CPU
-		{D8FB16E2-EAE0-4E05-A993-940062CD7CA7}.Release|x64.ActiveCfg = Release|Any CPU
-		{D8FB16E2-EAE0-4E05-A993-940062CD7CA7}.Release|x64.Build.0 = Release|Any CPU
 		{FE70E0D6-B0A6-421D-AA12-F28F822F09A0}.Debug|x64.ActiveCfg = Debug|Any CPU
 		{FE70E0D6-B0A6-421D-AA12-F28F822F09A0}.Debug|x64.Build.0 = Debug|Any CPU
 		{FE70E0D6-B0A6-421D-AA12-F28F822F09A0}.Release|x64.ActiveCfg = Release|Any CPU

GVFS/GVFS.Common/GVFSConstants.cs

@@ -68,7 +68,6 @@ public static class Service
         {
             public const string ServiceName = "GVFS.Service";
             public const string LogDirectory = "Logs";
-            public const string UIName = "GVFS.Service.UI";
         }
 
         public static class MediaTypes
@@ -108,7 +107,6 @@ public static class LogFileTypes
             public const string Prefetch = "prefetch";
             public const string Repair = "repair";
             public const string Service = "service";
-            public const string ServiceUI = "service_ui";
             public const string Sparse = "sparse";
             public const string UpgradeVerb = UpgradePrefix + "_verb";
             public const string UpgradeProcess = UpgradePrefix + "_process";

GVFS/GVFS.Installers/Setup.iss

@@ -15,7 +15,6 @@
 #define GVFSConfigFileName "gvfs.config"
 #define GVFSStatuscacheTokenFileName "EnableGitStatusCacheToken.dat"
 #define ServiceName "GVFS.Service"
-#define ServiceUIName "VFS For Git"
 
 [Setup]
 AppId={{489CA581-F131-4C28-BE04-4FB178933E6D}
@@ -66,9 +65,6 @@ DestDir: "{app}"; Flags: ignoreversion; Source:"{#LayoutDir}\GVFS.Service.exe";
 [Dirs]
 Name: "{app}\ProgramData\{#ServiceName}"; Permissions: users-readexec
 
-[Icons]
-Name: "{commonstartmenu}\{#ServiceUIName}"; Filename: "{app}\GVFS.Service.UI.exe"; AppUserModelID: "GVFS"
-
 [UninstallDelete]
 ; Deletes the entire installation directory, including files and subdirectories
 Type: filesandordirs; Name: "{app}";
@@ -249,38 +245,6 @@ begin
     end;
 end;
 
-procedure StartGVFSServiceUI();
-var
-  ResultCode: integer;
-begin
-  if GetEnv('GVFS_UNATTENDED') = '1' then
-    begin
-      Log('StartGVFSServiceUI: Skipping launching GVFS.Service.UI');
-    end
-  else if ExecAsOriginalUser(ExpandConstant('{app}\GVFS.Service.UI.exe'), '', '', SW_HIDE, ewNoWait, ResultCode) then
-    begin
-      Log('StartGVFSServiceUI: Successfully launched GVFS.Service.UI');
-    end
-  else
-    begin
-      Log('StartGVFSServiceUI: Failed to launch GVFS.Service.UI');
-    end;
-end;
-
-procedure StopGVFSServiceUI();
-var
-  ResultCode: integer;
-begin
-  if Exec('powershell.exe', '-NoProfile "Stop-Process -Name GVFS.Service.UI"', '', SW_HIDE, ewNoWait, ResultCode) then
-    begin
-      Log('StopGVFSServiceUI: Successfully stopped GVFS.Service.UI');
-    end
-  else
-    begin
-      RaiseException('Fatal: Could not stop process: GVFS.Service.UI');
-    end;
-end;
-
 function DeleteFileIfItExists(FilePath: string) : Boolean;
 begin
   Result := False;
@@ -688,7 +652,6 @@ begin
     ssPostInstall:
       begin
         MigrateConfigAndStatusCacheFiles();
-        StartGVFSServiceUI();
         if ExpandConstant('{param:REMOUNTREPOS|true}') = 'true' then
           begin
             MountRepos();
@@ -707,7 +670,6 @@ begin
   case CurStep of
     usUninstall:
       begin
-        StopGVFSServiceUI();
         UninstallService('GVFS.Service', False);
         RemovePath(ExpandConstant('{app}'));
       end;
@@ -731,7 +693,6 @@ begin
       Abort();
     end;
   StopService('GVFS.Service');
-  StopGVFSServiceUI();
   UninstallGvFlt();
   UninstallProjFSIfNecessary();
 end;

GVFS/GVFS.Payload/GVFS.Payload.csproj

@@ -22,7 +22,6 @@
     <ProjectReference Include="..\GVFS.Mount\GVFS.Mount.csproj" />
     <ProjectReference Include="..\GVFS.PostIndexChangedHook\GVFS.PostIndexChangedHook.vcxproj" />
     <ProjectReference Include="..\GVFS.ReadObjectHook\GVFS.ReadObjectHook.vcxproj" />
-    <ProjectReference Include="..\GVFS.Service.UI\GVFS.Service.UI.csproj" />
     <ProjectReference Include="..\GVFS.Service\GVFS.Service.csproj" />
     <ProjectReference Include="..\GVFS.VirtualFileSystemHook\GVFS.VirtualFileSystemHook.vcxproj" />
     <ProjectReference Include="..\GVFS\GVFS.csproj" />
@@ -47,7 +46,6 @@
       $(OutputPath)\GVFS.PostIndexChangedHook.exe;
       $(OutputPath)\GVFS.ReadObjectHook.exe;
       $(OutputPath)\GVFS.Service.exe;
-      $(OutputPath)\GVFS.Service.UI.exe;
       $(OutputPath)\GVFS.VirtualFileSystemHook.exe;
       $(OutputPath)\GVFS.Virtualization.dll;">
       <Authenticode>Microsoft400</Authenticode>

GVFS/GVFS.Payload/layout.bat

@@ -54,7 +54,6 @@ xcopy /Y /S %BUILD_OUT%\GVFS\%MANAGED_OUT_FRAGMENT%\* %OUTPUT%
 xcopy /Y /S %BUILD_OUT%\GVFS.Hooks\%MANAGED_OUT_FRAGMENT%\* %OUTPUT%
 xcopy /Y /S %BUILD_OUT%\GVFS.Mount\%MANAGED_OUT_FRAGMENT%\* %OUTPUT%
 xcopy /Y /S %BUILD_OUT%\GVFS.Service\%MANAGED_OUT_FRAGMENT%\* %OUTPUT%
-xcopy /Y /S %BUILD_OUT%\GVFS.Service.UI\%MANAGED_OUT_FRAGMENT%\* %OUTPUT%
 xcopy /Y /S %BUILD_OUT%\GitHooksLoader\%NATIVE_OUT_FRAGMENT%\* %OUTPUT%
 xcopy /Y /S %BUILD_OUT%\GVFS.PostIndexChangedHook\%NATIVE_OUT_FRAGMENT%\* %OUTPUT%
 xcopy /Y /S %BUILD_OUT%\GVFS.ReadObjectHook\%NATIVE_OUT_FRAGMENT%\* %OUTPUT%