diff options
| author | Ian Hays <ianha@microsoft.com> | 2017-01-04 22:29:06 +0300 |
|---|---|---|
| committer | Ian Hays <ianha@microsoft.com> | 2017-01-04 22:59:07 +0300 |
| commit | 3734c44ddfa10ca157c5c11d4021b4760f2dcd9b (patch) | |
| tree | 2ae847fdde3f2d299f8e95165bdde519221f9c3f /build.proj | |
| parent | e22a66d1e00af56f8abb1696d74914abe8d28d1e (diff) | |
Make buildproj package generation ARM64 specific
The packages.zip generation in build.proj is only used in the ARM64 CI, but it isn't Platform specific. This is causing failures elsewhere.
Diffstat (limited to 'build.proj')
| -rw-r--r-- | build.proj | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/build.proj b/build.proj index 6c623d87d5..7fd4e64787 100644 --- a/build.proj +++ b/build.proj @@ -214,8 +214,8 @@ </Target> <!-- Packages.zip creation --> - <UsingTask TaskName="ZipFileCreateFromDependencyLists" Condition="'$(ArchiveTests)' == 'true'" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> - <Target Name="ArchiveTestBuild" Condition="'$(ArchiveTests)' == 'true'" AfterTargets="Build" > + <UsingTask TaskName="ZipFileCreateFromDependencyLists" Condition="'$(Platform)' == 'ARM64' and '$(ArchiveTests)' == 'true'" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/> + <Target Name="ArchiveTestBuild" Condition="'$(Platform)' == 'ARM64' and '$(ArchiveTests)' == 'true'" AfterTargets="Build" > <ItemGroup> <ExcludeFromArchive Include="nupkg$" /> <ExcludeFromArchive Include="Microsoft.DotNet.BuildTools" /> @@ -223,14 +223,9 @@ <TestDependencyListFile Include="$(BinDir)/TestDependencies/*.dependencylist.txt" /> </ItemGroup> - <PropertyGroup> - <TestArchiveDir>$(TestWorkingDir)$(OSPlatformConfig)/archive/tests/</TestArchiveDir> - <TestArchiveDir Condition="'$(TestTFM)' != ''">$(TestArchiveDir)$(TestTFM)/</TestArchiveDir> - </PropertyGroup> - <ZipFileCreateFromDependencyLists DependencyListFiles="@(TestDependencyListFile)" - DestinationArchive="$(TestArchiveDir)\Packages.zip" + DestinationArchive="$(TestWorkingDir)$(OSPlatformConfig)/archive/tests/Packages.zip" RelativePathBaseDirectory="$(PackagesDir)" OverwriteDestination="true" /> </Target> |