Prepare Core-Setup for repo consolidation (dotnet/core-setup#8709)

Prepare Core-Setup for repo consolidation (dotnet/core-setup#8709)

Commit migrated from https://github.com/dotnet/core-setup/commit/fd3b3421d7b901aaac28ad34e63b6480f88973d3

eng/pipelines/installer/azure-pipelines.yml

@@ -57,7 +57,7 @@ stages:
 - stage: Build
   jobs:
   # -------- Build Bash legs (Linux and FreeBSD) --------
-  - template: /eng/jobs/bash-build.yml
+  - template: /eng/pipelines/jobs/bash-build.yml
     parameters:
       crossBuild: true
       name: Linux_Arm
@@ -67,7 +67,7 @@ stages:
       skipTests: true
       targetArchitecture: arm
 
-  - template: /eng/jobs/bash-build.yml
+  - template: /eng/pipelines/jobs/bash-build.yml
     parameters:
       crossBuild: true
       name: Linux_Arm64
@@ -79,7 +79,7 @@ stages:
 
   # # Tizen build only for PR build
   # - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
-  #   - template: /eng/jobs/bash-build.yml
+  #   - template: /eng/pipelines/jobs/bash-build.yml
   #     parameters:
   #       additionalMSBuildArgs: /p:OverridePackageSource=https:%2F%2Ftizen.myget.org/F/dotnet-core/api/v3/index.json /p:OutputRid=tizen.5.0.0-armel
   #       additionalRunArgs: -e ROOTFS_DIR=/crossrootfs/armel.tizen.build
@@ -91,7 +91,7 @@ stages:
   #       skipTests: true
   #       targetArchitecture: armel
 
-  - template: /eng/jobs/bash-build.yml
+  - template: /eng/pipelines/jobs/bash-build.yml
     parameters:
       additionalMSBuildArgs: /p:OutputRid=linux-musl-arm64
       crossBuild: true
@@ -102,7 +102,7 @@ stages:
       skipTests: true
       targetArchitecture: arm64
 
-  - template: /eng/jobs/bash-build.yml
+  - template: /eng/pipelines/jobs/bash-build.yml
     parameters:
       additionalMSBuildArgs: /p:OutputRid=linux-musl-x64
       name: Linux_x64_Alpine39
@@ -110,7 +110,7 @@ stages:
       portableBuild: false
       targetArchitecture: x64
 
-  - template: /eng/jobs/bash-build.yml
+  - template: /eng/pipelines/jobs/bash-build.yml
     parameters:
       name: Linux_x64_glibc
       dockerImage: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-50f0d02-20190918214028
@@ -129,7 +129,7 @@ stages:
       portableBuild: true
       targetArchitecture: x64
 
-  - template: /eng/jobs/bash-build.yml
+  - template: /eng/pipelines/jobs/bash-build.yml
     parameters:
       additionalMSBuildArgs: /p:OutputRid=rhel.6-x64
       name: Linux_x64_Rhel6
@@ -138,34 +138,34 @@ stages:
       targetArchitecture: x64
 
   # -------- Build OSX (macOS) leg --------
-  - template: /eng/jobs/osx-build.yml
+  - template: /eng/pipelines/jobs/osx-build.yml
     parameters:
       name: OSX
 
   # -------- Build Windows legs --------
   # Windows Arm
-  - template: /eng/jobs/windows-build.yml
+  - template: /eng/pipelines/jobs/windows-build.yml
     parameters:
       name: Windows_Arm
       skipTests: true
       targetArchitecture: arm
 
   # Windows Arm64
-  - template: /eng/jobs/windows-build.yml
+  - template: /eng/pipelines/jobs/windows-build.yml
     parameters:
       name: Windows_Arm64
       skipTests: true
       targetArchitecture: arm64
 
   # Windows x64
-  - template: /eng/jobs/windows-build.yml
+  - template: /eng/pipelines/jobs/windows-build.yml
     parameters:
       name: Windows_x64
       publishRidAgnosticPackages: true
       targetArchitecture: x64
 
   # Windows x86
-  - template: /eng/jobs/windows-build.yml
+  - template: /eng/pipelines/jobs/windows-build.yml
     parameters:
       name: Windows_x86
       targetArchitecture: x86
@@ -176,7 +176,7 @@ stages:
     dependsOn: Build
     jobs:
     # Prep artifacts: sign them and upload pipeline artifacts expected by stages-based publishing.
-    - template: /eng/jobs/prepare-signed-artifacts.yml
+    - template: /eng/pipelines/jobs/prepare-signed-artifacts.yml
       parameters:
         PublishRidAgnosticPackagesFromJobName: Windows_x64
     # Publish to Build Asset Registry in order to generate the ReleaseConfigs artifact.
@@ -188,7 +188,7 @@ stages:
           name: NetCoreInternal-Pool
           queue: buildpool.windows.10.amd64.vs2017
 
-  - template: /eng/stages/publish.yml
+  - template: /eng/pipelines/stages/publish.yml
     parameters:
       # Publish channel configuration. The publish template wraps Arcade publishing and adds some
       # extras that aren't implemented in Arcade yet.

eng/jobs/prepare-signed-artifacts.yml → eng/pipelines/installer/jobs/prepare-signed-artifacts.yml

@@ -36,7 +36,7 @@ jobs:
 
   - script: >-
       build.cmd -ci
-      -projects $(Build.SourcesDirectory)\publish\prepare-artifacts.proj
+      -projects $(Build.SourcesDirectory)\src\publish\prepare-artifacts.proj
       /p:Configuration=Release
       /p:PublishRidAgnosticPackagesFromJobName=${{ parameters.PublishRidAgnosticPackagesFromJobName }}
       /p:SignType=$(SignType)

eng/jobs/run-publish-project.yml → eng/pipelines/installer/jobs/run-publish-project.yml

@@ -129,7 +129,7 @@ jobs:
 
   - script: >-
       build.cmd -ci
-      -projects $(Build.SourcesDirectory)\publish\${{ parameters.projectName }}.proj
+      -projects $(Build.SourcesDirectory)\src\publish\${{ parameters.projectName }}.proj
       /p:Channel=${{ parameters.dependency.channel.storage }}
       /p:Configuration=Release
       $(_CommonPublishArgs)

eng/jobs/steps/build-linux-package.yml → eng/pipelines/installer/jobs/steps/build-linux-package.yml

@@ -13,7 +13,7 @@ steps:
       df -h
       $(DockerRunMSBuild) ${{ parameters.image }} $(MSBuildScript) \
         --ci \
-        /root/coresetup/tools-local/tasks/core-setup.tasks.csproj \
+        /root/coresetup/tools-local/tasks/installer.tasks/installer.tasks.csproj \
         /t:Restore /t:Build /t:CreateHostMachineInfoFile \
         $(CommonMSBuildArgs) \
         /bl:msbuild.${{ parameters.distroRid }}.traversaldependencies.binlog

eng/stages/publish.yml → eng/pipelines/installer/stages/publish.yml

@@ -11,7 +11,7 @@ stages:
     variables:
     - template: /eng/common/templates/post-build/common-variables.yml
     jobs:
-    - template: /eng/jobs/run-publish-project.yml
+    - template: /eng/pipelines/jobs/run-publish-project.yml
       parameters:
         projectName: publish-blobs
         dependency: ${{ dependency }}
@@ -40,7 +40,7 @@ stages:
     variables:
     - template: /eng/common/templates/post-build/common-variables.yml
     jobs:
-    - template: /eng/jobs/run-publish-project.yml
+    - template: /eng/pipelines/jobs/run-publish-project.yml
       parameters:
         projectName: publish-final
         dependency: ${{ dependency }}

src/installer/Directory.Build.targets

@@ -7,5 +7,219 @@
   -->
   <Import Project="packaging.stubs.targets" Condition="'$(MSBuildProjectExtension)' != '.pkgproj'" />
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets" />
+  <Import Project="..\..\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' == 'true'" />
+
+  <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(IsRuntimeRepository)' != 'true'" />
+
+  <Import Project="$(RepositoryEngineeringDir)DisableSourceControlManagement.targets" Condition="'$(EnableSourceLink)' == 'false'" />
+
+  <!-- Provide default targets which can be hooked onto or overridden as necessary -->
+  <Target Name="Pack" />
+
+  <UsingTask TaskName="GenerateGuidFromName" AssemblyFile="$(InstallerTasksAssemblyPath)" />
+  <UsingTask TaskName="GenerateMsiVersion" AssemblyFile="$(InstallerTasksAssemblyPath)" />
+  <UsingTask TaskName="GetTargetMachineInfo" AssemblyFile="$(InstallerTasksAssemblyPath)" />
+  <UsingTask TaskName="RegenerateReadmeTable" AssemblyFile="$(InstallerTasksAssemblyPath)" />
+
+  <PropertyGroup>
+    <!--
+      Define this here (not just in Versions.props) because the SDK resets it
+      unconditionally in Microsoft.NETCoreSdk.BundledVersions.props.
+    -->
+    <NETCoreAppMaximumVersion>$(MajorVersion).$(MinorVersion)</NETCoreAppMaximumVersion>
+  </PropertyGroup>
+
+  <!-- Common target to find all sfxproj. In a target to avoid evaluating for every project. -->
+  <Target Name="GetSharedFrameworkProjects">
+    <ItemGroup>
+      <SharedFrameworkProject Include="$(InstallerProjectRoot)pkg\projects\**\*.sfxproj" />
+    </ItemGroup>
+  </Target>
+
+  <!--
+    Arcade SDK versioning is defined by static properties in a targets file: work around this by
+    moving properties based on versioning into a target.
+  -->
+  <Target Name="GetProductVersions">
+    <PropertyGroup>
+      <IncludePreReleaseLabelInPackageVersion Condition="'$(DotNetFinalVersionKind)' != 'release'">true</IncludePreReleaseLabelInPackageVersion>
+      <IncludePreReleaseLabelInPackageVersion Condition="'$(SuppressFinalPackageVersion)' == 'true'">true</IncludePreReleaseLabelInPackageVersion>
+      <IncludePreReleaseLabelInPackageVersion Condition="'$(IsShipping)' != 'true'">true</IncludePreReleaseLabelInPackageVersion>
+
+      <IncludeBuildNumberInPackageVersion Condition="'$(StabilizePackageVersion)' != 'true'">true</IncludeBuildNumberInPackageVersion>
+      <IncludeBuildNumberInPackageVersion Condition="'$(SuppressFinalPackageVersion)' == 'true'">true</IncludeBuildNumberInPackageVersion>
+      <IncludeBuildNumberInPackageVersion Condition="'$(IsShipping)' != 'true'">true</IncludeBuildNumberInPackageVersion>
+
+      <ProductVersionSuffix Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">-$(VersionSuffix)</ProductVersionSuffix>
+      <ProductBandVersion Condition="'$(ProductBandVersion)' == ''">$(MajorVersion).$(MinorVersion)</ProductBandVersion>
+      <ProductionVersion Condition="'$(ProductionVersion)' == ''">$(ProductBandVersion).$(PatchVersion)</ProductionVersion>
+      <ProductVersion>$(ProductionVersion)$(ProductVersionSuffix)</ProductVersion>
+
+      <SharedFrameworkNugetVersion>$(ProductVersion)</SharedFrameworkNugetVersion>
+
+      <RuntimeDepsRpmVersion Condition="'$(RuntimeDepsRpmVersion)'==''">$(ProductVersion)</RuntimeDepsRpmVersion>
+      <RuntimeDepsDebVersion Condition="'$(RuntimeDepsDebVersion)'==''">$(ProductVersion)</RuntimeDepsDebVersion>
+
+      <NuGetVersion>$(SharedFrameworkNugetVersion)</NuGetVersion>
+
+      <!--
+        By default, we are always building the nuget packages for HostPolicy, HostFXR and
+        Dotnet/AppHost. Thus, the "UseShipped*" properties (below) are always set to false.
+
+        However, there are scenarios when some of these components will not change (e.g. during
+        servicing, we may only change HostPolicy but not HostFXR and Dotnet/AppHost). In such cases,
+        set the appropriate "UseShipped*" property below to true and the corresponding "*Version"
+        property to the desired version so that we use the last shipped version of the package.
+      -->
+
+      <!-- The host/apphost package versions are only updated whenever there is a change in the components -->
+      <UseShippedHostPackage>false</UseShippedHostPackage>
+      <HostVersion Condition="'$(UseShippedHostPackage)' != 'true'">$(ProductVersion)</HostVersion>
+      <HostVersion Condition="'$(UseShippedHostPackage)' == 'true'">2.0.0</HostVersion>
+
+      <!-- The AppHostVersion is used for all hosts that aren't dotnet.exe -->
+      <UseShippedAppHostPackage>false</UseShippedAppHostPackage>
+      <AppHostVersion Condition="'$(UseShippedAppHostPackage)' != 'true'">$(ProductVersion)</AppHostVersion>
+      <AppHostVersion Condition="'$(UseShippedAppHostPackage)' == 'true'">2.0.0</AppHostVersion>
+
+      <!--
+        The FXR Resolver package version is only updated whenever there is a change in it.
+        If there is ever a need to use a shipped version of the package, then set the property
+        below to true.
+      -->
+      <UseShippedHostResolverPackage>false</UseShippedHostResolverPackage>
+      <HostResolverVersion Condition="'$(UseShippedHostResolverPackage)' != 'true'">$(ProductVersion)</HostResolverVersion>
+      <HostResolverVersion Condition="'$(UseShippedHostResolverPackage)' == 'true'">2.0.0</HostResolverVersion>
+
+      <!--
+        Host Policy package version is only updated whenever there is a change in it.
+        If there is ever a need to use a shipped version of the package, then set the property
+        below to true.
+      -->
+      <UseShippedHostPolicyPackage>false</UseShippedHostPolicyPackage>
+      <HostPolicyVersion Condition="'$(UseShippedHostPolicyPackage)' != 'true'">$(ProductVersion)</HostPolicyVersion>
+      <HostPolicyVersion Condition="'$(UseShippedHostPolicyPackage)' == 'true'">2.0.0</HostPolicyVersion>
+
+      <BinariesRelativePath>Runtime/$(SharedFrameworkNugetVersion)/</BinariesRelativePath>
+      <InstallersRelativePath>Runtime/$(SharedFrameworkNugetVersion)/</InstallersRelativePath>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(OutputRid)' != ''">
+      <ProductMoniker>$(SharedFrameworkNugetVersion)-$(PackageTargetRid)</ProductMoniker>
+      <HostResolverVersionMoniker>$(HostResolverVersion)-$(PackageTargetRid)</HostResolverVersionMoniker>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <HostPackageVersion>$(HostVersion)</HostPackageVersion>
+      <HostPackageRelease>1</HostPackageRelease>
+      <HostResolverPackageVersion>$(HostResolverVersion)</HostResolverPackageVersion>
+      <HostResolverPackageRelease>1</HostResolverPackageRelease>
+      <RuntimePackageVersion>$(SharedFrameworkNugetVersion)</RuntimePackageVersion>
+      <RuntimePackageRelease>1</RuntimePackageRelease>
+      <RuntimeDepsDebPackageVersion>$(RuntimeDepsDebVersion)</RuntimeDepsDebPackageVersion>
+      <RuntimeDepsDebPackageRelease>1</RuntimeDepsDebPackageRelease>
+      <RuntimeDepsRpmPackageVersion>$(RuntimeDepsRpmVersion)</RuntimeDepsRpmPackageVersion>
+      <RuntimeDepsRpmPackageRelease>1</RuntimeDepsRpmPackageRelease>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(InstallerExtension)' == '.deb'">
+      <HostPackageVersion Condition="'$(UseShippedHostPackage)' != 'true'">$(ProductionVersion)</HostPackageVersion>
+      <HostPackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true' AND '$(VersionSuffix)' !=''">$(ProductionVersion)~$(VersionSuffix)</HostPackageVersion>
+
+      <HostResolverPackageVersion Condition="'$(UseShippedHostResolverPackage)' != 'true'">$(ProductionVersion)</HostResolverPackageVersion>
+      <HostResolverPackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true' AND '$(VersionSuffix)' !=''">$(ProductionVersion)~$(VersionSuffix)</HostResolverPackageVersion>
+
+      <RuntimePackageVersion>$(ProductionVersion)</RuntimePackageVersion>
+      <RuntimePackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">$(ProductionVersion)~$(VersionSuffix)</RuntimePackageVersion>
+
+      <RuntimeDepsDebPackageVersion>$(ProductionVersion)</RuntimeDepsDebPackageVersion>
+      <RuntimeDepsDebPackageVersion Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true' AND '$(VersionSuffix)' !=''">$(ProductionVersion)~$(VersionSuffix)</RuntimeDepsDebPackageVersion>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(InstallerExtension)' == '.rpm'">
+      <HostPackageVersion Condition="'$(UseShippedHostPackage)' != 'true'">$(ProductionVersion)</HostPackageVersion>
+      
+      <HostPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">0.1.$(VersionSuffix)</HostPackageRelease>
+      <HostPackageRelease>$([System.String]::Copy('$(HostPackageRelease)').Replace('-', '_'))</HostPackageRelease>
+      
+      <HostResolverPackageVersion Condition="'$(UseShippedHostResolverPackage)' != 'true'">$(ProductionVersion)</HostResolverPackageVersion>
+      
+      <HostResolverPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">0.1.$(VersionSuffix)</HostResolverPackageRelease>
+      <HostResolverPackageRelease>$([System.String]::Copy('$(HostResolverPackageRelease)').Replace('-', '_'))</HostResolverPackageRelease>
+
+      <RuntimePackageVersion>$(ProductionVersion)</RuntimePackageVersion>
+      <RuntimePackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">0.1.$(VersionSuffix)</RuntimePackageRelease>
+      <RuntimePackageRelease>$([System.String]::Copy('$(RuntimePackageRelease)').Replace('-', '_'))</RuntimePackageRelease>
+
+      <RuntimeDepsRpmPackageVersion>$(ProductionVersion)</RuntimeDepsRpmPackageVersion>
+      <RuntimeDepsRpmPackageRelease Condition="'$(IncludePreReleaseLabelInPackageVersion)' == 'true'">0.1.$(VersionSuffix)</RuntimeDepsRpmPackageRelease>
+      <RuntimeDepsRpmPackageRelease>$([System.String]::Copy('$(RuntimeDepsRpmPackageRelease)').Replace('-', '_'))</RuntimeDepsRpmPackageRelease>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="GetInstallerLocations"
+          DependsOnTargets="GetProductVersions">
+    <PropertyGroup>
+      <CombinedInstallerFile>$(CombinedInstallerStart)$(ProductMoniker)$(CombinedInstallerExtension)</CombinedInstallerFile>
+      <CombinedInstallerEngine>$(CombinedInstallerStart)$(ProductMoniker)-engine.exe</CombinedInstallerEngine>
+
+      <SharedHostInstallerFile>$(SharedHostInstallerStart)$(ProductMoniker)$(InstallerExtension)</SharedHostInstallerFile>
+      <HostFxrInstallerFile>$(HostFxrInstallerStart)$(HostResolverVersionMoniker)$(InstallerExtension)</HostFxrInstallerFile>
+      <SharedFrameworkInstallerFile>$(SharedFrameworkInstallerStart)$(ProductMoniker)$(InstallerExtension)</SharedFrameworkInstallerFile>
+      <DotnetRuntimeDependenciesPackageInstallerFile>$(DotnetRuntimeDependenciesPackageInstallerStart)$(ProductMoniker)$(InstallerExtension)</DotnetRuntimeDependenciesPackageInstallerFile>
+
+      <CombinedCompressedFile>dotnet-runtime-$(ProductMoniker)$(CompressedFileExtension)</CombinedCompressedFile>
+      <HostFxrCompressedFile>dotnet-hostfxr-internal-$(PackageTargetRid).$(HostResolverVersion)$(CompressedFileExtension)</HostFxrCompressedFile>
+      <NetHostCompressedFile>dotnet-nethost-$(AppHostVersion)-$(PackageTargetRid)$(CompressedFileExtension)</NetHostCompressedFile>
+      <SharedFrameworkCompressedFile>dotnet-runtime-internal-$(ProductMoniker)$(CompressedFileExtension)</SharedFrameworkCompressedFile>
+      <SharedFrameworkSymbolsCompressedFile>dotnet-runtime-symbols-$(ProductMoniker)$(CompressedFileExtension)</SharedFrameworkSymbolsCompressedFile>
+
+      <HostFxrDebPkgName>$(DotnetHostFxrString)$(ProductBandVersion)</HostFxrDebPkgName>
+      <HostFxrDebPkgName>$(HostFxrDebPkgName.ToLower())</HostFxrDebPkgName>
+      <SharedFxDebPkgName>$(DotnetRuntimeString)$(ProductBandVersion)</SharedFxDebPkgName>
+      <SharedFxDebPkgName>$(SharedFxDebPkgName.ToLower())</SharedFxDebPkgName>
+      <RuntimeDependenciesDebPkgName>$(DotnetRuntimeDependenciesPackageString)$(ProductBandVersion)</RuntimeDependenciesDebPkgName>
+      <RuntimeDependenciesDebPkgName>$(RuntimeDependenciesDebPkgName.ToLower())</RuntimeDependenciesDebPkgName>
+
+      <HostFxrRpmPkgName>dotnet-hostfxr-$(ProductBandVersion)</HostFxrRpmPkgName>
+      <HostFxrRpmPkgName>$(HostFxrRpmPkgName.ToLower())</HostFxrRpmPkgName>
+      <SharedFxRpmPkgName>dotnet-runtime-$(ProductBandVersion)</SharedFxRpmPkgName>
+      <SharedFxRpmPkgName>$(SharedFxRpmPkgName.ToLower())</SharedFxRpmPkgName>
+      <RuntimeDependenciesRpmPkgName>$(DotnetRuntimeDependenciesPackageString)$(ProductBandVersion)</RuntimeDependenciesRpmPkgName>
+      <RuntimeDependenciesRpmPkgName>$(RuntimeDependenciesRpmPkgName.ToLower())</RuntimeDependenciesRpmPkgName>
+    </PropertyGroup>
+
+    <PropertyGroup>
+      <TargetingPackInstallerFile>$(AssetOutputPath)dotnet-targeting-pack-$(ProductMoniker)$(InstallerExtension)</TargetingPackInstallerFile>
+      <AppHostPackInstallerFile>$(AssetOutputPath)dotnet-apphost-pack-$(ProductMoniker)$(InstallerExtension)</AppHostPackInstallerFile>
+      <NetStandardProductBandVersion>2.1</NetStandardProductBandVersion>
+      <NetStandardProductMoniker>$(NetStandardProductBandVersion).$(PatchVersion)$(ProductVersionSuffix)-$(PackageTargetRid)</NetStandardProductMoniker>
+      <NetStandardTargetingPackInstallerFile>$(AssetOutputPath)netstandard-targeting-pack-$(NetStandardProductMoniker)$(InstallerExtension)</NetStandardTargetingPackInstallerFile>
+    </PropertyGroup>
+
+    <!-- Runtime Deb and Rpm packages are distro version agnostic -->
+    <PropertyGroup Condition="'$(InstallerExtension)' == '.deb' or '$(InstallerExtension)' == '.rpm'">
+      <SharedHostInstallerFile>$(SharedHostInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension)</SharedHostInstallerFile>
+      <HostFxrInstallerFile>$(HostFxrInstallerStart)$(HostResolverVersion)-$(TargetArchitecture)$(InstallerExtension)</HostFxrInstallerFile>
+      <SharedFrameworkInstallerFile>$(SharedFrameworkInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension)</SharedFrameworkInstallerFile>
+    </PropertyGroup>
+
+    <!-- Runtime-deps Deb package is distro version agnostic. -->
+    <PropertyGroup Condition="'$(InstallerExtension)' == '.deb'">
+      <DotnetRuntimeDependenciesPackageInstallerFile>$(DotnetRuntimeDependenciesPackageInstallerStart)$(SharedFrameworkNugetVersion)-$(TargetArchitecture)$(InstallerExtension)</DotnetRuntimeDependenciesPackageInstallerFile>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="GetLatestCommitHash"
+          Condition="'$(LatestCommit)' == ''">
+    <!-- Get the latest commit hash -->
+    <Exec Command="git rev-parse HEAD 2>&amp;1" StandardOutputImportance="Low" IgnoreExitCode="true" IgnoreStandardErrorWarningFormat="true" ConsoleToMSBuild="true">
+      <Output TaskParameter="ConsoleOutput" PropertyName="LatestCommit" />
+      <Output TaskParameter="ExitCode" PropertyName="LatestCommitExitCode" />
+    </Exec>
+    <!-- We shouldn't fail the build if we can't retreive the commit hash, so in this case just set it to N/A -->
+    <PropertyGroup Condition="'$(LatestCommitExitCode)'!='0'">
+      <LatestCommit>N/A</LatestCommit>
+    </PropertyGroup>
+  </Target>
 </Project>

src/installer/Subsets.props

-<Project>
-
-  <!--
-    This file defines the list of projects to build and divides them into subsets. In ordinary
-    situations, you should perform a full build by running 'build.cmd' or './build.sh'. This ensures
-    the projects are sequenced correctly so the outputs and test results are what you would expect.
-
-    If you know you only want to run a subset of the build, however, use the Subset property.
-
-    Syntax:
-
-      (build.cmd/sh) /p:Subset=<desired subset name 1>(-<desired subset name N>)*
-
-      - For a description of each subset, use '/p:Subset=help'.
-      - Subset names are case insensitive.
-      - 'Subset' is case insensitive. (That is, '/p:subset' works.)
-      - Order doesn't affect the result.
-
-    Examples:
-
-      ./build.sh /p:Subset=CoreHost
-
-        This builds only the .NET Core Host.
-
-      ./build.sh /p:Subset=CoreHost-Managed
-
-        This builds the CoreHost and also the Managed (e.g. Microsoft.Extensions.DependencyModel)
-        projects. A '-' is the delimiter between multiple subsets to build.
-
-      ./build.sh -test /p:Subset=Test
-
-        This builds and executes the test projects. (The '-test' argument is an Arcade SDK argument
-        that indicates tests should be run. Otherwise, they'll only be built.)
-
-    Quirks:
-
-      This command looks useful, but doesn't work as expected:
-      
-        ./build.sh -test /p:Subset=CoreHost-Test    # (Doesn't work!)
-
-      Intuitively, this should build the host, build the tests, then run the tests on the freshly
-      built host. What actually happens is the tests run on a previously built host. This is because
-      the depproj, pkgproj, and installer subsets process the host artifacts, and those didn't
-      rebuild because those subsets were disabled.
-
-      You can get around this limitation by running the corehost subset, manually copying host
-      artifacts to the test layout, then running the test subset.
-  -->
-
-  <PropertyGroup>
-    <SubsetToLower>$(Subset.ToLowerInvariant())</SubsetToLower>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="CoreHost"
-      Description="The .NET Core Host projects. This includes all the native code in Core-Setup." />
-  </ItemGroup>
-  <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('corehost'))">
-    <CorehostProjectToBuild Include="$(RepoRoot)src\corehost\build.proj" SignPhase="Binaries" />
-    <ProjectToBuild Include="@(CorehostProjectToBuild)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="Managed"
-      Description="The managed .NET projects. This includes PlatformAbstractions, DependencyModel, and HostModel." />
-  </ItemGroup>
-  <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('managed'))">
-    <ManagedProjectToBuild Include="$(RepoRoot)src\managed\**\*.csproj" SignPhase="Binaries" />
-    <ManagedProjectToBuild Include="$(RepoRoot)src\pkg\packaging\pack-managed.proj" />
-    <ProjectToBuild Include="@(ManagedProjectToBuild)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="depproj"
-      Description="The dependency projects. These gather shared framework files and run crossgen on them to turn them into ready-to-run (R2R) assemblies for the current platform." />
-  </ItemGroup>
-  <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('depproj'))">
-    <DepprojProjectToBuild Include="$(RepoRoot)src\pkg\projects\**\*.depproj" SignPhase="Binaries" />
-    <ProjectToBuild Include="@(DepprojProjectToBuild)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="pkgproj"
-      Description="The packaging projects. These produce NETCoreApp assets: NuGet packages, installers, zips, and Linux packages." />
-  </ItemGroup>
-  <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('pkgproj'))">
-    <PkgprojProjectToBuild Include="$(RepoRoot)src\pkg\projects\**\*.pkgproj" SignPhase="MsiFiles" />
-    <ProjectToBuild Include="@(PkgprojProjectToBuild)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="sfxproj"
-      Description="The shared framework projects. These put together the NETCoreApp shared framework and its installers." />
-  </ItemGroup>
-  <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('sfxproj'))">
-    <SfxprojProjectToBuild Include="$(RepoRoot)src\pkg\projects\**\*.sfxproj" SignPhase="MsiFiles" />
-    <ProjectToBuild Include="@(SfxprojProjectToBuild)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="Bundle"
-      Description="The shared framework bundle installer projects. Produces .exe installers for Windows." />
-  </ItemGroup>
-  <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('bundle'))">
-    <BundleProjectToBuild Include="$(RepoRoot)src\pkg\projects\**\*.bundleproj" SignPhase="BundleInstallerFiles" />
-    <ProjectToBuild Include="@(BundleProjectToBuild)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="Installer"
-      Description="Generates additional installers. This produces the shared frameworks and their installers." />
-  </ItemGroup>
-  <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('installer'))">
-    <InstallerProjectToBuild Include="$(RepoRoot)src\pkg\packaging\installers.proj" />
-    <InstallerProjectToBuild Include="$(RepoRoot)src\pkg\packaging\vs-insertion-packages.proj" />
-    <ProjectToBuild Include="@(InstallerProjectToBuild)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="Test"
-      Description="The test projects. Note that building this doesn't execute tests: you must also pass the '-test' argument." />
-  </ItemGroup>
-  <ItemGroup Condition="'$(SubsetToLower)' == '' or $(SubsetToLower.Contains('test'))">
-    <TestProjectToBuild Include="$(RepoRoot)src\test\Microsoft.NET.HostModel.Tests\AppHost.Bundle.Tests\AppHost.Bundle.Tests.csproj" />
-    <TestProjectToBuild Include="$(RepoRoot)src\test\Microsoft.NET.HostModel.Tests\Microsoft.NET.HostModel.AppHost.Tests\Microsoft.NET.HostModel.AppHost.Tests.csproj" />
-    <TestProjectToBuild Include="$(RepoRoot)src\test\Microsoft.NET.HostModel.Tests\Microsoft.NET.HostModel.Bundle.Tests\Microsoft.NET.HostModel.Bundle.Tests.csproj" />
-    <TestProjectToBuild Include="$(RepoRoot)src\test\Microsoft.NET.HostModel.Tests\Microsoft.NET.HostModel.ComHost.Tests\Microsoft.NET.HostModel.ComHost.Tests.csproj" />
-    <TestProjectToBuild Include="$(RepoRoot)src\test\HostActivation.Tests\HostActivation.Tests.csproj" />
-    <TestProjectToBuild Include="$(RepoRoot)src\test\Microsoft.DotNet.CoreSetup.Packaging.Tests\Microsoft.DotNet.CoreSetup.Packaging.Tests.csproj" />
-    <TestProjectToBuild Include="$(RepoRoot)src\test\Microsoft.Extensions.DependencyModel.Tests\Microsoft.Extensions.DependencyModel.Tests.csproj" />
-    <ProjectToBuild Include="@(TestProjectToBuild)" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SubsetName
-      Include="RegenerateReadmeTable"
-      Description="Regenerates the table of asset links in the README.md file."
-      OnDemand="true"/>
-  </ItemGroup>
-  <ItemGroup Condition="$(SubsetToLower.Contains('regeneratereadmetable'))">
-    <ProjectToBuild Include="$(RepoRoot)tools-local\regenerate-readme-table.proj" />
-  </ItemGroup>
-
-</Project>

