Merge pull request #581 from sharwell/solution-dir

Use solution directory from replacements
dotnet · Aug 7, 2020 · dec70c5 · dec70c5
2 parents 8306456 + 77e0ab3
commit dec70c5
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/VisualStudio.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKRootTemplateWizard.cs b/src/VisualStudio.Roslyn.SDK/Roslyn.SDK.Template.Wizard/RoslynSDKRootTemplateWizard.cs
@@ -33,8 +33,15 @@ private void OnRunStarted(DTE dte, Dictionary<string, string> replacementsDictio
         GlobalDictionary["$saferootprojectname$"] = replacementsDictionary["$safeprojectname$"];
         GlobalDictionary["$saferootidentifiername$"] = replacementsDictionary["$safeprojectname$"].Replace(".","");
 
-        var solutionFile = dte.Solution.FullName;
-        var solutionFolder = Path.GetDirectoryName(solutionFile);
+        if (!replacementsDictionary.TryGetValue("$solutiondirectory$", out var solutionFolder))
+        {
+            var solutionFile = dte.Solution.FullName;
+            if (string.IsNullOrEmpty(solutionFile))
+                return;
+
+            solutionFolder = Path.GetDirectoryName(solutionFile);
+        }
+
         if (Directory.Exists(solutionFolder))
         {
             File.WriteAllText(