From e894d7e60ef00b3b0cb40c85af8426bb4e6eec03 Mon Sep 17 00:00:00 2001
From: Justin Goshi <jgoshi@microsoft.com>
Date: Wed, 22 Feb 2017 16:54:15 -0800
Subject: [PATCH] Refactor publish.target

---
 Microsoft.DotNet.Cli.sln            |  2 ++
 build/AzureInfo.props               | 14 ++++++++
 build/InstallerInfo.props           | 10 ++++++
 build/Publish.targets               | 55 +++++++++++------------------
 build/compile/LzmaArchive.targets   |  3 +-
 build/package/Installer.DEB.targets |  6 ----
 build/package/Installer.MSI.targets |  3 --
 build/package/Installer.PKG.targets |  2 --
 dir.props                           | 22 ++++++------
 9 files changed, 58 insertions(+), 59 deletions(-)
 create mode 100644 build/AzureInfo.props
 create mode 100644 build/InstallerInfo.props

diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index e749dc055..e17169e87 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -24,6 +24,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestPackages", "TestPackage
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4-BC0F-443B-8ADF-691321F10108}"
 	ProjectSection(SolutionItems) = preProject
+		build\AzureInfo.props = build\AzureInfo.props
 		build\Branding.props = build\Branding.props
 		build\BranchInfo.props = build\BranchInfo.props
 		build\BuildDefaults.props = build\BuildDefaults.props
@@ -43,6 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\InitRepo.props = build\InitRepo.props
 		build\InitRepo.targets = build\InitRepo.targets
 		build\InputDirectories.props = build\InputDirectories.props
+		build\InstallerInfo.props = build\InstallerInfo.props
 		build\OutputDirectories.props = build\OutputDirectories.props
 		build\Package.targets = build\Package.targets
 		build\Prepare.targets = build\Prepare.targets
diff --git a/build/AzureInfo.props b/build/AzureInfo.props
new file mode 100644
index 000000000..0e8cf5104
--- /dev/null
+++ b/build/AzureInfo.props
@@ -0,0 +1,14 @@
+<Project>
+  <PropertyGroup>
+    <Product>Sdk</Product>
+    <ArtifactContainerName>$(ARTIFACT_STORAGE_CONTAINER)</ArtifactContainerName>
+    <ArtifactContainerName Condition="'$(ArtifactContainerName)' == ''">dotnet</ArtifactContainerName>
+    <ArtifactCloudDropAccessToken>$(ARTIFACT_STORAGE_KEY)</ArtifactCloudDropAccessToken>
+    <ArtifactCloudDropAccountName>$(ARTIFACT_STORAGE_ACCOUNT)</ArtifactCloudDropAccountName>
+    <ArtifactCloudDropAccountName Condition="'$(ArtifactCloudDropAccountName)' == ''">dotnetcli</ArtifactCloudDropAccountName>
+    <DotnetBlobRootUrl>https://$(ArtifactCloudDropAccountName).blob.core.windows.net/$(ArtifactContainerName)</DotnetBlobRootUrl>
+    <ChecksumContainerName>$(CHECKSUM_STORAGE_CONTAINER)</ChecksumContainerName>
+    <ChecksumCloudDropAccessToken>$(CHECKSUM_STORAGE_KEY)</ChecksumCloudDropAccessToken>
+    <ChecksumCloudDropAccountName>$(CHECKSUM_STORAGE_ACCOUNT)</ChecksumCloudDropAccountName>
+  </PropertyGroup>
+</Project>
diff --git a/build/InstallerInfo.props b/build/InstallerInfo.props
new file mode 100644
index 000000000..86f658fb9
--- /dev/null
+++ b/build/InstallerInfo.props
@@ -0,0 +1,10 @@
+<Project>
+  <PropertyGroup>
+    <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
+    <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
+    <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
+
+    <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
+    <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
+  </PropertyGroup>
+</Project>
diff --git a/build/Publish.targets b/build/Publish.targets
index 72811e068..cee075735 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -5,6 +5,25 @@
   <Import Project="$(MSBuildThisFileDirectory)/publish/Badge.targets" />
   <Import Project="$(MSBuildThisFileDirectory)/publish/Checksum.targets" />
 
+  <ItemGroup>
+    <SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl>
+    <DebianUploadJsonFile>$(SdkDebianIntermediateDirectory)/package_upload.json</DebianUploadJsonFile>
+    <DebianRevisionNumber>1</DebianRevisionNumber>
+
+    <DebianUploadJsonContent>
+      {
+      "name":"$(SdkDebianPackageName)",
+      "version":"$(NugetVersion)-$(DebianRevisionNumber)",
+      "repositoryId":"$(REPO_ID)",
+      "sourceUrl": "$(SdkDebianUploadUrl)"
+      }
+    </DebianUploadJsonContent>
+  </PropertyGroup>
+
   <!-- PUBLISH_TO_AZURE_BLOB env variable set by CI -->
   <Target Name="Publish"
           Condition=" '$(PUBLISH_TO_AZURE_BLOB)' != '' "