src/installer/corehost/build.sh

@@ -158,8 +158,6 @@ if [ "$RootRepo" == "" ]; then
     usage
 fi
 
-SetupRoot="$RootRepo/src/setup"
-
 __bin_dir="$RootRepo/artifacts/bin"
 __baseIntermediateOutputPath="$RootRepo/artifacts/obj"
 __versionSourceFile="$__baseIntermediateOutputPath/_version.c"
@@ -190,7 +188,7 @@ __cmake_defines="${__cmake_defines} ${__arch_define}"
 # Configure environment if we are doing a cross compile.
 if [ "$__CrossBuild" == 1 ]; then
     if ! [[ -n $ROOTFS_DIR ]]; then
-        export ROOTFS_DIR="$SetupRoot/cross/rootfs/$__build_arch"
+        export ROOTFS_DIR="$RootRepo/cross/rootfs/$__build_arch"
     fi
 fi
 

src/installer/pkg/Directory.Build.props

@@ -9,8 +9,8 @@
   <PropertyGroup>
     <PackageLicenseFile>$(RepoRoot)LICENSE.TXT</PackageLicenseFile>
     <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
-    <LicenseUrl>https://github.com/dotnet/core-setup/blob/master/LICENSE.TXT</LicenseUrl>
-    <PackageDescriptionFile>$(SetupRoot)src/pkg/projects/descriptions.json</PackageDescriptionFile>
+    <LicenseUrl Condition="'$(LicenseUrl)' == ''">https://github.com/dotnet/core-setup/blob/master/LICENSE.TXT</LicenseUrl>
+    <PackageDescriptionFile>$(InstallerProjectRoot)pkg/projects/descriptions.json</PackageDescriptionFile>
     <!-- This link should be updated for each release milestone, currently this points to 1.0.0 -->
     <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799417</ReleaseNotes>
     <ProjectUrl>https://dot.net</ProjectUrl>
