From 6af4d74d8ed17243d0d3ffc2fbaa420f26dd56d7 Mon Sep 17 00:00:00 2001
From: Chet Husk <chusk3@gmail.com>
Date: Sat, 12 Feb 2022 17:27:32 -0600
Subject: [PATCH] minor packaging fix to prevent taking the bad content from
 FSharp.Core

---
 paket.dependencies                                 | 2 +-
 paket.lock                                         | 2 +-
 src/Directory.Build.props                          | 2 ++
 src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj | 1 +
 src/FsAutoComplete/FsAutoComplete.fsproj           | 1 -
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/paket.dependencies b/paket.dependencies
index d795c11a0..53f005837 100644
--- a/paket.dependencies
+++ b/paket.dependencies
@@ -26,7 +26,7 @@ nuget Mono.Cecil >= 0.10.0-beta7
 nuget Newtonsoft.Json
 # nuget Fake.Runtime prerelease
 nuget FSharpLint.Core
-nuget FSharp.Core
+nuget FSharp.Core content: none
 nuget Dapper
 nuget Microsoft.Data.Sqlite 2.2.4
 nuget Microsoft.Data.Sqlite.Core 2.2.4
diff --git a/paket.lock b/paket.lock
index 253b57c8e..796637374 100644
--- a/paket.lock
+++ b/paket.lock
@@ -63,7 +63,7 @@ NUGET
     FSharp.Control.Reactive (5.0.2) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= net5.0))
       FSharp.Core (>= 4.7.2)
       System.Reactive (>= 5.0)
-    FSharp.Core (6.0.1)
+    FSharp.Core (6.0.1) - content: none
     FSharp.Formatting (14.0.1)
       FSharp.Compiler.Service (>= 40.0) - restriction: || (== net5.0) (&& (== netstandard2.0) (>= netstandard2.1))
     FSharp.UMX (1.1)
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 913ad3ed4..0c92968a9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -5,5 +5,7 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <!-- suppress false positive warning FS2003 about invalid version of AssemblyInformationalVersionAttribute -->
     <NoWarn>$(NoWarn);FS2003</NoWarn>
+    <!-- We've got a prerelease dep on System.CommandLine, and NuGet doesn't like that. NuGet can be quiet in this instance. -->
+    <NoWarn>$(NoWarn);NU5104</NoWarn>
   </PropertyGroup>
 </Project>
diff --git a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
index 6afca584c..e6b49862c 100644
--- a/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
+++ b/src/FsAutoComplete.Core/FsAutoComplete.Core.fsproj
@@ -5,6 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\FsAutoComplete.Logging\FsAutoComplete.Logging.fsproj" />
+    <TrimmerRootAssembly Include="FsAutoComplete.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Debug.fs" />
diff --git a/src/FsAutoComplete/FsAutoComplete.fsproj b/src/FsAutoComplete/FsAutoComplete.fsproj
index 39c239dc5..1430b5c8e 100644
--- a/src/FsAutoComplete/FsAutoComplete.fsproj
+++ b/src/FsAutoComplete/FsAutoComplete.fsproj
@@ -12,7 +12,6 @@
     <PackageIcon>logo.png</PackageIcon>
     <PackageProjectUrl>$(RepositoryUrl)</PackageProjectUrl>
     <Authors>FsAutoComplete contributors</Authors>
-    <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
   <ItemGroup>
     <None Include="../../README.md" Pack="true" PackagePath="\" />