Add fallback to using path to v4 GAC assemblies

mythz · mythz · commit a9cd318f86a8 · 2015-03-24T20:06:26.000-04:00
diff --git a/src/ServiceStack.Text/Env.cs b/src/ServiceStack.Text/Env.cs
@@ -98,6 +98,12 @@ public static string ReferenceAssembyPath
                     else
                     {
                         var v4Dirs = PclExport.Instance.GetDirectoryNames(netFxReferenceBasePath, "v4*");
+                        if (v4Dirs.Length == 0)
+                        {
+                            var winPath = PclExport.Instance.GetEnvironmentVariable("SYSTEMROOT") ?? @"C:\Windows";
+                            var gacPath = winPath + @"\Microsoft.NET\Framework\";
+                            v4Dirs = PclExport.Instance.GetDirectoryNames(gacPath, "v4*");                            
+                        }
                         if (v4Dirs.Length > 0)
                         {
                             referenceAssembyPath = v4Dirs[v4Dirs.Length - 1]; //latest v4

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,12 @@ public static string ReferenceAssembyPath`
`98`	`98`	`else`
`99`	`99`	`{`
`100`	`100`	`var v4Dirs = PclExport.Instance.GetDirectoryNames(netFxReferenceBasePath, "v4*");`
	`101`	`+ if (v4Dirs.Length == 0)`
	`102`	`+ {`
	`103`	`+ var winPath = PclExport.Instance.GetEnvironmentVariable("SYSTEMROOT") ?? @"C:\Windows";`
	`104`	`+ var gacPath = winPath + @"\Microsoft.NET\Framework\";`
	`105`	`+ v4Dirs = PclExport.Instance.GetDirectoryNames(gacPath, "v4*");`
	`106`	`+ }`
`101`	`107`	`if (v4Dirs.Length > 0)`
`102`	`108`	`{`
`103`	`109`	`referenceAssembyPath = v4Dirs[v4Dirs.Length - 1]; //latest v4`