Use InstallLocation in Scaffolder

seesharper · seesharper · commit 566f6945d991 · 2018-04-29T12:53:52.000+02:00
diff --git a/src/Dotnet.Script.Core/Scaffolder.cs b/src/Dotnet.Script.Core/Scaffolder.cs
@@ -22,12 +22,12 @@ public void InitializerFolder(string fileName)
             string pathToLaunchFile = Path.Combine(vsCodeDirectory, "launch.json");
             if (!File.Exists(pathToLaunchFile))
             {
-                string baseDirectory = Path.GetDirectoryName(new Uri(typeof(Scaffolder).GetTypeInfo().Assembly.CodeBase).LocalPath);
-                string csxPath = Path.Combine(baseDirectory, "dotnet-script.dll").Replace(@"\", "/");
+                string installLocation = RuntimeHelper.InstallLocation;
+                string dotnetScriptPath = Path.Combine(installLocation, "dotnet-script.dll").Replace(@"\", "/");
                                 
                 string lauchFileTemplate = TemplateLoader.ReadTemplate("launch.json.template");
 
-                string launchFileContent = lauchFileTemplate.Replace("PATH_TO_DOTNET-SCRIPT", csxPath);
+                string launchFileContent = lauchFileTemplate.Replace("PATH_TO_DOTNET-SCRIPT", dotnetScriptPath);
                 WriteFile(pathToLaunchFile, launchFileContent);
             }
             
diff --git a/src/Dotnet.Script.DependencyModel/Environment/RuntimeHelper.cs b/src/Dotnet.Script.DependencyModel/Environment/RuntimeHelper.cs
@@ -79,7 +79,6 @@ public static string GetPathToNuGetStoreFolder()
             return storePath;
         }
 
-
         private static string GetProcessArchitecture()
         {
             return RuntimeEnvironment.RuntimeArchitecture;            

Original file line number	Diff line number	Diff line change
`@@ -22,12 +22,12 @@ public void InitializerFolder(string fileName)`
`22`	`22`	`string pathToLaunchFile = Path.Combine(vsCodeDirectory, "launch.json");`
`23`	`23`	`if (!File.Exists(pathToLaunchFile))`
`24`	`24`	`{`
`25`		`- string baseDirectory = Path.GetDirectoryName(new Uri(typeof(Scaffolder).GetTypeInfo().Assembly.CodeBase).LocalPath);`
`26`		`- string csxPath = Path.Combine(baseDirectory, "dotnet-script.dll").Replace(@"\", "/");`
	`25`	`+ string installLocation = RuntimeHelper.InstallLocation;`
	`26`	`+ string dotnetScriptPath = Path.Combine(installLocation, "dotnet-script.dll").Replace(@"\", "/");`
`27`	`27`
`28`	`28`	`string lauchFileTemplate = TemplateLoader.ReadTemplate("launch.json.template");`
`29`	`29`
`30`		`- string launchFileContent = lauchFileTemplate.Replace("PATH_TO_DOTNET-SCRIPT", csxPath);`
	`30`	`+ string launchFileContent = lauchFileTemplate.Replace("PATH_TO_DOTNET-SCRIPT", dotnetScriptPath);`
`31`	`31`	`WriteFile(pathToLaunchFile, launchFileContent);`
`32`	`32`	`}`
`33`	`33`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,6 @@ public static string GetPathToNuGetStoreFolder()`
`79`	`79`	`return storePath;`
`80`	`80`	`}`
`81`	`81`
`82`		`-`
`83`	`82`	`private static string GetProcessArchitecture()`
`84`	`83`	`{`
`85`	`84`	`return RuntimeEnvironment.RuntimeArchitecture;`