Skip to content

Commit a17c95a

Browse files
committed
Delete custom upgrader
This leaves 'gvfs upgrade' non-functional Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
1 parent 704411b commit a17c95a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+3
-6625
lines changed

GVFS.sln

-6
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Tests", "GVFS\GVFS.Tes
3939
EndProject
4040
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.UnitTests", "GVFS\GVFS.UnitTests\GVFS.UnitTests.csproj", "{1A46C414-7F39-4EF0-B216-A88033D18678}"
4141
EndProject
42-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Upgrader", "GVFS\GVFS.Upgrader\GVFS.Upgrader.csproj", "{F8D96536-0F2C-4B40-8516-D2C0516C66EC}"
43-
EndProject
4442
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GVFS.VirtualFileSystemHook", "GVFS\GVFS.VirtualFileSystemHook\GVFS.VirtualFileSystemHook.vcxproj", "{2D23AB54-541F-4ABC-8DCA-08C199E97ABB}"
4543
EndProject
4644
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GVFS.Virtualization", "GVFS\GVFS.Virtualization\GVFS.Virtualization.csproj", "{EC90AF5D-E018-4248-85D6-9DB1898D710E}"
@@ -129,10 +127,6 @@ Global
129127
{1A46C414-7F39-4EF0-B216-A88033D18678}.Debug|x64.Build.0 = Debug|Any CPU
130128
{1A46C414-7F39-4EF0-B216-A88033D18678}.Release|x64.ActiveCfg = Release|Any CPU
131129
{1A46C414-7F39-4EF0-B216-A88033D18678}.Release|x64.Build.0 = Release|Any CPU
132-
{F8D96536-0F2C-4B40-8516-D2C0516C66EC}.Debug|x64.ActiveCfg = Debug|Any CPU
133-
{F8D96536-0F2C-4B40-8516-D2C0516C66EC}.Debug|x64.Build.0 = Debug|Any CPU
134-
{F8D96536-0F2C-4B40-8516-D2C0516C66EC}.Release|x64.ActiveCfg = Release|Any CPU
135-
{F8D96536-0F2C-4B40-8516-D2C0516C66EC}.Release|x64.Build.0 = Release|Any CPU
136130
{2D23AB54-541F-4ABC-8DCA-08C199E97ABB}.Debug|x64.ActiveCfg = Debug|x64
137131
{2D23AB54-541F-4ABC-8DCA-08C199E97ABB}.Debug|x64.Build.0 = Debug|x64
138132
{2D23AB54-541F-4ABC-8DCA-08C199E97ABB}.Release|x64.ActiveCfg = Release|x64

GVFS/GVFS.Common/GVFSPlatform.cs

-29
Original file line numberDiff line numberDiff line change
@@ -78,28 +78,8 @@ public static void Register(GVFSPlatform platform)
7878
public abstract bool IsElevated();
7979
public abstract string GetCurrentUser();
8080
public abstract string GetUserIdFromLoginSessionId(int sessionId, ITracer tracer);
81-
82-
/// <summary>
83-
/// Get the directory for upgrades that is permissioned to
84-
/// require elevated privileges to modify. This can be used for
85-
/// data that we don't want normal user accounts to modify.
86-
/// </summary>
87-
public abstract string GetUpgradeProtectedDataDirectory();
88-
89-
/// <summary>
90-
/// Directory that upgrader log directory should be placed
91-
/// in. There can be multiple log directories, so this is the
92-
/// containing directory to place them in.
93-
/// </summary>
94-
public abstract string GetUpgradeLogDirectoryParentDirectory();
9581
public abstract string GetSystemInstallerLogPath();
9682

97-
/// <summary>
98-
/// Directory that contains the file indicating that a new
99-
/// version is available.
100-
/// </summary>
101-
public abstract string GetUpgradeHighestAvailableVersionDirectory();
102-
10383
public abstract void ConfigureVisualStudio(string gitBinPath, ITracer tracer);
10484

10585
public abstract bool TryCopyPanicLogs(string copyToDir, out string error);
@@ -125,10 +105,6 @@ public abstract FileBasedLock CreateFileBasedLock(
125105
ITracer tracer,
126106
string lockPath);
127107

128-
public abstract ProductUpgraderPlatformStrategy CreateProductUpgraderPlatformInteractions(
129-
PhysicalFileSystem fileSystem,
130-
ITracer tracer);
131-
132108
public bool TryGetNormalizedPathRoot(string path, out string pathRoot, out string errorMessage)
133109
{
134110
pathRoot = null;
@@ -229,11 +205,6 @@ public string MountExecutableName
229205
{
230206
get { return "GVFS.Mount" + this.ExecutableExtension; }
231207
}
232-
233-
public string GVFSUpgraderExecutableName
234-
{
235-
get { return "GVFS.Upgrader" + this.ExecutableExtension; }
236-
}
237208
}
238209

239210
public class UnderConstructionFlags

0 commit comments

Comments
 (0)