huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Nate McMaster 2018-10-25 14:27:46 -07:00
parent dbc28c523e
commit 77a3089c8d
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/SharedFx.targets
View File

@ -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>

3
eng/targets/SharedFx.Common.targets
View File

@ -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>

4
src/Framework/Directory.Build.props
View File

@ -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>

6
src/Framework/Directory.Build.targets
View File

@ -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>

8
src/Framework/runtime.fx.nuspec
View File

@ -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>