diff --git a/Scalar.Common/InstallerPreRunChecker.cs b/Scalar.Common/InstallerPreRunChecker.cs index 8a398c13ab..293437b4e5 100644 --- a/Scalar.Common/InstallerPreRunChecker.cs +++ b/Scalar.Common/InstallerPreRunChecker.cs @@ -74,11 +74,8 @@ public virtual bool IsInstallationBlockedByRunningProcess(out string consoleErro { consoleError = null; - // While checking for blocking processes like Scalar.Mount immediately after un-mounting, - // then sometimes Scalar.Mount shows up as running. But if the check is done after waiting - // for some time, then eventually Scalar.Mount goes away. The retry loop below is to help - // account for this delay between the time un-mount call returns and when Scalar.Mount - // actually quits. + // The retry loop below is to help account for the delay between calls to stop Scalar + // processes and those processes exiting. this.tracer.RelatedInfo("Checking if Scalar or dependent processes are running."); int retryCount = 10; HashSet processList = null; diff --git a/Scalar.Common/Platforms/POSIX/POSIXPlatform.cs b/Scalar.Common/Platforms/POSIX/POSIXPlatform.cs index 2572eea681..0134b3bf7d 100644 --- a/Scalar.Common/Platforms/POSIX/POSIXPlatform.cs +++ b/Scalar.Common/Platforms/POSIX/POSIXPlatform.cs @@ -259,7 +259,7 @@ public override string ProgramLocaterCommand public override HashSet UpgradeBlockingProcesses { - get { return new HashSet(StringComparer.OrdinalIgnoreCase) { "Scalar.Mount", "git", "wish" }; } + get { return new HashSet(StringComparer.OrdinalIgnoreCase) { "git", "wish" }; } } public override bool SupportsUpgradeWhileRunning => true; diff --git a/Scalar.Common/Platforms/Windows/WindowsPlatform.cs b/Scalar.Common/Platforms/Windows/WindowsPlatform.cs index 4373ae2d18..e55a051b49 100644 --- a/Scalar.Common/Platforms/Windows/WindowsPlatform.cs +++ b/Scalar.Common/Platforms/Windows/WindowsPlatform.cs @@ -441,7 +441,7 @@ public override string ProgramLocaterCommand public override HashSet UpgradeBlockingProcesses { - get { return new HashSet(StringComparer.OrdinalIgnoreCase) { "Scalar", "Scalar.Mount", "git", "ssh-agent", "wish", "bash" }; } + get { return new HashSet(StringComparer.OrdinalIgnoreCase) { "Scalar", "git", "ssh-agent", "wish", "bash" }; } } // Tests show that 250 is the max supported pipe name length diff --git a/Scalar.Common/ScalarPlatform.cs b/Scalar.Common/ScalarPlatform.cs index 3e9353119e..45abe12648 100644 --- a/Scalar.Common/ScalarPlatform.cs +++ b/Scalar.Common/ScalarPlatform.cs @@ -164,11 +164,6 @@ public abstract class ScalarPlatformConstants /// public abstract HashSet UpgradeBlockingProcesses { get; } - public string MountExecutableName - { - get { return "Scalar.Mount" + this.ExecutableExtension; } - } - public string ScalarUpgraderExecutableName { get { return "Scalar.Upgrader" + this.ExecutableExtension; } diff --git a/Scalar.Installer.Mac/Scalar.Installer.Mac.csproj b/Scalar.Installer.Mac/Scalar.Installer.Mac.csproj index c0fcba5550..b095c0d0ae 100644 --- a/Scalar.Installer.Mac/Scalar.Installer.Mac.csproj +++ b/Scalar.Installer.Mac/Scalar.Installer.Mac.csproj @@ -13,7 +13,6 @@ - diff --git a/Scalar.Installer.Mac/layout.sh b/Scalar.Installer.Mac/layout.sh index c414e30e59..110e43ff51 100755 --- a/Scalar.Installer.Mac/layout.sh +++ b/Scalar.Installer.Mac/layout.sh @@ -61,9 +61,6 @@ function CopyScalar() copyCmd="cp -Rf \"${OUT_DIR}/Scalar/${PUBPATH_FRAGMENT}\" \"${SCALAR_DESTINATION}\"" || exit 1 eval $copyCmd || exit 1 - copyCmd="cp -Rf \"${OUT_DIR}/Scalar.Mount/${PUBPATH_FRAGMENT}\" \"${SCALAR_DESTINATION}\"" || exit 1 - eval $copyCmd || exit 1 - copyCmd="cp -Rf \"${OUT_DIR}/Scalar.Service/${PUBPATH_FRAGMENT}\" \"${SCALAR_DESTINATION}\"" || exit 1 eval $copyCmd || exit 1 diff --git a/Scalar.Installer.Windows/Scalar.Installer.Windows.csproj b/Scalar.Installer.Windows/Scalar.Installer.Windows.csproj index 5a4e27f8ec..21aeb187ca 100644 --- a/Scalar.Installer.Windows/Scalar.Installer.Windows.csproj +++ b/Scalar.Installer.Windows/Scalar.Installer.Windows.csproj @@ -13,7 +13,6 @@ - diff --git a/Scalar.Installer.Windows/Setup.iss b/Scalar.Installer.Windows/Setup.iss index b0ad720359..6f1d534554 100644 --- a/Scalar.Installer.Windows/Setup.iss +++ b/Scalar.Installer.Windows/Setup.iss @@ -241,7 +241,7 @@ function IsScalarRunning(): Boolean; var ResultCode: integer; begin - if Exec('powershell.exe', '-NoProfile "Get-Process scalar,scalar.mount | foreach {exit 10}"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then + if Exec('powershell.exe', '-NoProfile "Get-Process scalar | foreach {exit 10}"', '', SW_HIDE, ewWaitUntilTerminated, ResultCode) then begin if ResultCode = 10 then begin diff --git a/Scalar.Mount/InProcessMount.cs b/Scalar.Mount/InProcessMount.cs deleted file mode 100644 index ee415f8f0a..0000000000 --- a/Scalar.Mount/InProcessMount.cs +++ /dev/null @@ -1,264 +0,0 @@ -using Scalar.Common; -using Scalar.Common.FileSystem; -using Scalar.Common.Git; -using Scalar.Common.Http; -using Scalar.Common.Maintenance; -using Scalar.Common.NamedPipes; -using Scalar.Common.Tracing; -using System; -using System.IO; -using System.Threading; - -namespace Scalar.Mount -{ - public class InProcessMount - { - private readonly bool showDebugWindow; - - private ScalarEnlistment enlistment; - private ITracer tracer; - - private CacheServerInfo cacheServer; - private RetryConfig retryConfig; - - private ScalarContext context; - private ScalarGitObjects gitObjects; - - private MountState currentState; - private ManualResetEvent unmountEvent; - - public InProcessMount(ITracer tracer, ScalarEnlistment enlistment, CacheServerInfo cacheServer, RetryConfig retryConfig, bool showDebugWindow) - { - this.tracer = tracer; - this.retryConfig = retryConfig; - this.cacheServer = cacheServer; - this.enlistment = enlistment; - this.showDebugWindow = showDebugWindow; - this.unmountEvent = new ManualResetEvent(false); - } - - private enum MountState - { - Invalid = 0, - - Mounting, - Ready, - Unmounting, - MountFailed - } - - public void Mount(EventLevel verbosity, Keywords keywords) - { - this.currentState = MountState.Mounting; - - // We must initialize repo metadata before starting the pipe server so it - // can immediately handle status requests - string error; - if (!RepoMetadata.TryInitialize(this.tracer, this.enlistment.DotScalarRoot, out error)) - { - this.FailMountAndExit("Failed to load repo metadata: " + error); - } - - string gitObjectsRoot; - GitProcess process = new GitProcess(this.enlistment); - GitProcess.ConfigResult result = process.GetFromLocalConfig(ScalarConstants.GitConfig.ObjectCache); - if (!result.TryParseAsString(out gitObjectsRoot, out error)) - { - this.FailMountAndExit("Failed to determine git objects root from git config: " + error); - } - - string localCacheRoot = Path.GetDirectoryName(gitObjectsRoot); - this.tracer.RelatedEvent( - EventLevel.Informational, - "CachePathsLoaded", - new EventMetadata - { - { "gitObjectsRoot", gitObjectsRoot }, - { "localCacheRoot", localCacheRoot }, - }); - - this.enlistment.InitializeCachePaths(localCacheRoot, gitObjectsRoot); - - using (NamedPipeServer pipeServer = this.StartNamedPipe()) - { - this.tracer.RelatedEvent( - EventLevel.Informational, - $"{nameof(this.Mount)}_StartedNamedPipe", - new EventMetadata { { "NamedPipeName", this.enlistment.NamedPipeName } }); - - this.context = this.CreateContext(); - - if (this.context.Unattended) - { - this.tracer.RelatedEvent(EventLevel.Critical, ScalarConstants.UnattendedEnvironmentVariable, null); - } - - this.ValidateMountPoints(); - - ScalarPlatform.Instance.ConfigureVisualStudio(this.enlistment.GitBinPath, this.tracer); - - this.MountAndStartWorkingDirectoryCallbacks(this.cacheServer); - - Console.Title = "Scalar " + ProcessHelper.GetCurrentProcessVersion() + " - " + this.enlistment.EnlistmentRoot; - - this.tracer.RelatedEvent( - EventLevel.Informational, - "Mount", - new EventMetadata - { - // Use TracingConstants.MessageKey.InfoMessage rather than TracingConstants.MessageKey.CriticalMessage - // as this message should not appear as an error - { TracingConstants.MessageKey.InfoMessage, "Virtual repo is ready" }, - }, - Keywords.Telemetry); - - this.currentState = MountState.Ready; - - this.unmountEvent.WaitOne(); - } - } - - private ScalarContext CreateContext() - { - PhysicalFileSystem fileSystem = new PhysicalFileSystem(); - return new ScalarContext(this.tracer, fileSystem, this.enlistment); - } - - private void ValidateMountPoints() - { - DirectoryInfo workingDirectoryRootInfo = new DirectoryInfo(this.enlistment.WorkingDirectoryBackingRoot); - if (!workingDirectoryRootInfo.Exists) - { - this.FailMountAndExit("Failed to initialize file system callbacks. Directory \"{0}\" must exist.", this.enlistment.WorkingDirectoryBackingRoot); - } - - string dotGitPath = Path.Combine(this.enlistment.WorkingDirectoryBackingRoot, ScalarConstants.DotGit.Root); - DirectoryInfo dotGitPathInfo = new DirectoryInfo(dotGitPath); - if (!dotGitPathInfo.Exists) - { - this.FailMountAndExit("Failed to mount. Directory \"{0}\" must exist.", dotGitPathInfo); - } - } - - private NamedPipeServer StartNamedPipe() - { - try - { - return NamedPipeServer.StartNewServer(this.enlistment.NamedPipeName, this.tracer, this.HandleRequest); - } - catch (PipeNameLengthException) - { - this.FailMountAndExit("Failed to create mount point. Mount path exceeds the maximum number of allowed characters"); - return null; - } - } - - private void FailMountAndExit(string error, params object[] args) - { - this.currentState = MountState.MountFailed; - - this.tracer.RelatedError(error, args); - if (this.showDebugWindow) - { - Console.WriteLine("\nPress Enter to Exit"); - Console.ReadLine(); - } - - Environment.Exit((int)ReturnCode.GenericError); - } - - private T CreateOrReportAndExit(Func factory, string reportMessage) - { - try - { - return factory(); - } - catch (Exception e) - { - this.FailMountAndExit(reportMessage + " " + e.ToString()); - throw; - } - } - - private void HandleRequest(ITracer requestTracer, string request, NamedPipeServer.Connection connection) - { - NamedPipeMessages.Message message = NamedPipeMessages.Message.FromString(request); - - switch (message.Header) - { - case NamedPipeMessages.Unmount.Request: - this.HandleUnmountRequest(connection); - break; - - default: - EventMetadata metadata = new EventMetadata(); - metadata.Add("Area", "Mount"); - metadata.Add("Header", message.Header); - this.tracer.RelatedError(metadata, "HandleRequest: Unknown request"); - - connection.TrySendResponse(NamedPipeMessages.UnknownRequest); - break; - } - } - - private void HandleUnmountRequest(NamedPipeServer.Connection connection) - { - switch (this.currentState) - { - case MountState.Mounting: - connection.TrySendResponse(NamedPipeMessages.Unmount.NotMounted); - break; - - // Even if the previous mount failed, attempt to unmount anyway. Otherwise the user has no - // recourse but to kill the process. - case MountState.MountFailed: - goto case MountState.Ready; - - case MountState.Ready: - this.currentState = MountState.Unmounting; - - connection.TrySendResponse(NamedPipeMessages.Unmount.Acknowledged); - connection.TrySendResponse(NamedPipeMessages.Unmount.Completed); - - this.unmountEvent.Set(); - Environment.Exit((int)ReturnCode.Success); - break; - - case MountState.Unmounting: - connection.TrySendResponse(NamedPipeMessages.Unmount.AlreadyUnmounting); - break; - - default: - connection.TrySendResponse(NamedPipeMessages.UnknownScalarState); - break; - } - } - - private void MountAndStartWorkingDirectoryCallbacks(CacheServerInfo cache) - { - string error; - if (!this.context.Enlistment.Authentication.TryInitialize(this.context.Tracer, this.context.Enlistment, out error)) - { - this.FailMountAndExit("Failed to obtain git credentials: " + error); - } - - GitObjectsHttpRequestor objectRequestor = new GitObjectsHttpRequestor(this.context.Tracer, this.context.Enlistment, cache, this.retryConfig); - this.gitObjects = new ScalarGitObjects(this.context, objectRequestor); - - int majorVersion; - int minorVersion; - if (!RepoMetadata.Instance.TryGetOnDiskLayoutVersion(out majorVersion, out minorVersion, out error)) - { - this.FailMountAndExit("Error: {0}", error); - } - - if (majorVersion != ScalarPlatform.Instance.DiskLayoutUpgrade.Version.CurrentMajorVersion) - { - this.FailMountAndExit( - "Error: On disk version ({0}) does not match current version ({1})", - majorVersion, - ScalarPlatform.Instance.DiskLayoutUpgrade.Version.CurrentMajorVersion); - } - } - } -} diff --git a/Scalar.Mount/InProcessMountVerb.cs b/Scalar.Mount/InProcessMountVerb.cs deleted file mode 100644 index e26151ed54..0000000000 --- a/Scalar.Mount/InProcessMountVerb.cs +++ /dev/null @@ -1,226 +0,0 @@ -using CommandLine; -using Scalar.Common; -using Scalar.Common.Git; -using Scalar.Common.Http; -using Scalar.Common.Tracing; -using System; -using System.ComponentModel; -using System.IO; -using System.Runtime.InteropServices; - -namespace Scalar.Mount -{ - [Verb("mount", HelpText = "Starts the background mount process")] - public class InProcessMountVerb - { - private TextWriter output; - - public InProcessMountVerb() - { - this.output = Console.Out; - this.ReturnCode = ReturnCode.Success; - - this.InitializeDefaultParameterValues(); - } - - public ReturnCode ReturnCode { get; private set; } - - [Option( - 'v', - ScalarConstants.VerbParameters.Mount.Verbosity, - Default = ScalarConstants.VerbParameters.Mount.DefaultVerbosity, - Required = false, - HelpText = "Sets the verbosity of console logging. Accepts: Verbose, Informational, Warning, Error")] - public string Verbosity { get; set; } - - [Option( - 'k', - ScalarConstants.VerbParameters.Mount.Keywords, - Default = ScalarConstants.VerbParameters.Mount.DefaultKeywords, - Required = false, - HelpText = "A CSV list of logging filter keywords. Accepts: Any, Network")] - public string KeywordsCsv { get; set; } - - [Option( - 'd', - ScalarConstants.VerbParameters.Mount.DebugWindow, - Default = false, - Required = false, - HelpText = "Show the debug window. By default, all output is written to a log file and no debug window is shown.")] - public bool ShowDebugWindow { get; set; } - - [Option( - 's', - ScalarConstants.VerbParameters.Mount.StartedByService, - Default = "false", - Required = false, - HelpText = "Service initiated mount.")] - public string StartedByService { get; set; } - - [Option( - 'b', - ScalarConstants.VerbParameters.Mount.StartedByVerb, - Default = false, - Required = false, - HelpText = "Verb initiated mount.")] - public bool StartedByVerb { get; set; } - - [Value( - 0, - Required = true, - MetaName = "Enlistment Root Path", - HelpText = "Full or relative path to the Scalar enlistment root")] - public string EnlistmentRootPathParameter { get; set; } - - public void InitializeDefaultParameterValues() - { - this.Verbosity = ScalarConstants.VerbParameters.Mount.DefaultVerbosity; - this.KeywordsCsv = ScalarConstants.VerbParameters.Mount.DefaultKeywords; - } - - public void Execute() - { - if (this.StartedByVerb) - { - // If this process was started by a verb it means that StartBackgroundScalarProcess was used - // and we should be running in the background. PrepareProcessToRunInBackground will perform - // any platform specific preparation required to run as a background process. - ScalarPlatform.Instance.PrepareProcessToRunInBackground(); - } - - ScalarEnlistment enlistment = this.CreateEnlistment(this.EnlistmentRootPathParameter); - - EventLevel verbosity; - Keywords keywords; - this.ParseEnumArgs(out verbosity, out keywords); - - JsonTracer tracer = this.CreateTracer(enlistment, verbosity, keywords); - - CacheServerInfo cacheServer = CacheServerResolver.GetCacheServerFromConfig(enlistment); - - tracer.WriteStartEvent( - enlistment.EnlistmentRoot, - enlistment.RepoUrl, - cacheServer.Url, - new EventMetadata - { - { "IsElevated", ScalarPlatform.Instance.IsElevated() }, - { nameof(this.EnlistmentRootPathParameter), this.EnlistmentRootPathParameter }, - { nameof(this.StartedByService), this.StartedByService }, - { nameof(this.StartedByVerb), this.StartedByVerb }, - }); - - AppDomain.CurrentDomain.UnhandledException += (object sender, UnhandledExceptionEventArgs e) => - { - this.UnhandledScalarExceptionHandler(tracer, sender, e); - }; - - string error; - RetryConfig retryConfig; - if (!RetryConfig.TryLoadFromGitConfig(tracer, enlistment, out retryConfig, out error)) - { - this.ReportErrorAndExit(tracer, "Failed to determine Scalar timeout and max retries: " + error); - } - - InProcessMount mountHelper = new InProcessMount(tracer, enlistment, cacheServer, retryConfig, this.ShowDebugWindow); - - try - { - mountHelper.Mount(verbosity, keywords); - } - catch (Exception ex) - { - this.ReportErrorAndExit(tracer, "Failed to mount: {0}", ex.Message); - } - } - - private void UnhandledScalarExceptionHandler(ITracer tracer, object sender, UnhandledExceptionEventArgs e) - { - Exception exception = e.ExceptionObject as Exception; - - EventMetadata metadata = new EventMetadata(); - metadata.Add("Exception", exception.ToString()); - metadata.Add("IsTerminating", e.IsTerminating); - tracer.RelatedError(metadata, "UnhandledScalarExceptionHandler caught unhandled exception"); - } - - private JsonTracer CreateTracer(ScalarEnlistment enlistment, EventLevel verbosity, Keywords keywords) - { - JsonTracer tracer = new JsonTracer(ScalarConstants.ScalarEtwProviderName, "ScalarMount", enlistment.GetEnlistmentId(), enlistment.GetMountId()); - tracer.AddLogFileEventListener( - ScalarEnlistment.GetNewScalarLogFileName(enlistment.ScalarLogsRoot, ScalarConstants.LogFileTypes.MountProcess), - verbosity, - keywords); - if (this.ShowDebugWindow) - { - tracer.AddDiagnosticConsoleEventListener(verbosity, keywords); - } - - return tracer; - } - - private void ParseEnumArgs(out EventLevel verbosity, out Keywords keywords) - { - if (!Enum.TryParse(this.KeywordsCsv, out keywords)) - { - this.ReportErrorAndExit("Error: Invalid logging filter keywords: " + this.KeywordsCsv); - } - - if (!Enum.TryParse(this.Verbosity, out verbosity)) - { - this.ReportErrorAndExit("Error: Invalid logging verbosity: " + this.Verbosity); - } - } - - private ScalarEnlistment CreateEnlistment(string enlistmentRootPath) - { - string gitBinPath = ScalarPlatform.Instance.GitInstallation.GetInstalledGitBinPath(); - if (string.IsNullOrWhiteSpace(gitBinPath)) - { - this.ReportErrorAndExit("Error: " + ScalarConstants.GitIsNotInstalledError); - } - - ScalarEnlistment enlistment = null; - try - { - enlistment = ScalarEnlistment.CreateFromDirectory(enlistmentRootPath, gitBinPath, authentication: null); - } - catch (InvalidRepoException e) - { - this.ReportErrorAndExit( - "Error: '{0}' is not a valid Scalar enlistment. {1}", - enlistmentRootPath, - e.Message); - } - - return enlistment; - } - - private void ReportErrorAndExit(string error, params object[] args) - { - this.ReportErrorAndExit(null, error, args); - } - - private void ReportErrorAndExit(ITracer tracer, string error, params object[] args) - { - if (tracer != null) - { - tracer.RelatedError(error, args); - } - - if (error != null) - { - this.output.WriteLine(error, args); - } - - if (this.ShowDebugWindow) - { - Console.WriteLine("\nPress Enter to Exit"); - Console.ReadLine(); - } - - this.ReturnCode = ReturnCode.GenericError; - throw new MountAbortedException(this); - } - } -} diff --git a/Scalar.Mount/MountAbortedException.cs b/Scalar.Mount/MountAbortedException.cs deleted file mode 100644 index 5a7fb6116e..0000000000 --- a/Scalar.Mount/MountAbortedException.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System; - -namespace Scalar.Mount -{ - public class MountAbortedException : Exception - { - public MountAbortedException(InProcessMountVerb verb) - { - this.Verb = verb; - } - - public InProcessMountVerb Verb { get; } - } -} diff --git a/Scalar.Mount/Program.cs b/Scalar.Mount/Program.cs deleted file mode 100644 index 61fd12fc08..0000000000 --- a/Scalar.Mount/Program.cs +++ /dev/null @@ -1,24 +0,0 @@ -using CommandLine; -using Scalar.PlatformLoader; -using System; - -namespace Scalar.Mount -{ - public class Program - { - public static void Main(string[] args) - { - ScalarPlatformLoader.Initialize(); - try - { - Parser.Default.ParseArguments(args) - .WithParsed(mount => mount.Execute()); - } - catch (MountAbortedException e) - { - // Calling Environment.Exit() is required, to force all background threads to exit as well - Environment.Exit((int)e.Verb.ReturnCode); - } - } - } -} diff --git a/Scalar.Mount/Scalar.Mount.csproj b/Scalar.Mount/Scalar.Mount.csproj deleted file mode 100644 index 01807f8e66..0000000000 --- a/Scalar.Mount/Scalar.Mount.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - Exe - netcoreapp3.0 - scalar.mount - - - - - - - - - - - diff --git a/Scalar.SignFiles/Scalar.SignFiles.csproj b/Scalar.SignFiles/Scalar.SignFiles.csproj index f878d5880a..f656ccf30f 100644 --- a/Scalar.SignFiles/Scalar.SignFiles.csproj +++ b/Scalar.SignFiles/Scalar.SignFiles.csproj @@ -36,7 +36,6 @@ (StringComparer.OrdinalIgnoreCase) { "Scalar", "git", "wish", "bash" }; } } public override bool SupportsUpgradeWhileRunning => false; diff --git a/Scalar.UnitTests/Mock/MockInstallerPreRunChecker.cs b/Scalar.UnitTests/Mock/MockInstallerPreRunChecker.cs index 6b6daacd4f..62b067cb6c 100644 --- a/Scalar.UnitTests/Mock/MockInstallerPreRunChecker.cs +++ b/Scalar.UnitTests/Mock/MockInstallerPreRunChecker.cs @@ -78,7 +78,6 @@ protected override bool IsBlockingProcessRunning(out HashSet processes) bool isRunning = this.FakedResultOfCheck(FailOnCheckType.BlockingProcessesRunning); if (isRunning) { - processes.Add("Scalar.Mount"); processes.Add("git"); } diff --git a/Scalar.UnitTests/Upgrader/UpgradeOrchestratorWithGitHubUpgraderTests.cs b/Scalar.UnitTests/Upgrader/UpgradeOrchestratorWithGitHubUpgraderTests.cs index 7ca3075c9d..28ca12e21e 100644 --- a/Scalar.UnitTests/Upgrader/UpgradeOrchestratorWithGitHubUpgraderTests.cs +++ b/Scalar.UnitTests/Upgrader/UpgradeOrchestratorWithGitHubUpgraderTests.cs @@ -65,12 +65,12 @@ public void AbortOnBlockingProcess() expectedOutput: new List { "ERROR: Blocking processes are running.", - $"Run `scalar upgrade --confirm` again after quitting these processes - Scalar.Mount, git" + $"Run `scalar upgrade --confirm` again after quitting these processes - git" }, expectedErrors: null, expectedWarnings: new List { - $"Run `scalar upgrade --confirm` again after quitting these processes - Scalar.Mount, git" + $"Run `scalar upgrade --confirm` again after quitting these processes - git" }); } diff --git a/Scalar.sln b/Scalar.sln index d9965e8d9f..11f2855879 100644 --- a/Scalar.sln +++ b/Scalar.sln @@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scalar", "Scalar\Scalar.csp EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scalar.Common", "Scalar.Common\Scalar.Common.csproj", "{179EAE33-265B-4698-BBC7-130F28F6D768}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scalar.Mount", "Scalar.Mount\Scalar.Mount.csproj", "{829C7E6B-ABD7-4CE5-8076-FB28821368C5}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scalar.Service", "Scalar.Service\Scalar.Service.csproj", "{E75C4E5C-4446-43A3-BDE0-C9C4297485FA}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Scalar.Upgrader", "Scalar.Upgrader\Scalar.Upgrader.csproj", "{424D0102-50EE-4CA6-A937-C8A89CE10103}" diff --git a/Scripts/Mac/CleanupFunctionalTests.sh b/Scripts/Mac/CleanupFunctionalTests.sh index 3258ff60e9..59a92321e9 100755 --- a/Scripts/Mac/CleanupFunctionalTests.sh +++ b/Scripts/Mac/CleanupFunctionalTests.sh @@ -3,7 +3,6 @@ pkill -9 -l Scalar.FunctionalTests pkill -9 -l git pkill -9 -l scalar -pkill -9 -l Scalar.Mount if [ -d /Scalar.FT ]; then sudo rm -r /Scalar.FT diff --git a/Scripts/NukeBuildOutputs.bat b/Scripts/NukeBuildOutputs.bat index 661eeb11ec..62fc54908a 100644 --- a/Scripts/NukeBuildOutputs.bat +++ b/Scripts/NukeBuildOutputs.bat @@ -1,7 +1,5 @@ @ECHO OFF CALL %~dp0\InitializeEnvironment.bat || EXIT /b 10 - -taskkill /f /im Scalar.Mount.exe 2>&1 verify >nul powershell -NonInteractive -NoProfile -Command "& { (Get-MpPreference).ExclusionPath | ? {$_.StartsWith('C:\Repos\')} | %%{Remove-MpPreference -ExclusionPath $_} }" diff --git a/Scripts/RunFunctionalTests.bat b/Scripts/RunFunctionalTests.bat index eba772a725..2b7f566f62 100644 --- a/Scripts/RunFunctionalTests.bat +++ b/Scripts/RunFunctionalTests.bat @@ -18,7 +18,6 @@ ECHO ******************************* REM Copy most recently build Scalar binaries SET copyOptions=/s /njh /njs /nfl /ndl robocopy %SCALAR_OUTPUTDIR%\Scalar\%publishFragment% %functionalTestsDir% %copyOptions% -robocopy %SCALAR_OUTPUTDIR%\Scalar.Mount\%publishFragment% %functionalTestsDir% %copyOptions% robocopy %SCALAR_OUTPUTDIR%\Scalar.Service\%publishFragment% %functionalTestsDir% %copyOptions% robocopy %SCALAR_OUTPUTDIR%\Scalar.Service.UI\%publishFragment% %functionalTestsDir% %copyOptions% robocopy %SCALAR_OUTPUTDIR%\Scalar.Upgrader\%publishFragment% %functionalTestsDir% %copyOptions% diff --git a/Scripts/UninstallScalar.bat b/Scripts/UninstallScalar.bat index 34e9009151..499058dd4d 100644 --- a/Scripts/UninstallScalar.bat +++ b/Scripts/UninstallScalar.bat @@ -3,7 +3,6 @@ CALL %~dp0\InitializeEnvironment.bat || EXIT /b 10 taskkill /F /T /FI "IMAGENAME eq git.exe" taskkill /F /T /FI "IMAGENAME eq Scalar.exe" -taskkill /F /T /FI "IMAGENAME eq Scalar.Mount.exe" if not exist "C:\Program Files\Scalar" goto :end