Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove type provider security dialog and use custom icon for type provider assembly reference #448

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
995501f
disable invalidation if tp not enabled
enricosada May 15, 2015
bf4ca1b
use custom type provider icon for assembly reference
enricosada May 13, 2015
08a943f
removed TypeProviderSecurityDialog
enricosada May 15, 2015
70372bc
f typeprovidername is useful
enricosada May 15, 2015
9bdd154
remove unused GetVerifiedPublisherInfo.GetVerifiedPublisherInfo
enricosada May 15, 2015
2078831
remove ApprovalIO.ReplaceApprovalStatus
enricosada May 15, 2015
0841ebc
removed ApprovalIO.ReadApprovalsFile
enricosada May 15, 2015
682f225
removed ApprovalIO.DoWithApprovalsFile
enricosada May 15, 2015
78ccab6
removed ApprovalIO.AppendApprovalStatus
enricosada May 15, 2015
234c9e9
remove TryDoWithFileStreamUnderExclusiveLockWithRetryFor500ms
enricosada May 15, 2015
8f3090f
removed ApprovalIO.TryDoWithFileStreamUnderExclusiveLock
enricosada May 15, 2015
fde4177
remove approvals
enricosada May 15, 2015
fe46509
remove approvals
enricosada May 15, 2015
59eeb24
removed ApprovalIO.ApprovalsAbsoluteFileName
enricosada May 15, 2015
2ac36e8
removed ApprovalIO.partiallyCanonicalizeFileName, ApprovalIO.verifyIs…
enricosada May 15, 2015
800f1b1
remove tests helper ApproveAllMockTypeProviders
enricosada May 15, 2015
a484cc7
remove tests helper AddTypeProviderApprovedForDevelopment
enricosada May 15, 2015
4e33f80
remove tests helper ClearAllTypeProviderApprovals
enricosada May 15, 2015
143012c
f remove tests helper AddTypeProviderApprovedForDevelopment
enricosada May 15, 2015
669ff3d
removed now useless type provider not approved test
enricosada May 15, 2015
9ed106a
move ApprovalsChecking.DiscoverIfIsApprovedAndPopupDialogIfUnknown ne…
enricosada May 15, 2015
668cbb5
removed type provider security dialog resources
enricosada May 15, 2015
a0a7596
remove TPTOPElementHost, the type provider tools option page content
enricosada May 15, 2015
b111aa2
remove TPTOPData, the rows of trusted/untrusted grid
enricosada May 15, 2015
30de2f7
inline function, the UIThread.RunSync action was unused
enricosada May 15, 2015
de82d4b
add IProjectSite.AssemblyReferenceIsTypeProvider
enricosada May 18, 2015
8a2c5b6
removed useless parameter
enricosada May 20, 2015
bc37a2f
removed compiler option --validate-type-providers
enricosada May 20, 2015
41599f2
ok is always true
enricosada May 20, 2015
f0619b2
removed unused _ok
enricosada May 20, 2015
6bf7f5c
removed if with always true condition
enricosada May 20, 2015
c77e706
remove unused true
enricosada May 20, 2015
55afa63
inline wasApproved
enricosada May 20, 2015
9e46546
removed if with always true condition
enricosada May 20, 2015
77e2211
move displayDialog logic in caller function
enricosada May 20, 2015
c909474
removed unused parameter
enricosada May 21, 2015
4f24a2f
fetch list of type provider from imported assemblies
enricosada May 21, 2015
ebae5bb
inline always None parameter
enricosada May 21, 2015
010208b
inline always None parameter
enricosada May 21, 2015
7cd8ed3
inline always None parameter
enricosada May 21, 2015
3708022
inline always None parameter
enricosada May 21, 2015
0fac5ed
inline always None parameter
enricosada May 21, 2015
9f05976
inline always None parameter
enricosada May 21, 2015
cbd97f4
inline always None parameter
enricosada May 21, 2015
9de44b8
inline None
enricosada May 21, 2015
9ab57ed
remove the global dialog
enricosada May 21, 2015
6b07c02
remove useless GlobalsTheLanguageServiceCanPoke.theMostRecentFileName…
enricosada May 21, 2015
e4e0b43
remove usage of GlobalsTheLanguageServiceCanPoke.displayLSTypeProvide…
enricosada May 21, 2015
8fba3ee
inline always None
enricosada May 21, 2015
1893748
empty for
enricosada May 21, 2015
981f9eb
remove unused (i added this)
enricosada May 21, 2015
b45c580
remove unused directive TYPE_PROVIDER_SECURITY
enricosada May 21, 2015
ca48b43
remove unused method TypeProviderToolsOptionsPage.FindVisualChildByName
enricosada May 21, 2015
9e5d919
removed TypeProviderToolsOptionsPage
enricosada May 21, 2015
9e17c5a
update comments
enricosada May 21, 2015
009e93e
cleanup
enricosada May 21, 2015
7db505c
renamed parameter
enricosada May 21, 2015
a97dca6
update comments
enricosada May 21, 2015
5931058
fix build
enricosada May 21, 2015
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/fsharp/FSComp.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,6 @@ typeInfoCallsWord,"Calls"
3134,parsMutableOnAutoPropertyShouldBeGetSet,"Property definitions may not be declared mutable. To indicate that this property can be set, use 'member val PropertyName = expr with get,set'."
3135,parsMutableOnAutoPropertyShouldBeGetSetNotJustSet,"To indicate that this property can be set, use 'member val PropertyName = expr with get,set'."
3136,chkNoByrefsOfByrefs,"Type '%s' is illegal because in byref<T>, T cannot contain byref types."
3137,etTypeProviderNotApproved,"Type provider assembly '%s' is not trusted and will not be loaded for security reasons. This may cause subsequent build errors. See the 'F# Tools' section of Visual Studio options for more information."
3138,tastopsMaxArrayThirtyTwo,"F# supports a maximum array rank of 32"
3139,tcNoIntegerForLoopInQuery,"In queries, use the form 'for x in n .. m do ...' for ranging over integers"
3140,tcNoWhileInQuery,"'while' expressions may not be used in queries"
Expand Down
9 changes: 0 additions & 9 deletions src/fsharp/FSharp.Build/Fsc.fs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,6 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
let mutable win32res : string = null
let mutable win32manifest : string = null
let mutable vserrors : bool = false
let mutable validateTypeProviders : bool = false
let mutable vslcid : string = null
let mutable utf8output : bool = false
let mutable subsystemVersion : string = null
Expand Down Expand Up @@ -309,10 +308,6 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
with get() = vserrors
and set(p) = vserrors <- p

