From b58a0210e2e3e7551cd38d51be326b8dab0aee3a Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Tue, 21 Feb 2017 12:52:17 -0800 Subject: [PATCH 1/2] Refactor properties from LzmaCompile.targets --- build/BuildOutputs.props | 2 ++ build/OutputDirectories.props | 2 ++ build/compile/LzmaArchive.targets | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/BuildOutputs.props b/build/BuildOutputs.props index d332ec429..a5bc0d821 100644 --- a/build/BuildOutputs.props +++ b/build/BuildOutputs.props @@ -3,5 +3,7 @@ dotnet$(ExeExtension) $(DynamicLibPrefix)hostfxr$(DynamicLibExtension) $(DynamicLibPrefix)hostpolicy$(DynamicLibExtension) + $(ToolsOutputDirectory)/Archiver.dll + $(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props index 9be5c2c97..f88b247d9 100644 --- a/build/OutputDirectories.props +++ b/build/OutputDirectories.props @@ -18,5 +18,7 @@ $(BaseOutputDirectory)/packages $(IntermediateDirectory)/sharedFrameworkPublish $(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion) + $(IntermediateDirectory)/NuGetPackagesArchiveProject + $(IntermediateDirectory)/NuGetPackagesArchiveFolder diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index c90b117b6..784721ad2 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -115,11 +115,7 @@ nuGetPackagesArchive.$(NuGetPackagesArchiveVersion).lzma - $(IntermediateDirectory)/NuGetPackagesArchiveProject - $(IntermediateDirectory)/NuGetPackagesArchiveFolder - $(ToolsOutputDirectory)/Archiver.dll $(IntermediateDirectory)/$(NugetPackagesArchiveName) - $(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma $(Product)/NuGetPackagesArchives $(DotnetBlobRootUrl)/$(NugetPackagesArchiveRelativeBlobUrl)/$(NugetPackagesArchiveName) From 7b62dd1267fb8b9c2529bddfa4ef32593fd026c0 Mon Sep 17 00:00:00 2001 From: Justin Goshi Date: Wed, 22 Feb 2017 10:52:50 -0800 Subject: [PATCH 2/2] Address some of the PR comments --- build/BuildOutputs.props | 1 - build/compile/LzmaArchive.targets | 29 ++++++++++++++--------------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/build/BuildOutputs.props b/build/BuildOutputs.props index a5bc0d821..6410dcd89 100644 --- a/build/BuildOutputs.props +++ b/build/BuildOutputs.props @@ -3,7 +3,6 @@ dotnet$(ExeExtension) $(DynamicLibPrefix)hostfxr$(DynamicLibExtension) $(DynamicLibPrefix)hostpolicy$(DynamicLibExtension) - $(ToolsOutputDirectory)/Archiver.dll $(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets index 784721ad2..7b51073ee 100644 --- a/build/compile/LzmaArchive.targets +++ b/build/compile/LzmaArchive.targets @@ -1,5 +1,19 @@ + + + false + $(ToolsOutputDirectory)/Archiver.dll + + <configuration> + <packageSources> + <add key="configurable.source" value="%CLI_LZMA_PACKAGE_SOURCE%" /> + </packageSources> + </configuration> + + $(NuGetPackagesArchiveProject)/Nuget.config + + - - false - - - - - <configuration> - <packageSources> - <add key="configurable.source" value="%CLI_LZMA_PACKAGE_SOURCE%" /> - </packageSources> - </configuration> - - $(NuGetPackagesArchiveProject)/Nuget.config - -