From b150086889fe5e15f96cdb059af9e1f141857212 Mon Sep 17 00:00:00 2001
From: "Kevin Ransom (msft)" <codecutter@hotmail.com>
Date: Wed, 2 Dec 2020 14:44:45 -0800
Subject: [PATCH] Fix FSC nuget package dependencies.  Use FSharp.Org tool Icon
 as package icon. (#10588)

---
 .../FSharp.Compiler.Service.fsproj            |  31 +++++++++++++++---
 .../FSharp.Compiler.Service.nuspec            |  31 +++++++++++++++---
 src/fsharp/FSharp.Compiler.Service/logo.png   | Bin 0 -> 4357 bytes
 3 files changed, 54 insertions(+), 8 deletions(-)
 create mode 100644 src/fsharp/FSharp.Compiler.Service/logo.png

diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
index b1f2c20fc07..7a8661a39fa 100644
--- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
+++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.fsproj
@@ -22,12 +22,36 @@
     <PackageDescription>The F# Compiler Services package For F# $(FSLanguageVersion) exposes additional functionality for implementing F# language bindings, additional tools based on the compiler or refactoring tools. The package also includes F# interactive service that can be used for embedding F# scripting into your applications.  Contains code from the F# Software Foundation.</PackageDescription>
     <PackageReleaseNotes>/blob/main/release-notes.md#FSharp-Compiler-Service-$(FSharpCompilerServiceReleaseNotesVersion)</PackageReleaseNotes>
     <PackageTags>F#, fsharp, interactive, compiler, editor</PackageTags>
+    <PackageIconFullPath>$(MSBuildThisFileDirectory)logo.png</PackageIconFullPath>
   </PropertyGroup>
 
   <ItemGroup>
-    <NuspecProperty Include="FSharpCoreVersion=$(FSCorePackageVersion)" Condition="'$(VersionSuffix)'==''" />
-    <NuspecProperty Include="FSharpCoreVersion=$(FSCorePackageVersion)-$(VersionSuffix)" Condition="'$(VersionSuffix)'!=''" />
-    <NuspecProperty Include="TargetFramework=$(TargetFramework)" />
+    <NuspecProperty Include="FSharpCorePackageVersion=$(FSCorePackageVersion)" Condition="'$(VersionSuffix)'==''" />
+    <NuspecProperty Include="FSharpCorePackageVersion=$(FSCorePackageVersion)-$(VersionSuffix)" Condition="'$(VersionSuffix)'!=''" />
+    <NuspecProperty Include="MicrosoftBuildFrameworkPackageVersion=$(MicrosoftBuildFrameworkVersion)" />
+    <NuspecProperty Include="MicrosoftBuildTasksCorePackageVersion=$(MicrosoftBuildTasksCoreVersion)" />
+    <NuspecProperty Include="MicrosoftBuildUtilitiesCorePackageVersion=$(MicrosoftBuildUtilitiesCoreVersion)" />
+    <NuspecProperty Include="SystemBuffersPackageVersion=$(SystemBuffersVersion)" />
+    <NuspecProperty Include="SystemCollectionsImmutablePackageVersion=$(SystemCollectionsImmutableVersion)" />
+    <NuspecProperty Include="SystemDiagnosticsProcessPackageVersion=$(SystemDiagnosticsProcessVersion)" />
+    <NuspecProperty Include="SystemDiagnosticsTraceSourcePackageVersion=$(SystemDiagnosticsTraceSourceVersion)" />
+    <NuspecProperty Include="SystemLinqExpressionsPackageVersion=$(SystemLinqExpressionsVersion)" />
+    <NuspecProperty Include="SystemLinqQueryablePackageVersion=$(SystemLinqQueryableVersion)" />
+    <NuspecProperty Include="SystemMemoryPackageVersion=$(SystemMemoryVersion)" />
+    <NuspecProperty Include="SystemNetRequestsPackageVersion=$(SystemNetRequestsVersion)" />
+    <NuspecProperty Include="SystemNetSecurityPackageVersion=$(SystemNetSecurityVersion)" />
+    <NuspecProperty Include="SystemReflectionEmitPackageVersion=$(SystemReflectionEmitVersion)" />
+    <NuspecProperty Include="SystemReflectionMetadataPackageVersion=$(SystemReflectionMetadataVersion)" />
+    <NuspecProperty Include="SystemReflectionTypeExtensionsPackageVersion=$(SystemReflectionTypeExtensionsVersion)" />
+    <NuspecProperty Include="SystemRuntimePackageVersion=$(SystemRuntimeVersion)" />
+    <NuspecProperty Include="SystemRuntimeInteropServicesPackageVersion=$(SystemRuntimeInteropServicesVersion)" />
+    <NuspecProperty Include="SystemRuntimeLoaderPackageVersion=$(SystemRuntimeLoaderVersion)" />
+    <NuspecProperty Include="SystemSecurityClaimsPackageVersion=$(SystemSecurityClaimsVersion)" />
+    <NuspecProperty Include="SystemSecurityCryptographyAlgorithmsPackageVersion=$(SystemSecurityCryptographyAlgorithmsVersion)" />
+    <NuspecProperty Include="SystemSecurityPrincipalPackageVersion=$(SystemSecurityPrincipalVersion)" />
+    <NuspecProperty Include="SystemThreadingTasksParallelPackageVersion=$(SystemThreadingTasksParallelVersion)" />
+    <NuspecProperty Include="SystemThreadingThreadPackageVersion=$(SystemThreadingThreadVersion)" />
+    <NuspecProperty Include="SystemThreadingThreadPoolPackageVersion=$(SystemThreadingThreadPoolVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,7 +68,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)..\misc\logo.png" Pack="true" Visible="false" PackagePath="" />
     <EmbeddedText Include="..\FSComp.txt">
       <Link>FSComp.txt</Link>
     </EmbeddedText>
diff --git a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.nuspec b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.nuspec
index 981ead516c9..80b698bf220 100644
--- a/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.nuspec
+++ b/src/fsharp/FSharp.Compiler.Service/FSharp.Compiler.Service.nuspec
@@ -4,11 +4,34 @@
         $CommonMetadataElements$
         <language>en-US</language>
         <dependencies>
-            <group targetFramework=".NETStandard2.0">
-                <dependency id="FSharp.Core" version="$FSharpCoreVersion$" />
-            </group>
+          <group targetFramework=".NETStandard2.0">
+            <dependency id="FSharp.Core" version="$FSharpCorePackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="Microsoft.Build.Framework" version="$MicrosoftBuildFrameworkPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="Microsoft.Build.Tasks.Core" version="$MicrosoftBuildTasksCorePackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="Microsoft.Build.Utilities.Core" version="$MicrosoftBuildUtilitiesCorePackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Buffers" version="$SystemBuffersPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Collections.Immutable" version="$SystemCollectionsImmutablePackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Diagnostics.Process" version="$SystemDiagnosticsProcessPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Diagnostics.TraceSource" version="$SystemDiagnosticsTraceSourcePackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Linq.Expressions" version="$SystemLinqExpressionsPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Linq.Queryable" version="$SystemLinqQueryablePackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Memory" version="$SystemMemoryPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Net.Requests" version="$SystemNetRequestsPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Net.Security" version="$SystemNetSecurityPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Reflection.Emit" version="$SystemReflectionEmitPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Reflection.Metadata" version="$SystemReflectionMetadataPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Reflection.TypeExtensions" version="$SystemReflectionTypeExtensionsPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Runtime" version="$SystemRuntimePackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Runtime.InteropServices" version="$SystemRuntimeInteropServicesPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Runtime.Loader" version="$SystemRuntimeLoaderPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Security.Claims" version="$SystemSecurityClaimsPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Security.Cryptography.Algorithms" version="$SystemSecurityCryptographyAlgorithmsPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Security.Principal" version="$SystemSecurityPrincipalPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Threading.Tasks.Parallel" version="$SystemThreadingTasksParallelPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Threading.Thread" version="$SystemThreadingThreadPackageVersion$" exclude="Build,Analyzers" />
+            <dependency id="System.Threading.ThreadPool" version="$SystemThreadingThreadPoolPackageVersion$" exclude="Build,Analyzers" />
+          </group>
         </dependencies>
-
     </metadata>
     <files>
         $CommonFileElements$
diff --git a/src/fsharp/FSharp.Compiler.Service/logo.png b/src/fsharp/FSharp.Compiler.Service/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d7b823ec9ab200214508c5d5c5c80c1d4440738
GIT binary patch
literal 4357
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

literal 0
HcmV?d00001