From 77a3089c8dd0596ffecb6e4363987453a62db1d5 Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Thu, 25 Oct 2018 14:27:46 -0700
Subject: [PATCH] Workaround quirks in NuGet

* Disable package analysis because it incorrectly issues NU5109 on macOS, but not windows
* Normalize file paths because if you mix slashes, NuGet will just skip the entire folder
* Normalize the project path given to restore. If it not normalized, restore skips the project and issues a warning
---
 build/SharedFx.targets                | 3 ++-
 eng/targets/SharedFx.Common.targets   | 3 +++
 src/Framework/Directory.Build.props   | 4 +++-
 src/Framework/Directory.Build.targets | 6 +++---
 src/Framework/runtime.fx.nuspec       | 8 ++++----
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/build/SharedFx.targets b/build/SharedFx.targets
index 3111c1de28..c2d5d7ed5a 100644
--- a/build/SharedFx.targets
+++ b/build/SharedFx.targets
@@ -2,7 +2,8 @@
   <Import Project="SharedFx.props" />
 
   <PropertyGroup>
-    <UnitTestFxProject>$(RepositoryRoot)\src\Framework\Framework.UnitTests\Framework.UnitTests.csproj</UnitTestFxProject>
+    <UnitTestFxProject>$(RepositoryRoot)src\Framework\Framework.UnitTests\Framework.UnitTests.csproj</UnitTestFxProject>
+    <UnitTestFxProject>$([MSBuild]::NormalizePath($(UnitTestFxProject)))</UnitTestFxProject>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/eng/targets/SharedFx.Common.targets b/eng/targets/SharedFx.Common.targets
index c0dc682963..6102fa6279 100644
--- a/eng/targets/SharedFx.Common.targets
+++ b/eng/targets/SharedFx.Common.targets
@@ -75,6 +75,9 @@ This targets file should only be imported by .shfxproj files.
     <PublishDir Condition=" '$(CrossGenOutput)' != 'true' ">$(OutputPath)</PublishDir>
     <PublishDir Condition=" '$(CrossGenOutput)' == 'true' ">$(IntermediateOutputPath)u\</PublishDir>
 
+    <!-- If symbols generation is disabled, there is no use in producing a symbols.nupkg files. -->
+    <IncludeSymbols Condition="'$(CrossgenSymbolsOutput)' == 'false'">false</IncludeSymbols>
+
     <MetadataOutputPath Condition="'$(MetadataOutputPath)' == ''">$(OutputPath)files\</MetadataOutputPath>
     <SymbolsOutputPath Condition="'$(SymbolsOutputPath)' == ''">$(OutputPath)symbols\</SymbolsOutputPath>
     <NativeAssetsOutputPath Condition="'$(NativeAssetsOutputPath)' == ''">$(OutputPath)native\</NativeAssetsOutputPath>
diff --git a/src/Framework/Directory.Build.props b/src/Framework/Directory.Build.props
index e914efbc02..5e777f75d6 100644
--- a/src/Framework/Directory.Build.props
+++ b/src/Framework/Directory.Build.props
@@ -19,11 +19,13 @@
     <BaseIntermediateOutputPath>$(RepositoryRoot)obj\fx\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
 
     <CrossgenOutput Condition="'$(SharedFxRid)' == 'linux-arm'">false</CrossgenOutput>
-    <CrossgenSymbolOutput Condition=" '$(CrossgenOutput)' == 'false' OR '$(SharedFxRid)' == 'osx-x64'">false</CrossgenSymbolOutput>
+    <CrossgenSymbolsOutput Condition=" '$(CrossgenOutput)' == 'false' OR '$(SharedFxRid)' == 'osx-x64'">false</CrossgenSymbolsOutput>
 
     <IncludeSymbols>true</IncludeSymbols>
     <NuspecFile>$(MSBuildThisFileDirectory)runtime.fx.nuspec</NuspecFile>
     <PackageTags>aspnetcore;shared-framework</PackageTags>
+    <!-- Workaround for invalid NU5109 error when packing on macOS. -->
+    <NoPackageAnalysis>true</NoPackageAnalysis>
   </PropertyGroup>
 
 </Project>
diff --git a/src/Framework/Directory.Build.targets b/src/Framework/Directory.Build.targets
index e8f4992a1a..2997962ff6 100644
--- a/src/Framework/Directory.Build.targets
+++ b/src/Framework/Directory.Build.targets
@@ -19,9 +19,9 @@
         repositoryCommit=$(RepositoryCommit);
         copyright=$(Copyright);
         targetFramework=$(TargetFramework);
-        symbolsAssets=$(SymbolsOutputPath);
-        nativeAssets=$(NativeAssetsOutputPath);
-        runtimeAssets=$(RuntimeAssetsOutputPath);
+        symbolsAssets=$([MSBuild]::NormalizeDirectory($(SymbolsOutputPath)));
+        nativeAssets=$([MSBuild]::NormalizeDirectory($(NativeAssetsOutputPath)));
+        runtimeAssets=$([MSBuild]::NormalizeDirectory($(RuntimeAssetsOutputPath)));
       </NuspecProperties>
     </PropertyGroup>
   </Target>
diff --git a/src/Framework/runtime.fx.nuspec b/src/Framework/runtime.fx.nuspec
index bbfbe70ec3..292d128d1b 100644
--- a/src/Framework/runtime.fx.nuspec
+++ b/src/Framework/runtime.fx.nuspec
@@ -15,10 +15,10 @@
     <serviceable>true</serviceable>
   </metadata>
   <files>
-    <file src="$symbolsAssets$" target="runtimes\$rid$\lib\$targetFramework$\" />
-    <file src="$runtimeAssets$" target="runtimes\$rid$\lib\$targetFramework$\" />
-    <file src="$nativeAssets$" target="runtimes\$rid$\native\" />
+    <file src="$symbolsAssets$" target="runtimes/$rid$/lib/$targetFramework$/" />
+    <file src="$runtimeAssets$" target="runtimes/$rid$/lib/$targetFramework$/" />
+    <file src="$nativeAssets$" target="runtimes/$rid$/native/" />
     <!-- This is a dummy reference which prevents NuGet from adding any compilation references when this package is imported. -->
-    <file src="_._" target="ref\netstandard\" />
+    <file src="_._" target="ref/netstandard/" />
   </files>
 </package>