@@ -32,9 +32,9 @@
       Intermediate dir the debtool project is copied to. Use DebtoolAssemblyFile for "dotnet
       deb-tool" commands, after depending on InitializeDotnetDebTool target.
     -->
-    <DebToolBinDir>$(BinDir)dotnet-deb-tool\</DebToolBinDir>
+    <DebToolBinDir>$(ArtifactsBinDir)dotnet-deb-tool\</DebToolBinDir>
     <DebtoolAssemblyFile>$(DebToolBinDir)$(Configuration)\netcoreapp3.0\dotnet-deb-tool.dll</DebtoolAssemblyFile>
-    <DotnetDebToolSourceDir>$(SetupRoot)tools-local/setuptools/dotnet-deb-tool/</DotnetDebToolSourceDir>
+    <DotnetDebToolSourceDir>$(RepoRoot)tools-local/dotnet-deb-tool/</DotnetDebToolSourceDir>
 
     <IsDebianBasedDistro
       Condition="

src/installer/pkg/Directory.Build.targets

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets" />
 
   <PropertyGroup>
-    <RuntimeIdGraphDefinitionFile>$(PackagesDir)$(PlatformPackageId.ToLowerInvariant())\$(MicrosoftNETCorePlatformsPackageVersion)\runtime.json</RuntimeIdGraphDefinitionFile>
+    <RuntimeIdGraphDefinitionFile>$(NuGetPackageRoot)$(PlatformPackageId.ToLowerInvariant())\$(MicrosoftNETCorePlatformsPackageVersion)\runtime.json</RuntimeIdGraphDefinitionFile>
   </PropertyGroup>
 
   <!--
