Build package baseline package only during all config (#31929)

* build package baseline package only during all config

* deleteing packageBaseline package

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.builds b/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.builds
deleted file mode 100644 (file)
index 69f418e..0000000
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.builds
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-
-  <ItemGroup>
-    <Project Include="Microsoft.Private.PackageBaseline.pkgproj"/>
-  </ItemGroup>
-
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(dir.traversal.targets))" />
-</Project>
\ No newline at end of file

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj b/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj
deleted file mode 100644 (file)
index d192c99..0000000
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.pkgproj
+++ /dev/null
@@ -1,43 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props))" />
-  <PropertyGroup>
-    <HarvestStablePackage>false</HarvestStablePackage>
-    <SkipPackageFileCheck>true</SkipPackageFileCheck>
-    <PackageIndexFileName>packageIndex.json</PackageIndexFileName>
-  </PropertyGroup>
-  <ItemGroup>
-    <File Include="Microsoft.Private.PackageBaseline.props">
-      <TargetPath>build</TargetPath>
-    </File>
-    <File Include="$(IntermediateOutputPath)$(PackageIndexFileName)">
-      <TargetPath>build</TargetPath>
-    </File>
-  </ItemGroup>
-  <!-- Stamp the packageIndex with pre-release version for this build -->
-  <Target Name="StampPackageIndex" BeforeTargets="GenerateNuSpec">
-    <MakeDir Directories="$(IntermediateOutputPath)" />
-    <Copy SourceFiles="$(PackageIndexFileName)" DestinationFolder="$(IntermediateOutputPath)" OverwriteReadOnlyFiles="true" />
-
-    <UpdatePackageIndex PackageIndexFile="$(IntermediateOutputPath)$(PackageIndexFileName)"
-                        PreRelease="$(VersionSuffix)" />
-  </Target>
-  <Target Name="UpdateFromLocalBuild">
-    <ItemGroup>
-      <AllPackages Include="$(PackageOutputPath)\*.nupkg" Exclude="$(PackageOutputPath)\*Microsoft.Private.*.nupkg" />
-      <FrameworkLayout Include="$(NETCoreAppPackageRefPath)">
-        <TargetFramework>netcoreapp2.0</TargetFramework>
-      </FrameworkLayout>
-      <FrameworkLayout Include="$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\netstandard2.0\ref">
-        <TargetFramework>netstandard2.0</TargetFramework>
-      </FrameworkLayout>
-      <FrameworkLayout Include="$(NuGetPackageRoot)$(NETStandardLibraryPackage)\$(NETStandardLibraryVersion)\build\net461\ref">
-        <TargetFramework>net461</TargetFramework>
-      </FrameworkLayout>
-    </ItemGroup>
-
-    <UpdatePackageIndex PackageIndexFile="$(PackageIndexFile)"
-                        Packages="@(AllPackages)"
-                        InboxFrameworkLayoutFolders="@(FrameworkLayout)" />
-  </Target>
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-</Project>
\ No newline at end of file

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.props b/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.props
deleted file mode 100644 (file)
index 02801dc..0000000
--- a/src/libraries/pkg/Microsoft.Private.PackageBaseline/Microsoft.Private.PackageBaseline.props
+++ /dev/null
@@ -1,5 +0,0 @@
-<Project>
-  <ItemGroup>
-    <PackageIndex Include="$(MSBuildThisFileDirectory)packageIndex.json" />
-  </ItemGroup>
-</Project>

diff --git a/src/libraries/pkg/baseline/baseline.props b/src/libraries/pkg/baseline/baseline.props
index c95c187..aadc08c 100644 (file)
--- a/src/libraries/pkg/baseline/baseline.props
+++ b/src/libraries/pkg/baseline/baseline.props
@@ -1,12 +1,14 @@
 <Project>
-  <Import Project="..\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)..\Microsoft.Private.PackageBaseline\packageIndex.json</PackageIndexFile>
+    <PackageIndexFile>$(MSBuildThisFileDirectory)packageIndex.json</PackageIndexFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageIndex Include="$(PackageIndexFile)" />
+  </ItemGroup>
+
   <!--
     Below targets should moved to packaging.targets in BuildTools but keeping in corefx for convenience right now
   -->

diff --git a/src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json b/src/libraries/pkg/baseline/packageIndex.json
similarity index 100%
rename from src/libraries/pkg/Microsoft.Private.PackageBaseline/packageIndex.json
rename to src/libraries/pkg/baseline/packageIndex.json