Skip to content

Commit 7db0674

Browse files
dsymedsyme
authored
Merge pull request #305 from dsyme/ra1
try use ReferencedAssemblies
2 parents 721a742 + 7a614fc commit 7db0674

File tree

4 files changed

+98
-114
lines changed

4 files changed

+98
-114
lines changed

‎.paket/Paket.Restore.targets

Lines changed: 92 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,23 +17,43 @@
1717
<PaketExeImage Condition=" '$(PaketBootstrapperStyle)' == 'proj' ">native</PaketExeImage>
1818
<MonoPath Condition="'$(MonoPath)' == '' And Exists('/Library/Frameworks/Mono.framework/Commands/mono')">/Library/Frameworks/Mono.framework/Commands/mono</MonoPath>
1919
<MonoPath Condition="'$(MonoPath)' == ''">mono</MonoPath>
20-
<!-- Paket command -->
21-
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketToolsPath)paket')">$(PaketToolsPath)paket</PaketExePath>
22-
<PaketExePath Condition=" '$(PaketExePath)' == '' AND Exists('$(PaketRootPath)paket.exe')">$(PaketRootPath)paket.exe</PaketExePath>
2320

24-
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">$(PaketToolsPath)paket.exe</PaketExePath>
25-
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'assembly' ">$(PaketToolsPath)paket.exe</PaketExePath>
26-
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketExeImage)' == 'native' ">$(PaketToolsPath)paket</PaketExePath>
21+
<!-- PaketBootStrapper -->
22+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
23+
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
24+
<PaketBootStrapperExeDir Condition=" Exists('$(PaketBootStrapperExePath)') " >$([System.IO.Path]::GetDirectoryName("$(PaketBootStrapperExePath)"))\</PaketBootStrapperExeDir>
25+
26+
<!-- Paket -->
27+
28+
<!-- windows, root => tool => proj style => bootstrapper => global -->
29+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath>
30+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath>
31+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket.exe</PaketExePath>
32+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(_PaketBootStrapperExeDir)paket.exe</PaketExePath>
33+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' == 'Windows_NT' ">paket.exe</PaketExePath>
34+
35+
<!-- no windows, try native paket as default, root => tool => proj style => mono paket => bootstrpper => global -->
36+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket') ">$(PaketRootPath)paket</PaketExePath>
37+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket') ">$(PaketToolsPath)paket</PaketExePath>
38+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND '$(PaketBootstrapperStyle)' == 'proj' ">$(PaketToolsPath)paket</PaketExePath>
39+
40+
<!-- no windows, try mono paket -->
41+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketRootPath)paket.exe') ">$(PaketRootPath)paket.exe</PaketExePath>
42+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketToolsPath)paket.exe') ">$(PaketToolsPath)paket.exe</PaketExePath>
43+
44+
<!-- no windows, try bootstrapper -->
45+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' AND Exists('$(PaketBootStrapperExeDir)') ">$(PaketBootStrapperExeDir)paket.exe</PaketExePath>
46+
47+
<!-- no windows, try global native paket -->
48+
<PaketExePath Condition=" '$(PaketExePath)' == '' AND '$(OS)' != 'Windows_NT' ">paket</PaketExePath>
2749

2850
<!-- Paket command -->
2951
<_PaketExeExtension>$([System.IO.Path]::GetExtension("$(PaketExePath)"))</_PaketExeExtension>
3052
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(_PaketExeExtension)' == '.dll' ">dotnet "$(PaketExePath)"</PaketCommand>
31-
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' == 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
3253
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT' AND '$(_PaketExeExtension)' == '.exe' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketExePath)"</PaketCommand>
33-
<PaketCommand Condition=" '$(PaketCommand)' == '' AND '$(OS)' != 'Windows_NT'">"$(PaketExePath)"</PaketCommand>
54+
<PaketCommand Condition=" '$(PaketCommand)' == '' ">"$(PaketExePath)"</PaketCommand>
55+
3456

35-
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' AND Exists('$(PaketRootPath)paket.bootstrapper.exe')">$(PaketRootPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
36-
<PaketBootStrapperExePath Condition=" '$(PaketBootStrapperExePath)' == '' ">$(PaketToolsPath)paket.bootstrapper.exe</PaketBootStrapperExePath>
3757
<PaketBootStrapperCommand Condition=" '$(OS)' == 'Windows_NT'">"$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
3858
<PaketBootStrapperCommand Condition=" '$(OS)' != 'Windows_NT' ">$(MonoPath) --runtime=v4.0.30319 "$(PaketBootStrapperExePath)"</PaketBootStrapperCommand>
3959