@@ -99,7 +99,7 @@
              Importance="High" />
   </Target>
 
-  <UsingTask TaskName="GenerateCurrentVersion" AssemblyFile="$(LocalBuildToolsTaskFile)" />
+  <UsingTask TaskName="GenerateCurrentVersion" AssemblyFile="$(InstallerTasksAssemblyPath)" />
 
   <Target Name="GenerateMsiVersionString">
     <PropertyGroup>

src/installer/pkg/packaging/Directory.Build.props

@@ -2,7 +2,7 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <PackagingRoot>$(SetupRoot)src/pkg/packaging/</PackagingRoot>
+    <PackagingRoot>$(InstallerProjectRoot)pkg/packaging/</PackagingRoot>
 
     <!-- The runtime package is distro-independent. (Runtime-deps packages vary per distro.) -->
     <BuildRuntimeDebs>$(BuildDistroIndependentInstallers)</BuildRuntimeDebs>

src/installer/pkg/packaging/deb/package.targets

@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project='package.props' />
 
-  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(LocalBuildToolsTaskFile)"/>
+  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
 
   <PropertyGroup>
     <DebianConfigJsonName>debian_config.json</DebianConfigJsonName>
@@ -32,7 +32,7 @@
       <DebPackageVersion>$(HostPackageVersion)</DebPackageVersion>
       <InputRoot>$(SharedHostPublishRoot)</InputRoot>
       <DebFile>$(SharedHostInstallerFile)</DebFile>
