Merge pull request #5820 from dotnet/dev/jgoshi/refactorPackage

Refactor props in package directory

build/InstallerInfo.props

@@ -2,5 +2,19 @@
   <PropertyGroup>
     <InstallerOutputDirectory>$(PackagesDirectory)</InstallerOutputDirectory>
     <SdkInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk)$(InstallerExtension)</SdkInstallerFile>
+    <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
+
+    <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
+    <LayoutDirectory Condition=" '$(OSName)' == 'ubuntu' ">$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
+    <LayoutDirectory Condition=" '$(OSName)' != 'ubuntu' ">$(IntermediateDirectory)/layouts</LayoutDirectory>
+    <SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
   </PropertyGroup>
+
+  <!-- Consumed By Publish -->
+  <ItemGroup>
+    <GeneratedInstallers Condition=" '$(OSName)' == 'ubuntu' "
+                         Include="$(SdkInstallerFile)" />
+    <GeneratedInstallers Condition=" '$(OSName)' != 'ubuntu' "
+                         Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
+  </ItemGroup>
 </Project>

build/package/Archive.targets

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <ArchiveOutputDirectory>$(PackagesDirectory)</ArchiveOutputDirectory>
+  </PropertyGroup>
+
   <Target Name="GenerateArchives"
           DependsOnTargets="Init;
                             Layout;
@@ -32,10 +36,6 @@
 
   <Target Name="SetupGenerateArchivesInputsOutputs"
           DependsOnTargets="Init">
-    <PropertyGroup>
-      <ArchiveOutputDirectory>$(PackagesDirectory)</ArchiveOutputDirectory>
-    </PropertyGroup>
-
     <ItemGroup>
       <GenerateArchivesInputsOutputs Include="%(LayoutDefinition.Name)">
         <Inputs>%(LayoutDefinition.OutputFiles)</Inputs>

build/package/Installer.DEB.targets

@@ -3,11 +3,8 @@
   <PropertyGroup>
     <SdkDebianPackageVersion>$(SdkVersion)</SdkDebianPackageVersion>
     <SdkDebianPackageName>dotnet-dev-$(SdkDebianPackageVersion)</SdkDebianPackageName>
-      <SdkDebianIntermediateDirectory>$(IntermediateDirectory)/debian/sdk</SdkDebianIntermediateDirectory>
   </PropertyGroup>
 
-    <Target Name="SetupDebProps"
-          DependsOnTargets="Init">
   <!-- dotnet deb-tool -->
   <PropertyGroup>
     <DotnetDebToolPackageId>dotnet-deb-tool</DotnetDebToolPackageId>
@@ -17,15 +14,6 @@
     <DotnetDebToolPackageSource Condition=" '$(DotnetDebToolPackageSource)' == '' "></DotnetDebToolPackageSource>
   </PropertyGroup>
 
-    <ItemGroup>
-      <DotnetDebToolProjectJsonLines Include="{" />
-      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;version&quot;: &quot;1.0.0-*&quot;," />
-      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;name&quot;: &quot;$(DotnetDebToolConsumerProjectName)&quot;," />
-      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;frameworks&quot;: { &quot;netcoreapp1.0&quot;: {}, &quot;netcoreapp1.1&quot;: {} }," />
-      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;tools&quot;: {&quot;$(DotnetDebToolPackageId)&quot;: &quot;$(DotnetDebToolVersion)&quot; }" />
-      <DotnetDebToolProjectJsonLines Include="}" />
-    </ItemGroup>
-
   <!-- constants -->
   <PropertyGroup>
     <DebianInstalledDirectory>/usr/share/dotnet</DebianInstalledDirectory>
@@ -62,11 +50,6 @@
     <CLISdkRoot>$(Stage2Directory)/sdk</CLISdkRoot>
   </PropertyGroup>
 
-    <ItemGroup>
-      <CLISdkFiles Include="$(CLISdkRoot)/**/*" />
-      <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
-    </ItemGroup>
-
   <!-- Output Directories -->
   <PropertyGroup>
     <DotNetDebToolOutputDirectory>$(SdkDebianIntermediateDirectory)/deb-tool-output</DotNetDebToolOutputDirectory>
@@ -75,7 +58,6 @@
 
   <!-- Layout Directories -->
   <PropertyGroup>
