Enable Building of packages in 3.1 branch

eng/Packaging.props

@@ -47,8 +47,14 @@
     <PackageConfigurations>$(BuildConfigurations)</PackageConfigurations>
   </PropertyGroup>
 
-  <Import Condition="Exists('../pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="../pkg/baseline/baseline.props" />
+  <Import Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Project="../pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.props" />
 
+  <PropertyGroup>
+    <!-- Set PackageIndexFile to point to our local repo's index.  This tells the packaging targets
+         which index should be used for updates -->
+    <PackageIndexFile>$(MSBuildThisFileDirectory)../pkg/Microsoft.Private.PackageBaseline/packageIndex.json</PackageIndexFile>
+  </PropertyGroup>
+
   <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
     <!--
       Building packages fails for two reasons.

eng/Packaging.targets

@@ -34,7 +34,23 @@
                       '$(_excludeCompile)' == 'true' AND
                       '%(Dependency.Identity)' != '_._'" />
   </Target>
-
+
+  <Target Name="BlockStable" Condition="'$(BlockStable)' == 'true'" AfterTargets="CalculatePackageVersion">
+    <!-- DO NOT ship this packages as stable -->
+    <Error Condition="!$(PackageVersion.Contains('-'))" Text="Package $(Id) should not be built stable" />
+  </Target>
+
+  <!-- Get the package version without pre-release -->
+  <Target Name="GetPackageIdentityWithoutPrerelease"
+          Returns="@(_PackageIdentityWithoutPrerelease)">
+    <ItemGroup>
+      <_PackageIdentityWithoutPrerelease Include="$(Id)">
+        <Version>$(PackageVersion)</Version>
+        <BlockStable>$(BlockStable)</BlockStable>
+      </_PackageIdentityWithoutPrerelease>
+    </ItemGroup>
+  </Target>
+
   <PropertyGroup>
     <VersionSuffix>$(_PreReleaseLabel)$(_BuildNumberLabels)</VersionSuffix>
   </PropertyGroup>

external/harvestPackages/harvestPackages.depproj

@@ -3,7 +3,6 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
 
-  <Import Project="$(RepoRoot)pkg/baseline/baseline.props" />
 
   <!-- only restore this project during the build, don't copy any of it's packages
        The sole purpose of this project is to download packages that can be examined
@@ -17,7 +16,7 @@
       </_AllPkgProjs>
     </ItemGroup>
 
-    <MSBuild Projects="@(_AllPkgProjs)" Targets="GetPackageIdentityIfStable" Properties="$(ProjectProperties)">
+    <MSBuild Projects="@(_AllPkgProjs)" Targets="GetPackageIdentityWithoutPrerelease" Properties="$(ProjectProperties)">
       <Output TaskParameter="TargetOutputs" ItemName="_AllPkgProjsWithVersion" />
     </MSBuild>
   </Target>

pkg/Directory.Build.props

@@ -6,6 +6,7 @@
          For offline builds we still set OfficialBuildId but we need to build all the packages for a single
          leg only, so we also take DotNetBuildFromSource  into account. -->
     <BuildingAnOfficialBuildLeg Condition="'$(BuildingAnOfficialBuildLeg)' == '' AND '$(OfficialBuildId)' != '' AND '$(DotNetBuildFromSource)' != 'true'">true</BuildingAnOfficialBuildLeg>
+    <HarvestStablePackage>false</HarvestStablePackage>
   </PropertyGroup>
 
   <!-- Packages opt-in to automatic RID-specific builds by placing a *.RID.props next to their project