-      <ManPagesDir>$(SetupRoot)Documentation/manpages</ManPagesDir>
+      <ManPagesDir>$(RepoRoot)Documentation/manpages</ManPagesDir>
       <ConfigJsonName>dotnet-sharedhost-debian_config.json</ConfigJsonName>
       <ConfigJsonFile>$(debPackaginfConfigPath)$(ConfigJsonName)</ConfigJsonFile>
       <debIntermediatesDir>$(PackagesIntermediateDir)$(DebPackageName)/$(DebPackageVersion)</debIntermediatesDir>

src/installer/pkg/packaging/installers.proj

@@ -68,8 +68,8 @@
 
   <Target Name="GenerateProjectInstallers" Condition="'$(GenerateProjectInstallers)' == 'true'">
     <ItemGroup>
-      <InstallerProject Include="$(SourceDir)pkg\projects\**\*.pkgproj" />
-      <InstallerProject Include="$(SourceDir)pkg\projects\**\*.sfxproj" />
+      <InstallerProject Include="$(InstallerProjectRoot)pkg\projects\**\*.pkgproj" />
+      <InstallerProject Include="$(InstallerProjectRoot)pkg\projects\**\*.sfxproj" />
     </ItemGroup>
 
     <MSBuild Projects="@(InstallerProject)" Targets="GenerateInstallers" />