-      <LayoutDirectory>$(SdkDebianIntermediateDirectory)/debianLayoutDirectory</LayoutDirectory>
     <LayoutPackageRootDir>$(LayoutDirectory)/$(LayoutPackageRootDirName)</LayoutPackageRootDir>
     <LayoutAbsolutePlacementDir>$(LayoutDirectory)/$(LayoutAbsolutePlacementDirName)</LayoutAbsolutePlacementDir>
     <LayoutSamplesDir>$(LayoutDirectory)/$(LayoutSamplesDirName)</LayoutSamplesDir>
@@ -89,6 +71,22 @@
     <DebianConfigJsonFile>$(LayoutDirectory)/debian_config.json</DebianConfigJsonFile>
   </PropertyGroup>
 
+  <Target Name="SetupDebProps"
+          DependsOnTargets="Init">
+    <ItemGroup>
+      <DotnetDebToolProjectJsonLines Include="{" />
+      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;version&quot;: &quot;1.0.0-*&quot;," />
+      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;name&quot;: &quot;$(DotnetDebToolConsumerProjectName)&quot;," />
+      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;frameworks&quot;: { &quot;netcoreapp1.0&quot;: {}, &quot;netcoreapp1.1&quot;: {} }," />
+      <DotnetDebToolProjectJsonLines Include="%20%20%20%20&quot;tools&quot;: {&quot;$(DotnetDebToolPackageId)&quot;: &quot;$(DotnetDebToolVersion)&quot; }" />
+      <DotnetDebToolProjectJsonLines Include="}" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <CLISdkFiles Include="$(CLISdkRoot)/**/*" />
+      <SdkDebManPageFiles Include="$(ManpagesDirectory)/**/*" />
+    </ItemGroup>
+
     <ItemGroup>
       <DebianConfigTokenValues Include="%SHARED_FRAMEWORK_DEBIAN_PACKAGE_NAME%">
         <ReplacementString>$(SharedFxDebianPackageName)</ReplacementString>
@@ -106,9 +104,6 @@
 
     <ItemGroup>
       <TestSdkDebTaskEnvironmentVariables Include="PATH=$(DebianInstalledDirectory)$(PathListSeparator)$(PATH)" />
-
-      <!-- Consumed By Publish -->
-      <GeneratedInstallers Include="$(SdkInstallerFile)" />
     </ItemGroup>
   </Target>
 </Project>

build/package/Installer.MSI.targets

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="MsiTargetsSetupInputOutputs" DependsOnTargets="Init">
     <!-- AcquireWix Properties -->
     <PropertyGroup>
       <WixVersion>3.10.2</WixVersion>
@@ -18,22 +17,23 @@
       <SdkGenerateBundlePowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatebundle.ps1</SdkGenerateBundlePowershellScript>
       <SdkGenerateNupkgPowershellScript>$(RepoRoot)/packaging/windows/clisdk/generatenupkg.ps1</SdkGenerateNupkgPowershellScript>
 
-        <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>
     </PropertyGroup>
 
+    <!-- Test Sdk MSI Properties -->
+    <PropertyGroup>
+      <SdkTestMsiPowershellScript>$(RepoRoot)/test/Installer/testmsi.ps1</SdkTestMsiPowershellScript>
+      <SdkMsiTestedSentinel>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk).MsiTested.sentinel</SdkMsiTestedSentinel>
+    </PropertyGroup>
+
+    <Target Name="MsiTargetsSetupInputOutputs" DependsOnTargets="Init">
       <!-- Generate SDK MSI Inputs -->
       <ItemGroup>
         <GenerateSdkMsiInputs Include="$(SdkLayoutOutputDirectory)/**/*;
                                        $(SdkGenerateMsiPowershellScript)" />
       </ItemGroup>
 
-      <!-- Consumed By Publish -->
-      <ItemGroup>
-        <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
-      </ItemGroup>
-
       <GenerateMsiVersion CommitCount="$(CommitCount)"
                           VersionMajor="$(VersionMajor)"
                           VersionMinor="$(VersionMinor)"
@@ -51,12 +51,6 @@
         <Output TaskParameter="OutputGuid"
             PropertyName="CombinedFrameworkSDKHostInstallerUpgradeCode" />
       </GenerateGuidFromName>