@@ -15,8 +34,7 @@
 
   <!-- UploadToAzure target comes from Build Tools -->
   <Target Name="PublishArtifacts"
-          DependsOnTargets="SetupAzureBlobInformation;
-                            GenerateVersionBadge;
+          DependsOnTargets="GenerateVersionBadge;
                             GatherItemsForPattern;
                             GenerateChecksums;
                             UploadArtifactsToAzure;
@@ -24,21 +42,6 @@
                             PublishDebFilesToDebianRepo;
                             PublishCliVersionBadge" />
 
-  <Target Name="SetupAzureBlobInformation">
-    <PropertyGroup>
-      <Product>Sdk</Product>
-      <ArtifactContainerName>$(ARTIFACT_STORAGE_CONTAINER)</ArtifactContainerName>
-      <ArtifactContainerName Condition="'$(ArtifactContainerName)' == ''">dotnet</ArtifactContainerName>
-      <ArtifactCloudDropAccessToken>$(ARTIFACT_STORAGE_KEY)</ArtifactCloudDropAccessToken>
-      <ArtifactCloudDropAccountName>$(ARTIFACT_STORAGE_ACCOUNT)</ArtifactCloudDropAccountName>
-      <ArtifactCloudDropAccountName Condition="'$(ArtifactCloudDropAccountName)' == ''">dotnetcli</ArtifactCloudDropAccountName>
-      <DotnetBlobRootUrl>https://$(ArtifactCloudDropAccountName).blob.core.windows.net/$(ArtifactContainerName)</DotnetBlobRootUrl>
-      <ChecksumContainerName>$(CHECKSUM_STORAGE_CONTAINER)</ChecksumContainerName>
-      <ChecksumCloudDropAccessToken>$(CHECKSUM_STORAGE_KEY)</ChecksumCloudDropAccessToken>
-      <ChecksumCloudDropAccountName>$(CHECKSUM_STORAGE_ACCOUNT)</ChecksumCloudDropAccountName>
-    </PropertyGroup>
-  </Target>
-
   <Target Name="GatherItemsForPattern">
     <ItemGroup>
       <ForPublishing Include="@(GeneratedInstallers)" />
@@ -59,24 +62,6 @@
     <Error Condition="'$(REPO_PASS)' == ''" Text="REPO_PASS must be set as an environment variable for debian publishing." />
     <Error Condition="'$(REPO_SERVER)' == ''" Text="REPO_SERVER must be set as an environment variable for debian publishing." />
 
-    <ItemGroup>
-      <SdkInstallerFileItemGroup Include="$(SdkInstallerFile)" />
-    </ItemGroup>
-    <PropertyGroup>
-      <SdkDebianUploadUrl>$(DotnetBlobRootUrl)/$(Product)/$(FullNugetVersion)/%(SdkInstallerFileItemGroup.Filename)%(SdkInstallerFileItemGroup.Extension)</SdkDebianUploadUrl>
-      <DebianUploadJsonFile>$(SdkDebianIntermediateDirectory)/package_upload.json</DebianUploadJsonFile>
-      <DebianRevisionNumber>1</DebianRevisionNumber>
-
-      <DebianUploadJsonContent>
-        {
-          "name":"$(SdkDebianPackageName)",
-          "version":"$(NugetVersion)-$(DebianRevisionNumber)",
-          "repositoryId":"$(REPO_ID)",
-          "sourceUrl": "$(SdkDebianUploadUrl)"
-        }
-      </DebianUploadJsonContent>
-    </PropertyGroup>
-
     <Delete Files="$(DebianUploadJsonFile)" />
     <WriteLinesToFile File="$(DebianUploadJsonFile)" Lines="$(DebianUploadJsonContent)" />
 
diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets
index 7b51073ee..a70316354 100644
--- a/build/compile/LzmaArchive.targets
+++ b/build/compile/LzmaArchive.targets
@@ -27,7 +27,6 @@
 
     <Target Name="UploadNuGetPackagesArchiveToAzure"
             DependsOnTargets="SetupNuGetPackagesArchiveInputsOutputs;
-                              SetupAzureBlobInformation;
                               GenerateNuGetPackagesArchive"
             Condition=" '$(UploadNuGetPackagesArchiveToAzure)' == 'true' And  '$(PUBLISH_LZMA_TO_AZURE_BLOB)' != '' ">
       <ItemGroup>
@@ -108,7 +107,7 @@
     </Target>
 
     <Target Name="SetupNuGetPackagesArchiveInputsOutputs"