@@ -96,7 +96,7 @@
           DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
           Condition="'$(TargetsUnix)' == 'true'"/>
 
-    <Copy SourceFiles="$(SetupRoot)resources/LICENSE-MSFT.txt"
+    <Copy SourceFiles="$(InstallerProjectRoot)pkg\LICENSE-MSFT.TXT"
           DestinationFiles="$(SharedHostPublishRoot)LICENSE.txt"
           Condition="'$(TargetsUnix)' != 'true'"/>
 
@@ -116,7 +116,7 @@
 
     <!-- Copy nethost -->
     <PropertyGroup>
-      <_NetHostOutputDir>$(BinDir)$(InstallerSourceOSPlatformConfig)\corehost\</_NetHostOutputDir>
+      <_NetHostOutputDir>$(ArtifactsBinDir)$(InstallerSourceOSPlatformConfig)\corehost\</_NetHostOutputDir>
     </PropertyGroup>
     <ItemGroup>
       <NetHostFiles Include="$(_NetHostOutputDir)nethost.h" />
@@ -157,7 +157,7 @@
 
   <Target Name="GenerateVersionBadge">
     <PropertyGroup>
-      <templateSvg>$(SetupRoot)resources/images/version_badge.svg</templateSvg>
+      <templateSvg>$(MSBuildThisFileDirectory)version_badge.svg</templateSvg>
     </PropertyGroup>
 
     <MakeDir  Condition="!Exists('$(BaseOutputRootPath)')" Directories="$(BaseOutputRootPath)" />
@@ -177,7 +177,7 @@
             GenerateTarBall"
           Condition="'$(UsePrebuiltPortableBinariesForInstallers)' != 'true'"/>
 
-  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(LocalBuildToolsTaskFile)"/>
+  <UsingTask TaskName="ZipFileCreateFromDirectory" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
   <Target Name="GenerateZip"
           Condition="'$(OSGroup)'=='Windows_NT'">
 

src/installer/pkg/packaging/osx/package.targets

@@ -2,7 +2,7 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project='package.props' />
     
-  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(LocalBuildToolsTaskFile)"/>
+  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
 
   <Target Name="InitPkg"
           Condition="'$(OSGroup)' == 'OSX'">

