Skip to content

Commit 068ebd3

Browse files
authored
Merge pull request #10034 from dotnet/merges/main-to-release/dev16.8
Merge main to release/dev16.8
2 parents fe7efc4 + 3fea4bb commit 068ebd3

File tree

33 files changed

+0
-1146
lines changed

33 files changed

+0
-1146
lines changed

FSharpBuild.Directory.Build.props

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,6 @@
3838
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
3939
</PropertyGroup>
4040

41-
<!-- mono -->
42-
<PropertyGroup Condition="'$(OS)' == 'Unix'">
43-
<MonoRoot Condition="'$(MonoRoot)' == '' and $([MSBuild]::IsOsPlatform('Linux'))">/usr</MonoRoot>
44-
<MonoRoot Condition="'$(MonoRoot)' == '' and $([MSBuild]::IsOsPlatform('OSX'))">/Library/Frameworks/Mono.framework/Versions/Current</MonoRoot>
45-
<MonoLibFolder>$(MonoRoot)/lib/mono</MonoLibFolder>
46-
<MonoPackaging Condition="$(TargetFramework.StartsWith('net4'))">true</MonoPackaging>
47-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net45'">$(MonoLibFolder)/4.5-api</FrameworkPathOverride>
48-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net451'">$(MonoLibFolder)/4.5.1-api</FrameworkPathOverride>
49-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net452'">$(MonoLibFolder)/4.5.2-api</FrameworkPathOverride>
50-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net46'">$(MonoLibFolder)/4.6-api</FrameworkPathOverride>
51-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net461'">$(MonoLibFolder)/4.6.1-api</FrameworkPathOverride>
52-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net462'">$(MonoLibFolder)/4.6.2-api</FrameworkPathOverride>
53-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net47'">$(MonoLibFolder)/4.7-api</FrameworkPathOverride>
54-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net471'">$(MonoLibFolder)/4.7.1-api</FrameworkPathOverride>
55-
<FrameworkPathOverride Condition="'$(TargetFramework)' == 'net472'">$(MonoLibFolder)/4.7.2-api</FrameworkPathOverride>
56-
</PropertyGroup>
57-
5841
<!-- signing -->
5942
<PropertyGroup>
6043
<StrongNameKeyId>Microsoft</StrongNameKeyId>

mono/FSharp.Build/Makefile

Lines changed: 0 additions & 8 deletions
This file was deleted.

mono/FSharp.Compiler.Interactive.Settings/Makefile

Lines changed: 0 additions & 11 deletions
This file was deleted.

mono/FSharp.Compiler.Private/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.

mono/FSharp.Compiler.Server.Shared/Makefile

Lines changed: 0 additions & 11 deletions
This file was deleted.

mono/FSharp.Core/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.

mono/Fsc/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.

mono/appveyor.ps1

Lines changed: 0 additions & 30 deletions
This file was deleted.

mono/build-mono.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

mono/cibuild.sh

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)