Skip to content

FSharp.Compiler.Private --> .NET Standard 2.0 #7717

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

Closed
cartermp wants to merge 2 commits into from
Closed

FSharp.Compiler.Private --> .NET Standard 2.0 #7717

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31a0e76
FSharp.Compiler.Private targets .NET Standard 2.0
cartermp Jul 12, 2019
51d3868
Set possibly null value to empty so we get better failures in the reg…
cartermp Aug 20, 2019
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
Set possibly null value to empty so we get better failures in the reg… 
…ex match, JoJo
  • Loading branch information
@cartermp
cartermp committed Oct 9, 2019
commit 51d386836b1b61c4594ae27c286ef151e1042cdb
8 changes: 5 additions & 3 deletions eng/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,6 @@ function BuildSolution {

# build bootstrap tools
bootstrap_config=Proto

bootstrap_dir=$artifacts_dir/Bootstrap
if [[ "$force_bootstrap" == true ]]; then
rm -fr $bootstrap_dir
Expand All @@ -245,10 +244,13 @@ function BuildSolution {
fi
if [ ! -f "$bootstrap_dir/fsc.exe" ]; then
MSBuild "$repo_root/proto.proj" \
$bl \
/restore \
/p:Configuration=$bootstrap_config \
/t:Publish
/t:Publish || {
local exit_code=$?
Write-PipelineTelemetryError -category 'Build' "Error building bootstrap compiler (exit code '$exit_code')."
ExitWithExitCode $exit_code
}

cp -pr $artifacts_dir/bin/fsc/$bootstrap_config/netcoreapp2.1/publish $bootstrap_dir/fsc
fi
Expand Down
6 changes: 3 additions & 3 deletions src/buildtools/AssemblyCheck/AssemblyCheck.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,9 @@ module AssemblyCheck =
fsharpAssemblies
|> List.filter (fun p -> not (p.Contains(@"\FSharpSdk\")))
|> List.filter (fun a ->
let fileProductVersion = FileVersionInfo.GetVersionInfo(a).ProductVersion
if (isNull fileProductVersion) then
printfn "Null product version: %s" a
let fileProductVersion =
let v = FileVersionInfo.GetVersionInfo(a).ProductVersion
if isNull v then String.Empty else v
not (commitHashPattern.IsMatch(fileProductVersion) || devVersionPattern.IsMatch(fileProductVersion)))

if failedCommitHash.Length > 0 then
Expand Down
4 changes: 2 additions & 2 deletions tests/FSharp.Core.UnitTests/LibraryTestFx.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ module SurfaceArea =
let private getActual () =

// get current FSharp.Core
let asm =
typeof<int list>.Assembly
let asm = typeof<int list>.Assembly
let fsCoreFullName = asm.FullName

// public types only
let types = asm.ExportedTypes |> Seq.filter (fun ty -> let ti = ty.GetTypeInfo() in ti.IsPublic || ti.IsNestedPublic) |> Array.ofSeq
Expand Down