Skip to content

Merge master to dev16.1 #6252

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
brettfo merged 7 commits into from
Feb 19, 2019
Merged

Merge master to dev16.1 #6252

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1bbb60a
fix package signing (#6207) (#6208)
brettfo Feb 7, 2019
84f7488
We don't ever set the value FCS_RETAIN_BACKGROUND_PARSE_RESULTS (#6212)
KevinRansom Feb 8, 2019
31a98b9
Ensure core tests pick up fsharp.core nuget packages from artifacts b…
KevinRansom Feb 8, 2019
b88055c
Update mono props: support OSX and more .NET Framework versions (#6181)
baronfel Feb 13, 2019
54c22cd
fix double-build of vsix packages (#6233)
brettfo Feb 17, 2019
7376e22
debug fixes (#6170)
dsyme Feb 19, 2019
fc15661
Merge branch 'dev16.1' into merges/master-to-dev16.1
brettfo Feb 19, 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
Next Next commit
Update mono props: support OSX and more .NET Framework versions (#6181) 
* Update mono props: support OSX and more .NET Framework versions

A potential solve for #6180 that uses msbuild built-ins to determine the target OS and pivots off of that to set the FrameworkPathOverride.  I included a `MonoRoot` property to allow for easy integration into the build process that fsharp/fsharp uses, which allows for a 'floating' mono root.

* add osx build jobs matching the linux jobs, and add a matrix entry to build the compiler for .net framework using mono

* don't try to build anything for .net framework on non-windows

this required additional build work that may conflict with upcoming work, so we'll just settle for building the existing components on macos at all in CI
  • Loading branch information
@baronfel @KevinRansom
baronfel authored and KevinRansom committed Feb 13, 2019
commit b88055c350dd4bde7466e2d3e9656dd925d2a088
26 changes: 24 additions & 2 deletions .vsts-pr.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@ jobs:
vmImage: ubuntu-16.04
timeoutInMinutes: 90
strategy:
maxParallel: 2
maxParallel: 3
matrix:
dotnet_sdk:
_command: make
_args: Configuration=release
# disabled until it can be properly fixed
release_fcs:
_command: ./fcs/build.sh
_args: Build
Expand All @@ -23,6 +22,29 @@ jobs:
continueOnError: true
condition: failed()

- job: MacOS
pool:
vmImage: macOS-10.13
timeoutInMinutes: 90
strategy:
maxParallel: 3
matrix:
dotnet_sdk:
_command: make
_args: Configuration=release
release_fcs:
_command: ./fcs/build.sh
_args: Build
steps:
- script: $(_command) $(_args)
- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: '$(Build.SourcesDirectory)/artifacts/TestResults'
ArtifactName: 'MacOS $(_command) $(_args)'
publishLocation: Container
continueOnError: true
condition: failed()

- job: Windows
pool:
vmImage: vs2017-win2016
Expand Down
14 changes: 12 additions & 2 deletions FSharpBuild.Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,19 @@

<!-- mono -->
<PropertyGroup Condition="'$(OS)' == 'Unix'">
<MonoRoot Condition="'$(MonoRoot)' == '' and $([MSBuild]::IsOsPlatform('Linux'))">/usr</MonoRoot>
<MonoRoot Condition="'$(MonoRoot)' == '' and $([MSBuild]::IsOsPlatform('OSX'))">/Library/Frameworks/Mono.framework/Versions/Current</MonoRoot>
<MonoLibFolder>$(MonoRoot)/lib/mono</MonoLibFolder>
<MonoPackaging Condition="$(TargetFramework.StartsWith('net4'))">true</MonoPackaging>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net45'">/usr/lib/mono/4.5-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net46'">/usr/lib/mono/4.6-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net45'">$(MonoLibFolder)/4.5-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net451'">$(MonoLibFolder)/4.5.1-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net452'">$(MonoLibFolder)/4.5.2-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net46'">$(MonoLibFolder)/4.6-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net461'">$(MonoLibFolder)/4.6.1-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net462'">$(MonoLibFolder)/4.6.2-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net47'">$(MonoLibFolder)/4.7-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net471'">$(MonoLibFolder)/4.7.1-api</FrameworkPathOverride>
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net472'">$(MonoLibFolder)/4.7.2-api</FrameworkPathOverride>
</PropertyGroup>

<!-- signing -->
Expand Down