Commitd02a425

committed

More places in IDE unit tests that need to use Assembly.EscapedCodeBase

1 parent942d292 commitd02a425Copy full SHA for d02a425

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ type GeneralTests() =`
`65`	`65`
`66`	`66`	`letpublicTypesInAsm(asmfile:string)=`
`67`	`67`	`printfn"Validating assembly '%s'" asmfile`
`68`		`-letcodeBase=(new Uri(Assembly.GetExecutingAssembly().CodeBase)).LocalPath\|> Path.GetDirectoryName`
	`68`	`+letcodeBase=(new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase)).LocalPath\|> Path.GetDirectoryName`
`69`	`69`	`letasm= Assembly.LoadFrom(Path.Combine(codeBase, asmfile))`
`70`	`70`
`71`	`71`	`// For public types that have ComVisible, validate that the constructor is internal`
`@@ -175,7 +175,7 @@ type GeneralTests() =`
`175`	`175`	memberpublicthis.``PublicSurfaceArea.DotNetReflectionAndTypeProviders``()=
`176`	`176`	`lettp= publicTypesInAsm@"FSharp.Data.TypeProviders.dll"`
`177`	`177`	`Assert.AreEqual(1, tp)// the 'DataProviders' type that is decorated with [<TypeProvider>] must be public\`
`178`		`-letcurDir=(new Uri(Assembly.GetExecutingAssembly().CodeBase)).LocalPath\|> Path.GetDirectoryName`
	`178`	`+letcurDir=(new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase)).LocalPath\|> Path.GetDirectoryName`
`179`	`179`	`letscript="""`
`180`	`180`	`open Microsoft.FSharp.Core.CompilerServices`
`181`	`181`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type MultiTargeting() =`
`29`	`29`	`memberprivatethis.prepTest(projFile)=`
`30`	`30`	`letdirName= Path.GetDirectoryName(projFile)`
`31`	`31`	`letlibDirName= Directory.CreateDirectory(Path.Combine(dirName,"lib")).FullName`
`32`		`-letcodeBase=(new Uri(Assembly.GetExecutingAssembly().CodeBase)).LocalPath\|> Path.GetDirectoryName`
	`32`	`+letcodeBase=(new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase)).LocalPath\|> Path.GetDirectoryName`
`33`	`33`	`letrefLibPath= Path.Combine(libDirName,"FSharp.Core.Unittests.dll")`
`34`	`34`	`File.Copy(Path.Combine(codeBase,"FSharp.Core.Unittests.dll"), refLibPath)`
`35`	`35`	`File.AppendAllText(projFile, TheTests.FsprojTextWithProjectReferencesAndOtherFlags([],[refLibPath],[],null,"","v2.0"))`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -559,7 +559,7 @@ type References() =`
`559`	`559`	`DoWithTempFile"Test.fsproj"(fun projFile->`
`560`	`560`	`letdirName= Path.GetDirectoryName(projFile)`
`561`	`561`	`letlibDirName= Directory.CreateDirectory(Path.Combine(dirName,"lib")).FullName`
`562`		`-letcodeBase=(new Uri(Assembly.GetExecutingAssembly().CodeBase)).LocalPath\|> Path.GetDirectoryName`
	`562`	`+letcodeBase=(new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase)).LocalPath\|> Path.GetDirectoryName`
`563`	`563`	`letrefLibPath= Path.Combine(libDirName,"nunit.core.dll")`
`564`	`564`	`File.Copy(Path.Combine(codeBase,"nunit.core.dll"), refLibPath)`
`565`	`565`	`File.AppendAllText(projFile, TheTests.SimpleFsprojText([],[refLibPath],""))`
`@@ -574,7 +574,7 @@ type References() =`
`574`	`574`	`letl=new List<ReferenceContainerNode>()`
`575`	`575`	`project.FindNodesOfType(l)`
`576`	`576`	`l.[0]`
`577`		`-letmscorlibPath=(new Uri("".GetType().Assembly.CodeBase)).LocalPath`
	`577`	`+letmscorlibPath=(new Uri("".GetType().Assembly.EscapedCodeBase)).LocalPath`
`578`	`578`	letselectorData=new VSCOMPONENTSELECTORDATA(``type``= VSCOMPONENTTYPE.VSCOMPONENTTYPE_ComPlus, bstrFile= mscorlibPath)
`579`	`579`	`refContainer.AddReferenceFromSelectorData(selectorData)\|> Assert.IsNotNull`
`580`	`580`	`letl=new List<AssemblyReferenceNode>()`

Comments

(0)