-            DependsOnTargets="Prepare;SetupAzureBlobInformation">
+            DependsOnTargets="Prepare">
       <GenerateNuGetPackagesArchiveVersion ToolPath="$(Stage2Directory)">
         <Output TaskParameter="Version" PropertyName="NuGetPackagesArchiveVersion"/>
       </GenerateNuGetPackagesArchiveVersion>
diff --git a/build/package/Installer.DEB.targets b/build/package/Installer.DEB.targets
index ca94cf99f..af2f25e47 100644
--- a/build/package/Installer.DEB.targets
+++ b/build/package/Installer.DEB.targets
@@ -33,8 +33,6 @@
 
     <!-- Package Identities -->
     <PropertyGroup>
-      <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
-      <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
       <SharedFxDebianPackageVersion>$(SharedFrameworkVersion)</SharedFxDebianPackageVersion>
       <SharedFxDebianPackageName>dotnet-sharedframework-$(SharedFrameworkName)-$(SharedFxDebianPackageVersion)</SharedFxDebianPackageName>
       <SharedFxDebianPackageName>$(SharedFxDebianPackageName.ToLower())</SharedFxDebianPackageName>
@@ -65,10 +63,6 @@
 
     <!-- Output Directories -->
     <PropertyGroup>
-      <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
-      <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
-
-      <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
       <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)/deb-tool-output</DotNetDebToolOutputDirectory>
       <DebianTestResultsXmlFile>$(SdkDebianIntermediateDirectory)/debian-testResults.xml</DebianTestResultsXmlFile>
     </PropertyGroup>
diff --git a/build/package/Installer.MSI.targets b/build/package/Installer.MSI.targets
index 583e1f240..af6c5e29b 100644
--- a/build/package/Installer.MSI.targets
+++ b/build/package/Installer.MSI.targets
@@ -12,15 +12,12 @@
 
       <!-- Generate MSI/Bundle Properties -->
       <PropertyGroup>
-        <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
-
         <CombinedFrameworkSdkHostBundleEngineName>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)-engine.exe</CombinedFrameworkSdkHostBundleEngineName>
 
         <SdkGenerateMsiPowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatemsi.ps1</SdkGenerateMsiPowershellScript>
         <SdkGenerateBundlePowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatebundle.ps1</SdkGenerateBundlePowershellScript>
         <SdkGenerateNupkgPowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatenupkg.ps1</SdkGenerateNupkgPowershellScript>
 
-        <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
         <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
         <SdkInstallerNuspecFile>$(RepoRoot)/packaging/windows/clisdk/VS.Redist.Common.Net.Core.SDK.$(Architecture).nuspec</SdkInstallerNuspecFile>
         <SdkInstallerNupkgFile>$(InstallerOutputDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture).$(FullNugetVersion).nupkg</SdkInstallerNupkgFile>
diff --git a/build/package/Installer.PKG.targets b/build/package/Installer.PKG.targets
index 22416f080..96873d6c6 100644
--- a/build/package/Installer.PKG.targets
+++ b/build/package/Installer.PKG.targets
@@ -2,10 +2,8 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <Target Name="SetupPkgInputsOutputs">
       <PropertyGroup>
-        <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
         <PkgIntermediateDirectory>$(IntermediateDirectory)/pkgs/$(SdkVersion)</PkgIntermediateDirectory>
 
-        <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
         <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
 
         <!-- Properties for pkg build -->
diff --git a/dir.props b/dir.props
index 82eb03eb2..df1b68ae1 100644
--- a/dir.props
+++ b/dir.props
@@ -2,6 +2,15 @@
 
   <PropertyGroup>
     <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+
+    <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
+    <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
+
+    <CLIBuildDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll</CLIBuildDll>
+
+    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+
+    <CliTargetFramework>netcoreapp2.0</CliTargetFramework>
   </PropertyGroup>
 
   <Import Project="build/InitRepo.props" />
@@ -23,17 +32,8 @@
   <Import Project="build/Stage0.props" />
   <Import Project="build/VersionBadge.props" />
   <Import Project="build/BundledRuntimes.props" />
-  
-  <PropertyGroup>
-    <NuGetPackagesDir>$(NUGET_PACKAGES)</NuGetPackagesDir>
-    <NuGetPackagesDir Condition=" '$(NuGetPackagesDir)' == '' ">$(RepoRoot)/.nuget/packages</NuGetPackagesDir>
-
-    <CLIBuildDll>$(RepoRoot)/build_projects/dotnet-cli-build/bin/dotnet-cli-build.dll</CLIBuildDll>
-
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
-
-    <CliTargetFramework>netcoreapp2.0</CliTargetFramework>
-  </PropertyGroup>
 
+  <Import Project="build/AzureInfo.props" />
   <Import Project="build/CrossgenInfo.props" />
+  <Import Project="build/InstallerInfo.props" />
 </Project>