diff options
| author | Elinor Fung <47805090+elinor-fung@users.noreply.github.com> | 2019-05-21 12:05:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-21 12:05:49 -0700 |
| commit | 0d6facf7afac5868db3dce55a1fb940a02365687 (patch) | |
| tree | 82abee2cd5540684fe9e26796f66d8924b574f4a /src/.nuget/dir.targets | |
| parent | 11c8d92992f56fb481f9479219671652af7b04a1 (diff) | |
| download | coreclr-0d6facf7afac5868db3dce55a1fb940a02365687.tar.gz coreclr-0d6facf7afac5868db3dce55a1fb940a02365687.tar.bz2 coreclr-0d6facf7afac5868db3dce55a1fb940a02365687.zip | |
Switch NuGet package build to use Arcade instead of BuildTools (#24619)
Diffstat (limited to 'src/.nuget/dir.targets')
| -rw-r--r-- | src/.nuget/dir.targets | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/.nuget/dir.targets b/src/.nuget/dir.targets index 4d4883bf78..b51b76a28a 100644 --- a/src/.nuget/dir.targets +++ b/src/.nuget/dir.targets @@ -1,10 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" /> + + <PropertyGroup> + <!-- Reset PackageOutputPath. The ProjectDefaults targets from Arcade set it to be in the artifacts directory, + but our publishing step currently looks under PackagesBinDir --> + <PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath> + </PropertyGroup> + + <Import Project="$(NuGetPackageRoot)\microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingPackageVersion)\build\Microsoft.DotNet.Build.Tasks.Packaging.targets" /> - <Target Name="VerifyVCRedist" BeforeTargets="GetSymbolPackageFiles" Condition="'$(_runtimeOSFamily)' == 'win'"> - <Error Condition="'$(UniversalCRTSDKDir)' == ''" Text="Unable to find VC Redist binaries - check that UniversalCRTSDKDir environment variable is set" /> - </Target> <!-- Finds symbol files and injects them into the package build. --> @@ -64,7 +70,7 @@ <!-- Search for all xplat symbol file extensions on every xplat native binary. Some binaries have no ".so" or ".dylib" extension, so we can't tell which convention its symbol files would - use. On xplat, the symbol extension is simply appended. + use. On xplat, the symbol extension is simply appended. --> <NonWindowsNativeFile Include="@(NativeWithSymbolFile)" Exclude="@(WindowsNativeFile)" /> @@ -93,19 +99,4 @@ </ItemGroup> </Target> - <!-- OverrideLicenseUrl is temporary till we update the buildtools to v2 --> - <Target Name="OverrideLicenseUrl" BeforeTargets="GenerateNuSpec"> - <PropertyGroup> - <LicenseUrl>https://github.com/dotnet/coreclr/blob/master/LICENSE.TXT</LicenseUrl> - </PropertyGroup> - </Target> - - <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)\.., dir.targets))\dir.targets" /> - <ItemGroup> - <!-- Add version file to packages --> - <File Condition="Exists('$(SyncInfoFile)')" - Include="$(SyncInfoFile)"> - <SkipPackageFileCheck>true</SkipPackageFileCheck> - </File> - </ItemGroup> </Project> |