@@ -42,6 +62,9 @@
4262
<!-- see https://github.com/fsharp/fslang-design/blob/master/RFCs/FS-1032-fsharp-in-dotnet-sdk.md -->
4363
<DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
4464
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
65+
66+
<!-- Disable Paket restore under NCrunch build -->
67+
<PaketRestoreDisabled Condition="'$(NCrunch)' == '1'">True</PaketRestoreDisabled>
4568
</PropertyGroup>
4669

4770
<Target Name="PaketBootstrapping" Condition="Exists('$(PaketToolsPath)paket.bootstrapper.proj')">
@@ -82,7 +105,11 @@
82105
<PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
83106
</PropertyGroup>
84107

85-
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
108+
<!--
109+
This value should match the version in the props generated by paket
110+
If they differ, this means we need to do a restore in order to ensure correct dependencies
111+
-->
112+
<PropertyGroup Condition="'$(PaketPropsVersion)' != '5.185.3' ">
86113
<PaketRestoreRequired>true</PaketRestoreRequired>
87114
</PropertyGroup>
88115

@@ -163,6 +190,7 @@
163190
<ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' == '6' And %(PaketReferencesFileLinesInfo.CopyLocal) == 'false'">runtime</ExcludeAssets>
164191
<ExcludeAssets Condition=" '%(PaketReferencesFileLinesInfo.Splits)' != '6' And %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
165192
<Publish Condition=" '$(PackAsTool)' == 'true' ">true</Publish>
193+
<AllowExplicitVersion>true</AllowExplicitVersion>
166194
</PackageReference>
167195
</ItemGroup>
168196

@@ -200,6 +228,7 @@
200228
</Target>
201229

202230
<Target Name="PaketOverrideNuspec" AfterTargets="GenerateNuspec" Condition="('$(IsPackable)' == '' Or '$(IsPackable)' == 'true') And Exists('$(MSBuildProjectDirectory)/obj/$(MSBuildProjectFile).references')" >
231+
203232
<ItemGroup>
204233
<_NuspecFilesNewLocation Include="$(BaseIntermediateOutputPath)$(Configuration)\*.nuspec"/>
205234
<MSBuildMajorVersion Include="$(DetectedMSBuildVersion.Replace(`-`, `.`).Split(`.`)[0])" />
@@ -209,12 +238,14 @@
209238
<PropertyGroup>
210239
<PaketProjectFile>$(MSBuildProjectDirectory)/$(MSBuildProjectFile)</PaketProjectFile>
211240
<ContinuePackingAfterGeneratingNuspec>true</ContinuePackingAfterGeneratingNuspec>
241+
<UseMSBuild16_0_Pack>false</UseMSBuild16_0_Pack>
242+
<UseMSBuild16_0_Pack Condition=" '@(MSBuildMajorVersion)' >= '16' ">true</UseMSBuild16_0_Pack>
212243
<UseMSBuild15_9_Pack>false</UseMSBuild15_9_Pack>
213-
<UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' > '15' OR ('@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8') ">true</UseMSBuild15_9_Pack>
244+
<UseMSBuild15_9_Pack Condition=" '@(MSBuildMajorVersion)' == '15' AND '@(MSBuildMinorVersion)' > '8' ">true</UseMSBuild15_9_Pack>
214245
<UseMSBuild15_8_Pack>false</UseMSBuild15_8_Pack>
215-
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) ">true</UseMSBuild15_8_Pack>
246+
<UseMSBuild15_8_Pack Condition=" '$(NuGetToolVersion)' != '4.0.0' AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseMSBuild15_8_Pack>
216247
<UseNuGet4_Pack>false</UseNuGet4_Pack>
217-
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) ">true</UseNuGet4_Pack>
248+
<UseNuGet4_Pack Condition=" (! $(UseMSBuild15_8_Pack)) AND (! $(UseMSBuild15_9_Pack)) AND (! $(UseMSBuild16_0_Pack)) ">true</UseNuGet4_Pack>
218249
<AdjustedNuspecOutputPath>$(BaseIntermediateOutputPath)$(Configuration)</AdjustedNuspecOutputPath>
219250
<AdjustedNuspecOutputPath Condition="@(_NuspecFilesNewLocation) == ''">$(BaseIntermediateOutputPath)</AdjustedNuspecOutputPath>
220251
</PropertyGroup>
@@ -230,6 +261,53 @@
230261
</ConvertToAbsolutePath>
231262