member fsc.ValidateTypeProviders
with get() = validateTypeProviders
and set(p) = validateTypeProviders <- p

member fsc.LCID
with get() = vslcid
and set(p) = vslcid <- p
Expand Down Expand Up @@ -484,10 +479,6 @@ type [<Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:Iden
if vserrors then
builder.AppendSwitch("--vserrors")

// ValidateTypeProviders
if validateTypeProviders then
builder.AppendSwitch("--validate-type-providers")

builder.AppendSwitchIfNotNull("--LCID:", vslcid)

if utf8output then
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Build/Fsc.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ type Fsc = class
member TreatWarningsAsErrors : bool with get,set
member Utf8Output : bool with get,set
member VisualStudioStyleErrors : bool with get,set
member ValidateTypeProviders : bool with get,set
member LCID : string with get,set
member WarningLevel : string with get,set
member WarningsAsErrors : string with get,set
Expand Down
1 change: 0 additions & 1 deletion src/fsharp/FSharp.Build/Microsoft.FSharp.targets
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ this file.
ToolPath="$(FscToolPath)"
TreatWarningsAsErrors="$(TreatWarningsAsErrors)"
Utf8Output="$(Utf8Output)"
ValidateTypeProviders="$(ValidateTypeProviders)"
VersionFile="$(VersionFile)"
VisualStudioStyleErrors="$(VisualStudioStyleErrors)"
WarningLevel="$(WarningLevel)"
Expand Down
2 changes: 1 addition & 1 deletion src/fsharp/FSharp.Compiler/FSharp.Compiler.fsproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<OutputType>Library</OutputType>
<AssemblyName>FSharp.Compiler</AssemblyName>
<DefineConstants>EXTENSIONTYPING;COMPILER;INCLUDE_METADATA_READER;INCLUDE_METADATA_WRITER;EXTENSIBLE_DUMPER;TYPE_PROVIDER_SECURITY;$(DefineConstants)</DefineConstants>
<DefineConstants>EXTENSIONTYPING;COMPILER;INCLUDE_METADATA_READER;INCLUDE_METADATA_WRITER;EXTENSIBLE_DUMPER;$(DefineConstants)</DefineConstants>
<NoWarn>$(NoWarn);62;9</NoWarn>
<ProjectGuid>{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}</ProjectGuid>
<AllowCrossTargeting>true</AllowCrossTargeting>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<DefineConstants>COMPILER;$(DefineConstants)</DefineConstants>
<DefineConstants>INCLUDE_METADATA_READER;$(DefineConstants)</DefineConstants>
<DefineConstants>EXTENSIBLE_DUMPER;$(DefineConstants)</DefineConstants>
<DefineConstants>TYPE_PROVIDER_SECURITY;$(DefineConstants)</DefineConstants>
<DefineConstants>NO_COMPILER_BACKEND;$(DefineConstants)</DefineConstants>
<DefineConstants>NO_PDB_READER;$(DefineConstants)</DefineConstants>
<DefineConstants>NO_PDB_WRITER;$(DefineConstants)</DefineConstants>
Expand Down
73 changes: 24 additions & 49 deletions src/fsharp/build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1941,7 +1941,6 @@ type TcConfigBuilder =

mutable showFullPaths : bool
mutable errorStyle : ErrorStyle
mutable validateTypeProviders: bool
mutable utf8output : bool
mutable flatErrors: bool

Expand Down Expand Up @@ -2101,11 +2100,6 @@ type TcConfigBuilder =
linkResources = []
showFullPaths =false
errorStyle = ErrorStyle.DefaultErrors
#if COMPILED_AS_LANGUAGE_SERVICE_DLL
validateTypeProviders = true
#else
validateTypeProviders = false
#endif

utf8output = false
flatErrors = false
Expand Down Expand Up @@ -2568,7 +2562,6 @@ type TcConfig private (data : TcConfigBuilder,validate:bool) =
member x.linkResources = data.linkResources
member x.showFullPaths = data.showFullPaths
member x.errorStyle = data.errorStyle
member x.validateTypeProviders = data.validateTypeProviders
member x.utf8output = data.utf8output
member x.flatErrors = data.flatErrors
member x.maxErrors = data.maxErrors
Expand Down Expand Up @@ -3820,9 +3813,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
| _ -> failwith "Unexpected representation in namespace entity referred to by a type provider"

member tcImports.ImportTypeProviderExtensions
(tpApprovals : ApprovalIO.TypeProviderApprovalStatus list,
displayPSTypeProviderSecurityDialogBlockingUI,
tcConfig:TcConfig,
(tcConfig:TcConfig,
fileNameOfRuntimeAssembly,
ilScopeRefOfRuntimeAssembly,
runtimeAssemblyAttributes:ILAttribute list,
Expand Down Expand Up @@ -3858,11 +3849,9 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti

let providers =
[ for assemblyName in providerAssemblies do
yield ExtensionTyping.GetTypeProvidersOfAssembly(displayPSTypeProviderSecurityDialogBlockingUI, tcConfig.validateTypeProviders, tpApprovals,
fileNameOfRuntimeAssembly, ilScopeRefOfRuntimeAssembly, assemblyName, typeProviderEnvironment,
yield ExtensionTyping.GetTypeProvidersOfAssembly(fileNameOfRuntimeAssembly, ilScopeRefOfRuntimeAssembly, assemblyName, typeProviderEnvironment,
tcConfig.isInvalidationSupported, tcConfig.isInteractive, tcImports.SystemRuntimeContainsType, systemRuntimeAssemblyVersion, m) ]
let wasApproved = providers |> List.forall (fun (ok,_) -> ok)
let providers = providers |> List.map snd |> List.concat
let providers = providers |> List.concat

// Note, type providers are disposable objects. The TcImports owns the provider objects - when/if it is disposed, the providers are disposed.
// We ignore all exceptions from provider disposal.
Expand All @@ -3879,8 +3868,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti

match providers with
| [] ->
if wasApproved then
warning(Error(FSComp.SR.etHostingAssemblyFoundWithoutHosts(fileNameOfRuntimeAssembly,typeof<Microsoft.FSharp.Core.CompilerServices.TypeProviderAssemblyAttribute>.FullName),m));
warning(Error(FSComp.SR.etHostingAssemblyFoundWithoutHosts(fileNameOfRuntimeAssembly,typeof<Microsoft.FSharp.Core.CompilerServices.TypeProviderAssemblyAttribute>.FullName),m));
| _ ->

if typeProviderEnvironment.showResolutionMessages then
Expand Down Expand Up @@ -3934,7 +3922,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
// Compact Framework binaries must use this. However it is not
// clear when else it is required, e.g. for Mono.

member tcImports.PrepareToImportReferencedIlDll tpApprovals m filename displayPSTypeProviderSecurityDialogBlockingUI (dllinfo:ImportedBinary) =
member tcImports.PrepareToImportReferencedIlDll m filename (dllinfo:ImportedBinary) =
CheckDisposed()
let tcConfig = tcConfigP.Get()
tcConfig.CheckFSharpBinary(filename,dllinfo.ILAssemblyRefs,m)
Expand Down Expand Up @@ -3966,16 +3954,12 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
tcImports.RegisterCcu(ccuinfo);
let phase2 () =
#if EXTENSIONTYPING
ccuinfo.TypeProviders <- tcImports.ImportTypeProviderExtensions (tpApprovals, displayPSTypeProviderSecurityDialogBlockingUI, tcConfig, filename, ilScopeRef, ilModule.ManifestOfAssembly.CustomAttrs.AsList, ccu.Contents, invalidateCcu, m)
#else
// to prevent unused parameter warning
ignore tpApprovals
ignore displayPSTypeProviderSecurityDialogBlockingUI
ccuinfo.TypeProviders <- tcImports.ImportTypeProviderExtensions (tcConfig, filename, ilScopeRef, ilModule.ManifestOfAssembly.CustomAttrs.AsList, ccu.Contents, invalidateCcu, m)
#endif
[ResolvedImportedAssembly(ccuinfo)]
phase2

member tcImports.PrepareToImportReferencedFSharpDll tpApprovals m filename displayPSTypeProviderSecurityDialogBlockingUI (dllinfo:ImportedBinary) =
member tcImports.PrepareToImportReferencedFSharpDll m filename (dllinfo:ImportedBinary) =
CheckDisposed()
let tcConfig = tcConfigP.Get()
tcConfig.CheckFSharpBinary(filename,dllinfo.ILAssemblyRefs,m)
Expand Down Expand Up @@ -4095,12 +4079,8 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
ILScopeRef = ilScopeRef }
let phase2() =
#if EXTENSIONTYPING
ccuinfo.TypeProviders <- tcImports.ImportTypeProviderExtensions (tpApprovals, displayPSTypeProviderSecurityDialogBlockingUI, tcConfig, filename, ilScopeRef, ilModule.ManifestOfAssembly.CustomAttrs.AsList, ccu.Contents, invalidateCcu, m)
ccuinfo.TypeProviders <- tcImports.ImportTypeProviderExtensions (tcConfig, filename, ilScopeRef, ilModule.ManifestOfAssembly.CustomAttrs.AsList, ccu.Contents, invalidateCcu, m)
#else
// to prevent unused parameter warning
ignore tpApprovals
ignore displayPSTypeProviderSecurityDialogBlockingUI

()
#endif
data,ccuinfo,phase2)
Expand All @@ -4118,7 +4098,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
phase2


member tcImports.RegisterAndPrepareToImportReferencedDll tpApprovals displayPSTypeProviderSecurityDialogBlockingUI (r:AssemblyResolution) : _*(unit -> AvailableImportedAssembly list)=
member tcImports.RegisterAndPrepareToImportReferencedDll (r:AssemblyResolution) : _*(unit -> AvailableImportedAssembly list)=
CheckDisposed()
let m = r.originalReference.Range
let filename = r.resolvedPath
Expand Down Expand Up @@ -4147,37 +4127,32 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
if (List.exists IsSignatureDataVersionAttr attrs) then
if not (List.exists (IsMatchingSignatureDataVersionAttr ilg (IL.parseILVersion Internal.Utilities.FSharpEnvironment.FSharpBinaryMetadataFormatRevision)) attrs) then
errorR(Error(FSComp.SR.buildDifferentVersionMustRecompile(filename),m))
tcImports.PrepareToImportReferencedIlDll tpApprovals m filename displayPSTypeProviderSecurityDialogBlockingUI dllinfo
tcImports.PrepareToImportReferencedIlDll m filename dllinfo
else
try
tcImports.PrepareToImportReferencedFSharpDll tpApprovals m filename displayPSTypeProviderSecurityDialogBlockingUI dllinfo
tcImports.PrepareToImportReferencedFSharpDll m filename dllinfo
with e -> error(Error(FSComp.SR.buildErrorOpeningBinaryFile(filename, e.Message),m))
else
tcImports.PrepareToImportReferencedIlDll tpApprovals m filename displayPSTypeProviderSecurityDialogBlockingUI dllinfo
tcImports.PrepareToImportReferencedIlDll m filename dllinfo
dllinfo,phase2

member tcImports.RegisterAndImportReferencedAssemblies (displayPSTypeProviderSecurityDialogBlockingUI, nms:AssemblyResolution list) =
member tcImports.RegisterAndImportReferencedAssemblies (nms:AssemblyResolution list) =
CheckDisposed()

#if EXTENSIONTYPING
let tpApprovals = ExtensionTyping.ApprovalIO.ReadApprovalsFile(None)
#else
let tpApprovals = []
#endif
let dllinfos,phase2s =
nms |> List.map
(fun nm ->
try
tcImports.RegisterAndPrepareToImportReferencedDll tpApprovals displayPSTypeProviderSecurityDialogBlockingUI nm
tcImports.RegisterAndPrepareToImportReferencedDll nm
with e ->
error(Error(FSComp.SR.buildProblemReadingAssembly(nm.fusionName, e.Message),nm.originalReference.Range)))
|> List.unzip
let ccuinfos = (List.collect (fun phase2 -> phase2()) phase2s)
dllinfos,ccuinfos

member tcImports.DoRegisterAndImportReferencedAssemblies(displayPSTypeProviderSecurityDialogBlockingUI,nms) =
member tcImports.DoRegisterAndImportReferencedAssemblies(nms) =
CheckDisposed()
tcImports.RegisterAndImportReferencedAssemblies(displayPSTypeProviderSecurityDialogBlockingUI,nms) |> ignore
tcImports.RegisterAndImportReferencedAssemblies(nms) |> ignore

member tcImports.ImplicitLoadIfAllowed (m, assemblyName, lookupOnly) =
CheckDisposed()
Expand All @@ -4190,7 +4165,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
match foundFile with
| OkResult (warns, res) ->
ReportWarnings warns
tcImports.DoRegisterAndImportReferencedAssemblies(None,res)
tcImports.DoRegisterAndImportReferencedAssemblies(res)
true
| ErrorResult (_warns, _err) ->
// Throw away warnings and errors - this is speculative loading
Expand Down Expand Up @@ -4286,7 +4261,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
| None -> tcConfig.ResolveLibWithDirectories loadFailureAction r
match resolution with
| Some resolution ->
match frameworkTcImports.RegisterAndImportReferencedAssemblies(None, [resolution]) with
match frameworkTcImports.RegisterAndImportReferencedAssemblies([resolution]) with
| (_, [ResolvedImportedAssembly(ccu)]) -> Some ccu
| _ ->
match loadFailureAction with
Expand All @@ -4300,7 +4275,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
let sysCcu = ccuInitializer.EndLoadingSystemRuntime(state, resolveAssembly)

// Load the rest of the framework DLLs all at once (they may be mutually recursive)
frameworkTcImports.DoRegisterAndImportReferencedAssemblies (None, tcResolutions.GetAssemblyResolutions())
frameworkTcImports.DoRegisterAndImportReferencedAssemblies (tcResolutions.GetAssemblyResolutions())

let fslibCcu =
if tcConfig.compilingFslib then
Expand All @@ -4323,7 +4298,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
match resolvedAssemblyRef with
| Some coreLibraryResolution ->
//printfn "coreLibraryResolution = '%s'" coreLibraryResolution.resolvedPath
match frameworkTcImports.RegisterAndImportReferencedAssemblies(None, [coreLibraryResolution]) with
match frameworkTcImports.RegisterAndImportReferencedAssemblies([coreLibraryResolution]) with
| (_, [ResolvedImportedAssembly(fslibCcuInfo) ]) -> fslibCcuInfo
| _ ->
error(InternalError("BuildFrameworkTcImports: no successful import of "+coreLibraryResolution.resolvedPath,coreLibraryResolution.originalReference.Range))
Expand Down Expand Up @@ -4389,12 +4364,12 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti

// Note: This returns a TcImports object. TcImports are disposable - the caller owns the returned TcImports object
// and when hosted in Visual Studio or another long-running process must dispose this object.
static member BuildNonFrameworkTcImports (displayPSTypeProviderSecurityDialogBlockingUI : (string->unit) option, tcConfigP:TcConfigProvider, tcGlobals:TcGlobals, baseTcImports, nonFrameworkReferences, knownUnresolved) =
static member BuildNonFrameworkTcImports (tcConfigP:TcConfigProvider, tcGlobals:TcGlobals, baseTcImports, nonFrameworkReferences, knownUnresolved) =
let tcConfig = tcConfigP.Get()
let tcResolutions = TcAssemblyResolutions.BuildFromPriorResolutions(tcConfig,nonFrameworkReferences,knownUnresolved)
let references = tcResolutions.GetAssemblyResolutions()
let tcImports = new TcImports(tcConfigP,tcResolutions,Some baseTcImports, Some tcGlobals.ilg)
tcImports.DoRegisterAndImportReferencedAssemblies(displayPSTypeProviderSecurityDialogBlockingUI, references)
tcImports.DoRegisterAndImportReferencedAssemblies(references)
tcImports.ReportUnresolvedAssemblyReferences(knownUnresolved)
tcImports

Expand All @@ -4407,7 +4382,7 @@ type TcImports(tcConfigP:TcConfigProvider, initialResolutions:TcAssemblyResoluti
//let foundationalTcImports,tcGlobals = TcImports.BuildFoundationalTcImports(tcConfigP)
let frameworkDLLs,nonFrameworkReferences,knownUnresolved = TcAssemblyResolutions.SplitNonFoundationalResolutions(tcConfig)
let tcGlobals,frameworkTcImports = TcImports.BuildFrameworkTcImports (tcConfigP,frameworkDLLs,nonFrameworkReferences)
let tcImports = TcImports.BuildNonFrameworkTcImports(None, tcConfigP,tcGlobals,frameworkTcImports,nonFrameworkReferences,knownUnresolved)
let tcImports = TcImports.BuildNonFrameworkTcImports(tcConfigP,tcGlobals,frameworkTcImports,nonFrameworkReferences,knownUnresolved)
tcGlobals,tcImports

interface System.IDisposable with
Expand All @@ -4431,7 +4406,7 @@ let RequireDLL (tcImports:TcImports) tcEnv m file =
| ResolvedImportedAssembly(ccuinfo) -> ccuinfo
| UnresolvedImportedAssembly(assemblyName) -> error(Error(FSComp.SR.buildCouldNotResolveAssemblyRequiredByFile(assemblyName,file),m))
let resolutions = CommitOperationResult(tcImports.TryResolveAssemblyReference(AssemblyReference(m,file),ResolveAssemblyReferenceMode.ReportErrors))
let dllinfos,ccuinfos = tcImports.RegisterAndImportReferencedAssemblies(None, resolutions)
let dllinfos,ccuinfos = tcImports.RegisterAndImportReferencedAssemblies(resolutions)
let ccuinfos = ccuinfos |> List.map RequireResolved
let g = tcImports.GetTcGlobals()
let amap = tcImports.GetImportMap()
Expand Down
Loading