Skip to content

Build FSI and FSC using AppHost #10736

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.

Sign up for GitHub

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

Merged
vzarytovskii merged 5 commits into from
Dec 21, 2020
Merged

Build FSI and FSC using AppHost #10736

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c76b30a
move over to fsc.dll and fsi.dll
KevinRansom Dec 16, 2020
0e39d7c
temp
KevinRansom Dec 16, 2020
80e386b
bad image
KevinRansom Dec 16, 2020
104b45b
oops
KevinRansom Dec 16, 2020
e191053
assembly check
KevinRansom Dec 16, 2020
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
Prev Previous commit
assembly check
  • Loading branch information
@KevinRansom
KevinRansom committed Dec 16, 2020
commit e191053adef31f0ed22c9d2d21d5c4cb81d7506a
61 changes: 37 additions & 24 deletions src/buildtools/AssemblyCheck/AssemblyCheck.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,42 @@ module AssemblyCheck =
let private devVersionPattern = new Regex(@"-(ci|dev)", RegexOptions.Compiled)

let verifyEmbeddedPdb (filename:string) =
use fileStream = File.OpenRead(filename)
let reader = new PEReader(fileStream)
let mutable hasEmbeddedPdb = false

try
for entry in reader.ReadDebugDirectory() do
match entry.Type with
| DebugDirectoryEntryType.CodeView ->
let _ = reader.ReadCodeViewDebugDirectoryData(entry)
()

| DebugDirectoryEntryType.EmbeddedPortablePdb ->
let _ = reader.ReadEmbeddedPortablePdbDebugDirectoryData(entry)
hasEmbeddedPdb <- true
()

| DebugDirectoryEntryType.PdbChecksum ->
let _ = reader.ReadPdbChecksumDebugDirectoryData(entry)
()

| _ -> ()
with | e -> printfn "Error validating assembly %s\nMessage: %s" filename (e.ToString())
hasEmbeddedPdb
let isManagedDll =
try
// Is il assembly? throws if not
let _ = AssemblyName.GetAssemblyName(filename).Version
true
with
| :? System.BadImageFormatException -> false // uninterested in embedded pdbs for native dlls

if isManagedDll then
use fileStream = File.OpenRead(filename)
let reader = new PEReader(fileStream)
let mutable hasEmbeddedPdb = false

try
for entry in reader.ReadDebugDirectory() do
match entry.Type with
| DebugDirectoryEntryType.CodeView ->
let _ = reader.ReadCodeViewDebugDirectoryData(entry)
()

| DebugDirectoryEntryType.EmbeddedPortablePdb ->
let _ = reader.ReadEmbeddedPortablePdbDebugDirectoryData(entry)
hasEmbeddedPdb <- true
()

| DebugDirectoryEntryType.PdbChecksum ->
let _ = reader.ReadPdbChecksumDebugDirectoryData(entry)
()

| _ -> ()
with
| e -> printfn "Error validating assembly %s\nMessage: %s" filename (e.ToString())

hasEmbeddedPdb
else
true

let verifyAssemblies (binariesPath:string) =

Expand Down Expand Up @@ -72,7 +85,7 @@ module AssemblyCheck =
assemblyVersion = versionZero || assemblyVersion = versionOne
with | :? System.BadImageFormatException ->
// fsc.exe and fsi.exe are il on the desktop and native on the coreclr
Set.contains (Path.GetFileName(a)) maybeNativeExe)
Set.contains (Path.GetFileName(a)) maybeNativeExe |> not)

if failedVersionCheck.Length > 0 then
printfn "The following assemblies had a version of %A or %A" versionZero versionOne
Expand Down