232263
<!-- Call Pack -->
264+
<PackTask Condition="$(UseMSBuild16_0_Pack)"
265+
PackItem="$(PackProjectInputFile)"
266+
PackageFiles="@(_PackageFiles)"
267+
PackageFilesToExclude="@(_PackageFilesToExclude)"
268+
PackageVersion="$(PackageVersion)"
269+
PackageId="$(PackageId)"
270+
Title="$(Title)"
271+
Authors="$(Authors)"
272+
Description="$(Description)"
273+
Copyright="$(Copyright)"
274+
RequireLicenseAcceptance="$(PackageRequireLicenseAcceptance)"
275+
LicenseUrl="$(PackageLicenseUrl)"
276+
ProjectUrl="$(PackageProjectUrl)"
277+
IconUrl="$(PackageIconUrl)"
278+
ReleaseNotes="$(PackageReleaseNotes)"
279+
Tags="$(PackageTags)"
280+
DevelopmentDependency="$(DevelopmentDependency)"
281+
BuildOutputInPackage="@(_BuildOutputInPackage)"
282+
TargetPathsToSymbols="@(_TargetPathsToSymbols)"
283+
SymbolPackageFormat="symbols.nupkg"
284+
TargetFrameworks="@(_TargetFrameworks)"
285+
AssemblyName="$(AssemblyName)"
286+
PackageOutputPath="$(PackageOutputAbsolutePath)"
287+
IncludeSymbols="$(IncludeSymbols)"
288+
IncludeSource="$(IncludeSource)"
289+
PackageTypes="$(PackageType)"
290+
IsTool="$(IsTool)"
291+
RepositoryUrl="$(RepositoryUrl)"
292+
RepositoryType="$(RepositoryType)"
293+
SourceFiles="@(_SourceFiles->Distinct())"
294+
NoPackageAnalysis="$(NoPackageAnalysis)"
295+
MinClientVersion="$(MinClientVersion)"
296+
Serviceable="$(Serviceable)"
297+
FrameworkAssemblyReferences="@(_FrameworkAssemblyReferences)"
298+
ContinuePackingAfterGeneratingNuspec="$(ContinuePackingAfterGeneratingNuspec)"
299+
NuspecOutputPath="$(AdjustedNuspecOutputPath)"
300+
IncludeBuildOutput="$(IncludeBuildOutput)"
301+
BuildOutputFolders="$(BuildOutputTargetFolder)"
302+
ContentTargetFolders="$(ContentTargetFolders)"
303+
RestoreOutputPath="$(RestoreOutputAbsolutePath)"
304+
NuspecFile="$(NuspecFileAbsolutePath)"
305+
NuspecBasePath="$(NuspecBasePath)"
306+
NuspecProperties="$(NuspecProperties)"
307+
PackageLicenseFile="$(PackageLicenseFile)"
308+
PackageLicenseExpression="$(PackageLicenseExpression)"
309+
PackageLicenseExpressionVersion="$(PackageLicenseExpressionVersion)" />
310+
233311
<PackTask Condition="$(UseMSBuild15_9_Pack)"
234312
PackItem="$(PackProjectInputFile)"
235313
PackageFiles="@(_PackageFiles)"

‎build.fsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ let release =
3434
|> ReleaseNotesHelper.parseReleaseNotes
3535

3636
let useMsBuildToolchain = environVar "USE_MSBUILD" <> null
37-
let dotnetSdkVersion = "2.1.403"
37+
let dotnetSdkVersion = "2.2.105"
3838
let sdkPath = lazy DotNetCli.InstallDotNetSDK dotnetSdkVersion
3939
let getSdkPath() = sdkPath.Value
4040

‎src/ProvidedTypes.fs

Lines changed: 1 addition & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -9226,66 +9226,7 @@ namespace ProviderImplementation.ProvidedTypes
92269226