-
-      <!-- Test Sdk MSI Properties -->
-      <PropertyGroup>
-        <SdkTestMsiPowershellScript>$(RepoRoot)/test/Installer/testmsi.ps1</SdkTestMsiPowershellScript>
-        <SdkMsiTestedSentinel>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionSdk).MsiTested.sentinel</SdkMsiTestedSentinel>
-      </PropertyGroup>
     </Target>
 
     <Target Name="AcquireWix"

build/package/Installer.PKG.targets

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="SetupPkgInputsOutputs">
   <PropertyGroup>
     <PkgIntermediateDirectory>$(IntermediateDirectory)/pkgs/$(SdkVersion)</PkgIntermediateDirectory>
 
-        <CombinedFrameworkSdkHostInstallerFile>$(InstallerOutputDirectory)/$(ArtifactNameWithVersionCombinedHostHostFxrFrameworkSdk)$(BundleExtension)</CombinedFrameworkSdkHostInstallerFile>
-
     <!-- Properties for pkg build -->
     <SharedHostComponentId>com.microsoft.dotnet.sharedhost.$(SharedHostVersion).component.osx.x64</SharedHostComponentId>
     <HostFxrComponentId>com.microsoft.dotnet.hostfxr.$(HostFxrVersion).component.osx.x64</HostFxrComponentId>
@@ -36,6 +33,7 @@
     <AdditionalHostFxrPkgIntermediatePath>$(PkgIntermediateDirectory)/$(AdditionalHostFxrComponentId).pkg</AdditionalHostFxrPkgIntermediatePath>
   </PropertyGroup>
   
+    <Target Name="SetupPkgInputsOutputs">
       <ItemGroup>
         <DistributionTemplateReplacement Include="{SharedFxComponentId}">
           <ReplacementString>$(SharedFrameworkComponentId)</ReplacementString>
@@ -84,11 +82,6 @@
         </DistributionTemplateReplacement>
       </ItemGroup>
 
-      <!-- Consumed By Publish -->
-      <ItemGroup>
-        <GeneratedInstallers Include="$(SdkInstallerFile);$(CombinedFrameworkSdkHostInstallerFile)" />
-      </ItemGroup>
-
       <ItemGroup>
         <GenerateSdkPkgInputs Include="$(SdkLayoutOutputDirectory)/**/*" />
         <GenerateSdkPkgInputs Include="$(SdkPkgScriptsDirectory)/**/*" />

build/package/Layout.targets

@@ -1,15 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
   <PropertyGroup>
-      <LayoutDirectory>$(IntermediateDirectory)/layouts</LayoutDirectory>
-
-      <SdkLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdk)</SdkLayoutOutputDirectory>
     <SdkDebugLayoutOutputDirectory>$(LayoutDirectory)/$(ArtifactNameSdkDebug)</SdkDebugLayoutOutputDirectory>
     <CombinedHostHostFxrFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedHostHostFxrFrameworkSdk)</CombinedHostHostFxrFrameworkSdkOutputDirectory>
     <CombinedFrameworkSdkOutputDirectory>$(LayoutDirectory)/$(ArtifactNameCombinedFrameworkSdk)</CombinedFrameworkSdkOutputDirectory>
   </PropertyGroup>
 
+  <Target DependsOnTargets="Init" Name="SetupLayoutInputsOutputs" >
     <!-- Set up Items with Layout Input Files -->
     <ItemGroup>
       <SdkLayoutInput Include="$(OutputDirectory)/sdk/**/*" />

build/package/Nupkg.targets

@@ -1,16 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Layout" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-  <Target Name="SetupProjectsToPack"
-          DependsOnTargets="Init">
   <PropertyGroup>
-      <ProjectsSrcDirectory>$(RepoRoot)/src</ProjectsSrcDirectory>
     <PackagingBuildBasePath>$(Stage2CompilationDirectory)/forPackaging</PackagingBuildBasePath>
     <NupkgOutputDirectory>$(PackagesDirectory)</NupkgOutputDirectory>
   </PropertyGroup>
 
+  <Target Name="SetupProjectsToPack"
+          DependsOnTargets="Init">
     <ItemGroup>
-      <ProjectsToPack Include="$(ProjectsSrcDirectory)/Microsoft.DotNet.Cli.Utils" >
+      <ProjectsToPack Include="$(SrcDirectory)/Microsoft.DotNet.Cli.Utils" >
         <ProjectName>Microsoft.DotNet.Cli.Utils</ProjectName>
         <Version>$(SdkNugetVersion)</Version>
       </ProjectsToPack>