Skip to content

[build] Don't install FSharp.Core assemblies #736

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
jonpryor merged 1 commit into from
Aug 11, 2017
Merged

[build] Don't install FSharp.Core assemblies #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 0 additions & 20 deletions build-tools/mono-runtimes/mono-runtimes.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,6 @@
/>
<MonoDocCopyItem Include="monodoc.dll.config" />
</ItemGroup>
<ItemGroup>
<FSharpItem Include="FSharp.Core.dll" />
<FSharpItem Include="FSharp.Core.optdata" />
<FSharpItem Include="FSharp.Core.sigdata" />
</ItemGroup>
<ItemGroup>
<_FSharpInstalledItems Include="@(FSharpItem->'$(_BclFrameworkDir)%(Identity)')" />
</ItemGroup>
<UsingTask AssemblyFile="$(_SourceTopDir)\bin\Build$(Configuration)\Xamarin.Android.Tools.BootstrapTasks.dll" TaskName="Xamarin.Android.Tools.BootstrapTasks.GetNugetPackageBasePath" />
<ItemGroup>
<_MonoDocCopyItems Include="@(MonoDocCopyItem->'$(_MonoOutputDir)\%(Identity)')" />
Expand Down Expand Up @@ -447,11 +439,7 @@
<ItemGroup>
<_PackageConfigFiles Include="$(_SourceTopDir)\src\Xamarin.Android.Build.Tasks\packages.config" />
</ItemGroup>
<GetNugetPackageBasePath PackageConfigFiles="@(_PackageConfigFiles)" PackageName="FSharp.Core">
<Output TaskParameter="BasePath" PropertyName="_FSharpCorePackagePath" />
</GetNugetPackageBasePath>
<ItemGroup>
<_FSharp Include="$(_SourceTopDir)\$(_FSharpCorePackagePath)\lib\portable-net45+monoandroid10+monotouch10+xamarinios10\FSharp.Core*" />
<_Facades Include="$(_MonoProfileDir)\Facades\*.dll" />
</ItemGroup>
<Copy
Expand All @@ -462,13 +450,6 @@
SourceFiles="@(_Facades)"
DestinationFolder="$(_BclFrameworkDir)Facades"
/>
<Copy
SourceFiles="@(_FSharp)"
DestinationFolder="$(_BclFrameworkDir)"
/>
<Touch
Files="@(_FSharp->'$(_BclFrameworkDir)%(Filename)%(Extension)')"
/>
<Touch
Files="@(_BclInstalledItem)"
/>
Expand Down Expand Up @@ -577,7 +558,6 @@
<BundleItem Include="@(_MonoDocInstalledItems)" />
<BundleItem Include="@(_MonoCilStripDest)" />
<BundleItem Include="@(_MonoUtilityDest)" />
<BundleItem Include="@(_FSharpInstalledItems)" />
<BundleItem Include="@(MonoFacadeAssembly->'$(_BclFrameworkDir)Facades\%(Identity)')" />
<BundleItem Include="$(_BclFrameworkDir)RedistList\FrameworkList.xml" />
<BundleItem Include="@(_InstallRuntimeOutput)" />
Expand Down
1 change: 0 additions & 1 deletion src/Xamarin.Android.Build.Tasks/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,4 @@
<package id="FSharp.Compiler.CodeDom" version="0.9.4" targetFramework="net45" />
<package id="FSharp.Compiler.CodeDom" version="1.0.0.1" targetFramework="net45" />
<package id="Irony" version="0.9.1" targetFramework="net45" />
<package id="FSharp.Core" version="3.1.2.5" targetFramework="net45" />
</packages>