92279227
// Use the reflection hack to determine the set of referenced assemblies by reflecting over the SystemRuntimeContainsType
92289228
// closure in the TypeProviderConfig object.
9229-
let referencedAssemblyPaths =
9230-
try
9231-
9232-
let hostConfigType = config.GetType()
9233-
let hostAssembly = hostConfigType.Assembly
9234-
let hostAssemblyLocation = hostAssembly.Location
9235-
9236-
let msg = sprintf "Host is assembly '%A' at location '%s'" (hostAssembly.GetName()) hostAssemblyLocation
9237-
9238-
if isNull (hostConfigType.GetField("systemRuntimeContainsType",bindAll)) then
9239-
failwithf "Invalid host of cross-targeting type provider: a field called systemRuntimeContainsType must exist in the TypeProviderConfiguration object. Please check that the type provider being hosted by the F# compiler tools or a simulation of them. %s" msg
9240-
9241-
let systemRuntimeContainsTypeObj = config.GetField("systemRuntimeContainsType")
9242-
9243-
// Account for https://github.com/Microsoft/visualfsharp/pull/591
9244-
let systemRuntimeContainsTypeObj2 =
9245-
if systemRuntimeContainsTypeObj.HasField("systemRuntimeContainsTypeRef") then
9246-
systemRuntimeContainsTypeObj.GetField("systemRuntimeContainsTypeRef").GetProperty("Value")
9247-
else
9248-
systemRuntimeContainsTypeObj
9249-
9250-
if not (systemRuntimeContainsTypeObj2.HasField("tcImports")) then
9251-
failwithf "Invalid host of cross-targeting type provider: a field called tcImports must exist in the systemRuntimeContainsType closure. Please check that the type provider being hosted by the F# compiler tools or a simulation of them. %s" msg
9252-
9253-
let tcImports = systemRuntimeContainsTypeObj2.GetField("tcImports")
9254-
9255-
if not (tcImports.HasField("dllInfos")) then
9256-
failwithf "Invalid host of cross-targeting type provider: a field called dllInfos must exist in the tcImports object. Please check that the type provider being hosted by the F# compiler tools or a simulation of them. %s" msg
9257-
9258-
if not (tcImports.HasProperty("Base")) then
9259-
failwithf "Invalid host of cross-targeting type provider: a field called Base must exist in the tcImports object. Please check that the type provider being hosted by the F# compiler tools or a simulation of them. %s" msg
9260-
9261-
let dllInfos = tcImports.GetField("dllInfos")
9262-
if isNull dllInfos then
9263-
let ty = dllInfos.GetType()
9264-
let fld = ty.GetField("dllInfos", bindAll)
9265-
failwithf """Invalid host of cross-targeting type provider: unexpected 'null' value in dllInfos field of TcImports, ty = %A, fld = %A. %s""" ty fld msg
9266-
9267-
let baseObj = tcImports.GetProperty("Base")
9268-
9269-
[ for dllInfo in dllInfos.GetElements() -> (dllInfo.GetProperty("FileName") :?> string)
9270-
if not (isNull baseObj) then
9271-
let baseObjValue = baseObj.GetProperty("Value")
9272-
if isNull baseObjValue then
9273-
let ty = baseObjValue.GetType()
9274-
let prop = ty.GetProperty("Value", bindAll)
9275-
failwithf """Invalid host of cross-targeting type provider: unexpected 'null' value in Value property of baseObj, ty = %A, prop = %A. %s""" ty prop msg
9276-
9277-
let baseDllInfos = baseObjValue.GetField("dllInfos")
9278-
9279-
if isNull baseDllInfos then
9280-
let ty = baseDllInfos.GetType()
9281-
let fld = ty.GetField("dllInfos", bindAll)
9282-
failwithf """Invalid host of cross-targeting type provider: unexpected 'null' value in dllInfos field of baseDllInfos, ty = %A, fld = %A. %s""" ty fld msg
9283-
9284-
for baseDllInfo in baseDllInfos.GetElements() -> (baseDllInfo.GetProperty("FileName") :?> string) ]
9285-
with e ->
9286-
failwithf "Invalid host of cross-targeting type provider. Exception: %A" e
9287-
9288-
9229+
let referencedAssemblyPaths = config.ReferencedAssemblies |> Array.toList
92899230
ProvidedTypesContext(referencedAssemblyPaths, assemblyReplacementMap, sourceAssemblies)
92909231