src/installer/pkg/packaging/pack-managed.proj

@@ -15,7 +15,7 @@
     <MSBuild Projects="$(SigningToolsDir)\SignBinaries.proj" Targets="Build" />
 
     <ItemGroup>
-      <ManagedProject Include="$(SetupRoot)src\managed\**\*.csproj" />
+      <ManagedProject Include="$(InstallerProjectRoot)managed\**\*.csproj" />
     </ItemGroup>
 
     <MSBuild Projects="@(ManagedProject)" Targets="Pack" />

src/installer/pkg/packaging/rpm/package.targets

@@ -2,8 +2,8 @@
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 <Import Project='package.props' />
 
-  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(LocalBuildToolsTaskFile)"/>
-  <UsingTask TaskName="BuildFPMToolPreReqs" AssemblyFile="$(LocalBuildToolsTaskFile)"/>
+  <UsingTask TaskName="ReplaceFileContents" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
+  <UsingTask TaskName="BuildFPMToolPreReqs" AssemblyFile="$(InstallerTasksAssemblyPath)"/>
 
   <Target Name="GenerateRpms"
           DependsOnTargets="TestFPMTool;BuildRpms;"
@@ -27,7 +27,7 @@
       <RpmPackageVersion>$(HostPackageVersion)</RpmPackageVersion>
       <InputRoot>$(SharedHostPublishRoot)</InputRoot>
       <RpmFile>$(SharedHostInstallerFile)</RpmFile>
-      <ManPagesDir>$(SetupRoot)Documentation/manpages</ManPagesDir>
+      <ManPagesDir>$(RepoRoot)Documentation/manpages</ManPagesDir>
       <ConfigJsonName>dotnet-sharedhost-rpm_config.json</ConfigJsonName>
       <ConfigJsonFile>$(rpmPackagingConfigPath)$(ConfigJsonName)</ConfigJsonFile>
       <RpmIntermediatesDir>$(PackagesIntermediateDir)$(RpmPackageName)/$(RpmPackageVersion)</RpmIntermediatesDir>

src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.pkgproj

@@ -29,11 +29,11 @@
     <Copy SourceFiles="$(RepoRoot)THIRD-PARTY-NOTICES.TXT"
           DestinationFiles="$(PublishRootDir)ThirdPartyNotices.txt" />
 
-    <Copy SourceFiles="$(RepoRoot)LICENSE"
+    <Copy SourceFiles="$(RepoRoot)LICENSE.TXT"
           DestinationFiles="$(PublishRootDir)LICENSE.txt"
           Condition="'$(TargetsUnix)' == 'true'"/>
 
-    <Copy SourceFiles="$(SetupRoot)resources/LICENSE-MSFT.txt"
+    <Copy SourceFiles="$(InstallerProjectRoot)pkg\LICENSE-MSFT.TXT"
           DestinationFiles="$(PublishRootDir)LICENSE.txt"
           Condition="'$(TargetsUnix)' != 'true'"/>
 

src/installer/pkg/projects/netcoreapp/pkg/legacy/Directory.Build.props

@@ -16,7 +16,7 @@
     <!-- references the host packages -->
     <Dependency
       Include="Microsoft.NETCore.DotNetHostPolicy"
-      VersionFromProject="$(SourceDir)pkg\projects\Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.pkgproj"
+      VersionFromProject="$(InstallerProjectRoot)pkg\projects\Microsoft.NETCore.DotNetHostPolicy\Microsoft.NETCore.DotNetHostPolicy.pkgproj"
       TargetFramework="$(NETCoreAppFramework)" />
   </ItemGroup>
 

src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj

@@ -34,7 +34,7 @@
   <Target Name="GetDependencyVersionFiles" DependsOnTargets="ResolveReferences;GetPackagePaths">
     <ItemGroup>
       <_coreFxVersionFile
-        Include="$(PackagesDir)$([System.String]::new('%(Reference.NuGetPackageId)').ToLowerInvariant())/%(Reference.NuGetPackageVersion)/version.txt"
+        Include="$(NuGetPackageRoot)$([System.String]::new('%(Reference.NuGetPackageId)').ToLowerInvariant())/%(Reference.NuGetPackageVersion)/version.txt"
         Condition="$([System.String]::new('%(Reference.Identity)').ToLowerInvariant().Contains('system.runtime.dll'))"
         Name="corefx" />
       <_coreClrVersionFile

src/installer/pkg/projects/netstandard/src/netstandard.depproj

@@ -17,7 +17,7 @@
           BeforeTargets="GetFilesToPackage">
     <ItemGroup>
       <FilesToPackage
-        Include="$(PackagesDir)$(NETStandardLibraryPackage.ToLowerInvariant())\$(NETStandardLibraryPackageVersion)\build\$(NETStandardTargetFramework)\ref\*"
+        Include="$(NuGetPackageRoot)$(NETStandardLibraryPackage.ToLowerInvariant())\$(NETStandardLibraryPackageVersion)\build\$(NETStandardTargetFramework)\ref\*"
         TargetPath="ref/$(NETStandardTargetFramework)" />
     </ItemGroup>
   </Target>

src/installer/publish/publish-blobs.proj

 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
-  <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(LocalBuildToolsTaskFile)" />
-  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(LocalBuildToolsTaskFile)" />
+  <UsingTask TaskName="GenerateChecksums" AssemblyFile="$(InstallerTasksAssemblyPath)" />
+  <UsingTask TaskName="UploadToAzure" AssemblyFile="$(InstallerTasksAssemblyPath)" />
 
   <Target Name="CreateChecksums"
           DependsOnTargets="FindDownloadedArtifacts">

src/installer/publish/publish-final.proj

 <Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
-  <UsingTask TaskName="FinalizeBuild" AssemblyFile="$(LocalBuildToolsTaskFile)" />
+  <UsingTask TaskName="FinalizeBuild" AssemblyFile="$(InstallerTasksAssemblyPath)" />
 
   <!--
     Target wrapping UpdatePublishedVersions: ensures that ShippedNuGetPackage items are created and

src/installer/test/Directory.Build.props

@@ -2,12 +2,12 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <TestDir>$(SetupRoot)src\test\</TestDir>
+    <TestDir>$(InstallerProjectRoot)test\</TestDir>
     <TestAssetsDir>$(TestDir)Assets\</TestAssetsDir>
