Commit942d292

committed

Use Assembly.EscapedCodeBase not .CodeBase in IDE unit tests

This was causing internal execution to fail when directory namescontained various special character.

1 parentc2335c0 commit942d292Copy full SHA for 942d292

File tree

-5

lines changed

-5

lines changed

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1655,11 +1655,7 @@ module internal VsActual =`
`1655`	`1655`
`1656`	`1656`	`// copy this private assembly next to unit tests, otherwise assembly loader cannot find it`
`1657`	`1657`	`letneededLocalAssem= vsInstallDir+@"\PrivateAssemblies\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll"`
`1658`		`-#if FX_ATLEAST_45`
`1659`		`-letcurDir= System.IO.Path.GetDirectoryName((new System.Uri(System.Reflection.Assembly.Load("nunit.util").CodeBase)).LocalPath)`
`1660`		`-#else`
`1661`		`-letcurDir= System.IO.Path.GetDirectoryName((new System.Uri(System.Reflection.Assembly.GetExecutingAssembly().CodeBase)).LocalPath)`
`1662`		`-#endif`
	`1658`	`+letcurDir= System.IO.Path.GetDirectoryName((new System.Uri(System.Reflection.Assembly.Load("nunit.util").EscapedCodeBase)).LocalPath)`
`1663`	`1659`	`letlocalCopy= System.IO.Path.Combine(curDir, System.IO.Path.GetFileName(neededLocalAssem))`
`1664`	`1660`	`System.IO.File.Copy(neededLocalAssem, localCopy,true)`
`1665`	`1661`

Comments

(0)