92919232

‎src/ProvidedTypesTesting.fs

Lines changed: 4 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,51 +19,16 @@ open Microsoft.FSharp.Reflection
1919
module Utils =
2020
let isNull x = match x with null -> true | _ -> false
2121

22-
23-
/// Simulate a real host of TypeProviderConfig
24-
type internal DllInfo(path: string) =
25-
member __.FileName = path
26-
27-
/// Simulate a real host of TypeProviderConfig
28-
type internal TcImports(bas: TcImports option, dllInfos: DllInfo list) =
29-
member __.Base = bas
30-
member __.DllInfos = dllInfos
31-
32-
3322
type internal Testing() =
3423

3524
/// Simulates a real instance of TypeProviderConfig
3625
static member MakeSimulatedTypeProviderConfig (resolutionFolder: string, runtimeAssembly: string, runtimeAssemblyRefs: string list, ?isHostedExecution, ?isInvalidationSupported) =
37-
38-
let cfg = TypeProviderConfig(fun _ -> false)
26+
let cfg = TypeProviderConfig(fun _ -> failwith "SystemRuntimeContainsType is deprecated and should never be called")
3927
cfg.IsHostedExecution <- defaultArg isHostedExecution false
4028
cfg.IsInvalidationSupported <- defaultArg isInvalidationSupported true
41-
let (?<-) cfg prop value =
42-
let ty = cfg.GetType()
43-
match ty.GetProperty(prop,BindingFlags.Instance ||| BindingFlags.Public ||| BindingFlags.NonPublic) with
44-
| null ->
45-
let fld = ty.GetField(prop,BindingFlags.Instance ||| BindingFlags.Public ||| BindingFlags.NonPublic)
46-
if fld = null then failwith ("expected TypeProviderConfig to have a property or field "+prop)
47-
fld.SetValue(cfg, value)|> ignore
48-
| p ->
49-
p.GetSetMethod(nonPublic = true).Invoke(cfg, [| box value |]) |> ignore
50-
cfg?ResolutionFolder <- resolutionFolder
51-
cfg?RuntimeAssembly <- runtimeAssembly
52-
cfg?ReferencedAssemblies <- Array.zeroCreate<string> 0
53-
54-
// Fake an implementation of SystemRuntimeContainsType the shape expected by AssemblyResolver.fs.
55-
let dllInfos = [yield DllInfo(runtimeAssembly); for r in runtimeAssemblyRefs do yield DllInfo(r)]
56-
let tcImports = TcImports(Some(TcImports(None,[])),dllInfos)
57-
let systemRuntimeContainsType = (fun (_s:string) -> if tcImports.DllInfos.Length = 1 then true else true)
58-
cfg?systemRuntimeContainsType <- systemRuntimeContainsType
59-
60-
//Diagnostics.Debugger.Launch() |> ignore
61-
Diagnostics.Debug.Assert(cfg.GetType().GetField("systemRuntimeContainsType",BindingFlags.NonPublic ||| BindingFlags.Public ||| BindingFlags.Instance) |> isNull |> not)
62-
Diagnostics.Debug.Assert(systemRuntimeContainsType.GetType().GetField("tcImports",BindingFlags.NonPublic ||| BindingFlags.Public ||| BindingFlags.Instance) |> isNull |> not)
63-
Diagnostics.Debug.Assert(typeof<TcImports>.GetField("dllInfos",BindingFlags.NonPublic ||| BindingFlags.Public ||| BindingFlags.Instance) |> isNull |> not)
64-
Diagnostics.Debug.Assert(typeof<TcImports>.GetProperty("Base",BindingFlags.NonPublic ||| BindingFlags.Public ||| BindingFlags.Instance) |> isNull |> not)
65-
Diagnostics.Debug.Assert(typeof<DllInfo>.GetProperty("FileName",BindingFlags.NonPublic ||| BindingFlags.Public ||| BindingFlags.Instance) |> isNull |> not)
66-
29+
cfg.ResolutionFolder <- resolutionFolder
30+
cfg.RuntimeAssembly <- runtimeAssembly
31+
cfg.ReferencedAssemblies <- Array.ofList runtimeAssemblyRefs
6732
cfg
6833

6934
/// Simulates a real instance of TypeProviderConfig and then creates an instance of the last

0 commit comments

Comments
 (0)