-    <TestStabilizedLegacyPackagesDir>$(ObjDir)TestStabilizedPackages\</TestStabilizedLegacyPackagesDir>
-    <TestRestorePackagesPath>$(ObjDir)TestPackageCache\</TestRestorePackagesPath>
-    <TestRestoreNuGetConfigFile>$(ObjDir)TestNuGetConfig\NuGet.config</TestRestoreNuGetConfigFile>
-    <InternalNupkgCacheDir>$(ObjDir)ExtraNupkgsForTestRestore\</InternalNupkgCacheDir>
+    <TestStabilizedLegacyPackagesDir>$(ArtifactsObjDir)TestStabilizedPackages\</TestStabilizedLegacyPackagesDir>
+    <TestRestorePackagesPath>$(ArtifactsObjDir)TestPackageCache\</TestRestorePackagesPath>
+    <TestRestoreNuGetConfigFile>$(ArtifactsObjDir)TestNuGetConfig\NuGet.config</TestRestoreNuGetConfigFile>
+    <InternalNupkgCacheDir>$(ArtifactsObjDir)ExtraNupkgsForTestRestore\</InternalNupkgCacheDir>
     <TestArchitectures>$(TargetArchitecture)</TestArchitectures>
     <TestInfraTargetFramework>netcoreapp3.0</TestInfraTargetFramework>
   </PropertyGroup>

src/installer/test/Directory.Build.targets

@@ -63,7 +63,7 @@
       the same as the package's version. Fetch this directly from the project to avoid guesswork.
     -->
     <MSBuild
-      Projects="$(SourceDir)pkg\projects\netcoreapp\pkg\Microsoft.NETCore.App.Runtime.pkgproj"
+      Projects="$(InstallerProjectRoot)pkg\projects\netcoreapp\pkg\Microsoft.NETCore.App.Runtime.pkgproj"
       Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" PropertyName="NETCoreAppRuntimePackageVersion" />
     </MSBuild>
@@ -102,7 +102,7 @@
   -->
   <Target Name="GetNETCoreAppRuntimePackVersion">
     <MSBuild
-      Projects="$(SourceDir)pkg\projects\netcoreapp\pkg\Microsoft.NETCore.App.Runtime.pkgproj"
+      Projects="$(InstallerProjectRoot)pkg\projects\netcoreapp\pkg\Microsoft.NETCore.App.Runtime.pkgproj"
       Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" PropertyName="NETCoreAppRuntimePackVersion" />
     </MSBuild>
@@ -114,7 +114,7 @@
   -->
   <Target Name="GetNETCoreAppInternalPackageVersion">
     <MSBuild
-      Projects="$(SourceDir)pkg\projects\netcoreapp\pkg\legacy\Microsoft.NETCore.App.Internal.pkgproj"
+      Projects="$(InstallerProjectRoot)pkg\projects\netcoreapp\pkg\legacy\Microsoft.NETCore.App.Internal.pkgproj"
       Targets="ReturnProductVersion">
       <Output TaskParameter="TargetOutputs" PropertyName="NETCoreAppInternalPackageVersion" />
     </MSBuild>

src/installer/test/PrepareTestAssets/PrepareTestAssets.proj

 <Project Sdk="Microsoft.NET.Sdk">
 
-  <UsingTask TaskName="CopyNupkgAndChangeVersion" AssemblyFile="$(LocalBuildToolsTaskFile)" />
+  <UsingTask TaskName="CopyNupkgAndChangeVersion" AssemblyFile="$(InstallerTasksAssemblyPath)" />
 
   <Target Name="PrepareTestAssets"
           DependsOnTargets="
@@ -99,7 +99,7 @@
       Text="Copying all nupkgs in package cache to a local source for test restore..." />
 
     <ItemGroup>
-      <PackageCacheNupkgFile Include="$(PackagesDir)*\*\*.nupkg" />
+      <PackageCacheNupkgFile Include="$(NuGetPackageRoot)*\*\*.nupkg" />
     </ItemGroup>
 
     <Copy SourceFiles="@(PackageCacheNupkgFile)" DestinationFolder="$(InternalNupkgCacheDir)" />

tools-local/Directory.Build.props

-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
-
+<Project>
+  
+  <!-- TODO: (Consolidation) Remove when consolidated. -->
   <PropertyGroup>
-    <BuildCustomTasksForDesktop Condition="'$(MSBuildRuntimeType)' != 'Core'">true</BuildCustomTasksForDesktop>
+    <IsRuntimeRepository Condition="Exists('..\..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository>
   </PropertyGroup>
+  <Import Project="..\Directory.Build.props" Condition="'$(IsRuntimeRepository)' == 'true'" />
+  <Import Project="..\src\Directory.Build.props" Condition="'$(IsRuntimeRepository)' != 'true'" />
 
 </Project>
\ No newline at end of file

tools-local/Directory.Build.targets

+<Project>
+  
+  <!-- TODO: (Consolidation) Remove when consolidated. -->
+  <Import Project="..\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' == 'true'" />
+  <Import Project="..\src\Directory.Build.targets" Condition="'$(IsRuntimeRepository)' != 'true'" />
+
+</Project>
\ No newline at end of file

tools-local/setuptools/dotnet-deb-tool/dotnet-deb-tool.csproj → tools-local/dotnet-deb-tool/dotnet-deb-tool.csproj

@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <Compile Remove="tool\**\*" />
-    <Compile Include="..\..\..\src\test\TestUtils\ArgumentEscaper.cs" />
+    <Compile Include="$(InstallerProjectRoot)test\TestUtils\ArgumentEscaper.cs" />
 
     <Content Include="tool\**" CopyToOutputDirectory="PreserveNewest">
       <PackagePath>lib/$(TargetFramework)/tool</PackagePath>

tools-local/regenerate-readme-table.proj

 <Project>
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.props))\Directory.Build.props" />
+  <Import Project="Directory.Build.props" />
 
-  <UsingTask TaskName="RegenerateReadmeTable" AssemblyFile="$(LocalBuildToolsTaskFile)" />
+  <UsingTask TaskName="RegenerateReadmeTable" AssemblyFile="$(InstallerTasksAssemblyPath)" />
 
   <Target Name="Build">
     <!--
@@ -46,5 +46,5 @@
     <Message Text="$(MSBuildProjectName) -> $(RepoRoot)README.md" Importance="High" />
   </Target>
 
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory).., Directory.Build.targets))\Directory.Build.targets" />
+  <Import Project="Directory.Build.targets" />
 </Project>

tools-local/scripts/dev/master-build-deb-rpm-docker.sh

@@ -63,7 +63,7 @@ package() {
 
     containerized "$image" bash -c "
         eng/common/msbuild.sh \
-            tools-local/tasks/core-setup.tasks.csproj \
+            tools-local/tasks/installer.tasks/installer.tasks.csproj \
             /t:Restore /t:Build /t:CreateHostMachineInfoFile \
             /p:Configuration=Release \
             /p:OSGroup=Linux \

tools-local/tasks/core-setup.tasks.sln

-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.645
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-setup.tasks", "core-setup.tasks.csproj", "{360F25FA-3CD9-4338-B961-A4F3122B88B2}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{360F25FA-3CD9-4338-B961-A4F3122B88B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{360F25FA-3CD9-4338-B961-A4F3122B88B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {5562AE3C-B1B2-47F7-A661-3A5D47764C0E}
-	EndGlobalSection
-EndGlobal