From: Eric Erhardt Date: Thu, 19 Oct 2017 23:29:45 +0000 (-0500) Subject: Fix output directories. X-Git-Tag: submit/tizen/20210909.063632~11032^2~1080^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6d5859bba9247c402abfd719925ecfa3723330f0;p=platform%2Fupstream%2Fdotnet%2Fruntime.git Fix output directories. 1. Use PackageOutputPath variable exclusively everywhere instead of our own name for the same path. 2. Split nuget packages and installer assets into separate paths - packages and assets. Commit migrated from https://github.com/dotnet/core-setup/commit/cd7c3d21acc02bac3f52aca6571dd516165c4bda --- diff --git a/src/installer/pkg/dir.props b/src/installer/pkg/dir.props index 9137b13..b83e911 100644 --- a/src/installer/pkg/dir.props +++ b/src/installer/pkg/dir.props @@ -12,8 +12,6 @@ - $(PackagesOutDir) - $(SymbolPackagesOutDir) $(ProjectDir)LICENSE.TXT $(ProjectDir)THIRD-PARTY-NOTICES.TXT https://github.com/dotnet/core-setup/blob/master/LICENSE.TXT diff --git a/src/installer/pkg/packaging/deb/package.props b/src/installer/pkg/packaging/deb/package.props index 2b9c211..fb99eff 100644 --- a/src/installer/pkg/packaging/deb/package.props +++ b/src/installer/pkg/packaging/deb/package.props @@ -2,7 +2,7 @@ $(ProjectDir)tools-local/setuptools/dotnet-deb-tool/ - $(PackagesOutDir) + $(PackageOutputPath) dotnet-deb-tool-consumer.csproj $(IntermediateOutputRootPath)$(toolConsumerProjectName) $(PackagingRoot)deb/ diff --git a/src/installer/pkg/packaging/deb/package.targets b/src/installer/pkg/packaging/deb/package.targets index a959b46..eaf25a8 100644 --- a/src/installer/pkg/packaging/deb/package.targets +++ b/src/installer/pkg/packaging/deb/package.targets @@ -17,14 +17,7 @@ - - - - - - - + diff --git a/src/installer/pkg/packaging/dir.proj b/src/installer/pkg/packaging/dir.proj index 374e1ee..ce6ad92 100644 --- a/src/installer/pkg/packaging/dir.proj +++ b/src/installer/pkg/packaging/dir.proj @@ -79,8 +79,8 @@ DestinationFolder="$(CombinedPublishRoot)/%(CombinedFiles.RecursiveDir)" /> - + @@ -105,22 +105,22 @@ @@ -129,22 +129,22 @@ - - - - - - - - + + + + @@ -177,7 +177,7 @@ - --no-restore --no-build --output $(PackagesOutDir) + --no-restore --no-build --output $(PackageOutputPath) $(PackArgs) $(MSBuildPassThroughPropertyList) /p:BaseOutputPath=$(IntermediateOutputForPackaging) diff --git a/src/installer/sharedFramework/sharedFramework.proj b/src/installer/sharedFramework/sharedFramework.proj index 36985af..a41f948 100644 --- a/src/installer/sharedFramework/sharedFramework.proj +++ b/src/installer/sharedFramework/sharedFramework.proj @@ -39,7 +39,7 @@ - @@ -151,7 +151,7 @@ -