Skip to content

Commit 1861a89

Browse files
committed
[build] Don't install FSharp.Core assemblies (#736)
Fixes: https://bugzilla.xamarin.com/show_bug.cgi?id=58689 Context: https://developer.xamarin.com/releases/android/xamarin.android_7/xamarin.android_7.4/#FSharpCore We [removed `FSharp.Core.dll` from the commercial product][1] because it's presence was actively breaking things (due to still-not-understood changes around Visual Studio and MSBuild): [1]: https://developer.xamarin.com/releases/android/xamarin.android_7/xamarin.android_7.4/#FSharpCore > the `FSharp.Core.dll` distributed with Xamarin.Android is now being > used in preference to the NuGet package, through no changes on the > Xamarin.Android side of things. This means that the NuGet package > cannot be used Remove the `FSharp.Core` assemblies from the OSS side of things. Developers wishing to use F# and the `FSharp.Core` assemblies should use the [`FSharp.Core` NuGet package][2]. [2]: https://www.nuget.org/packages/FSharp.Core/
1 parent afc3ab9 commit 1861a89

File tree

3 files changed

+1
-22
lines changed

3 files changed

+1
-22
lines changed

build-tools/bundle/bundle-path.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<Target Name="GetBundleFileName"
2525
DependsOnTargets="_GetHashes">
2626
<PropertyGroup>
27-
<XABundleFileName>bundle-v18-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
27+
<XABundleFileName>bundle-v19-$(Configuration)-$(HostOS)-libzip=$(_LibZipHash),llvm=$(_LlvmHash),mono=$(_MonoHash).zip</XABundleFileName>
2828
</PropertyGroup>
2929
</Target>
3030
</Project>

build-tools/mono-runtimes/mono-runtimes.targets

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
/>
2020
<MonoDocCopyItem Include="monodoc.dll.config" />
2121
</ItemGroup>
22-
<ItemGroup>
23-
<FSharpItem Include="FSharp.Core.dll" />
24-
<FSharpItem Include="FSharp.Core.optdata" />
25-
<FSharpItem Include="FSharp.Core.sigdata" />
26-
</ItemGroup>
27-
<ItemGroup>
28-
<_FSharpInstalledItems Include="@(FSharpItem->'$(OutputPath)\lib\xbuild-frameworks\MonoAndroid\v1.0\%(Identity)')" />
29-
</ItemGroup>
3022
<UsingTask AssemblyFile="$(_SourceTopDir)\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.GetNugetPackageBasePath" />
3123
<Import Project="$(_SourceTopDir)\Configuration.props" />
3224
<ItemGroup>
@@ -440,11 +432,7 @@
440432
<ItemGroup>
441433
<_PackageConfigFiles Include="$(_SourceTopDir)\src\Xamarin.Android.Build.Tasks\packages.config" />
442434
</ItemGroup>
443-
<GetNugetPackageBasePath PackageConfigFiles="@(_PackageConfigFiles)" PackageName="FSharp.Core">
444-
<Output TaskParameter="BasePath" PropertyName="_FSharpCorePackagePath" />
445-
</GetNugetPackageBasePath>
446435
<ItemGroup>
447-
<_FSharp Include="$(_SourceTopDir)\$(_FSharpCorePackagePath)\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core*" />
448436
<_Facades Include="$(_MonoProfileDir)\Facades\*.dll" />
449437
</ItemGroup>
450438
<Copy
@@ -455,13 +443,6 @@
455443
SourceFiles="@(_Facades)"
456444
DestinationFolder="$(_BclFrameworkDir)\Facades"
457445
/>
458-
<Copy
459-
SourceFiles="@(_FSharp)"
460-
DestinationFolder="$(_BclFrameworkDir)"
461-
/>
462-
<Touch
463-
Files="@(_FSharp->'$(_BclFrameworkDir)\%(Filename)%(Extension)')"
464-
/>
465446
<Touch
466447
Files="@(_BclInstalledItem)"
467448
/>
@@ -571,7 +552,6 @@
571552
<BundleItem Include="@(_MonoDocInstalledItems)" />
572553
<BundleItem Include="@(_MonoCilStripDest)" />
573554
<BundleItem Include="@(_MonoUtilityDest)" />
574-
<BundleItem Include="@(_FSharpInstalledItems)" />
575555
<BundleItem Include="@(MonoFacadeAssembly->'$(OutputPath)\lib\xbuild-frameworks\MonoAndroid\v1.0\Facades\%(Identity)')" />
576556
<BundleItem Include="$(OutputPath)\lib\xbuild-frameworks\MonoAndroid\v1.0\RedistList\FrameworkList.xml" />
577557
<BundleItem Include="@(_InstallRuntimeOutput)" />

src/Xamarin.Android.Build.Tasks/packages.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@
33
<package id="FSharp.Compiler.CodeDom" version="0.9.4" targetFramework="net45" />
44
<package id="FSharp.Compiler.CodeDom" version="1.0.0.1" targetFramework="net45" />
55
<package id="Irony" version="0.9.1" targetFramework="net45" />
6-
<package id="FSharp.Core" version="3.1.2.5" targetFramework="net45" />
76
</packages>

0 commit comments

Comments
 (0)