@@ -97,15 +97,15 @@ public Task<Installation> CompleteInstall(bool aborted, CancellationToken cancel
97
97
98
98
if ( ! aborted )
99
99
{
100
- var executable = Path . Combine ( installationPaths , "Editor" , "Unity.exe" ) ;
100
+ var executable = Path . Combine ( installPath , "Editor" , "Unity.exe" ) ;
101
101
if ( ! File . Exists ( executable ) )
102
- throw new Exception ( $ "Unity exe not found at expected path after installation: { executable } ") ;
102
+ throw new Exception ( $ "Unity exe not found at expected path after installation: { installPath } ") ;
103
103
104
104
var installation = new Installation ( )
105
105
{
106
106
version = installing . version ,
107
107
executable = executable ,
108
- path = installationPaths
108
+ path = installPath
109
109
} ;
110
110
111
111
installing = default ;
@@ -169,7 +169,6 @@ public async Task Install(UnityInstaller.Queue queue, UnityInstaller.QueueItem i
169
169
throw new InvalidOperationException ( "Cannot install package without installing editor first." ) ;
170
170
}
171
171
172
- var installPath = GetInstallationPath ( installing . version , installationPaths ) ;
173
172
var result = await RunAsAdmin ( item . filePath , $ "/S /D={ installPath } ") ;
174
173
if ( result . exitCode != 0 )
175
174
{
@@ -194,7 +193,6 @@ public async Task PrepareInstall(UnityInstaller.Queue queue, string installation
194
193
throw new InvalidOperationException ( $ "Already installing another version: { installing . version } ") ;
195
194
196
195
installing = queue . metadata ;
197
- this . installationPaths = installationPaths ;
198
196
installedEditor = false ;
199
197
200
198
// Check for upgrading installation
@@ -209,6 +207,8 @@ public async Task PrepareInstall(UnityInstaller.Queue queue, string installation
209
207
210
208
installedEditor = true ;
211
209
}
210
+
211
+ installPath = GetInstallationPath ( installing . version , installationPaths ) ;
212
212
}
213
213
214
214
public Task < bool > PromptForPasswordIfNecessary ( CancellationToken cancellation = default )
@@ -280,7 +280,7 @@ public async Task Uninstall(Installation installation, CancellationToken cancell
280
280
Configuration configuration ;
281
281
282
282
VersionMetadata installing ;
283
- string installationPaths ;
283
+ string installPath ;
284
284
bool installedEditor ;
285
285
286
286
async Task < ( int exitCode , string output , string error ) > RunAsAdmin ( string filename , string arguments )
0 commit comments