Move ApiCompat files into own directory

diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 39c393f..f847f89 100644 (file)
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -16,6 +16,7 @@
     <NativeBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'native', '$(NetCoreAppCurrentBuildSettings)'))</NativeBinDir>
     <NetCoreAppCurrentTestHostPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'testhost', '$(NetCoreAppCurrentBuildSettings)'))</NetCoreAppCurrentTestHostPath>
     <NetCoreAppCurrentTestHostSharedFrameworkPath>$([MSBuild]::NormalizeDirectory('$(NetCoreAppCurrentTestHostPath)', 'shared', '$(MicrosoftNetCoreAppFrameworkName)', '$(ProductVersion)'))</NetCoreAppCurrentTestHostSharedFrameworkPath>
+    <NETStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1'))</NETStandard21RefPath>
 
     <NoWarn Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">$(NoWarn);nullable</NoWarn>
     <NoWarn Condition="'$(GeneratePlatformNotSupportedAssembly)' == 'true' or '$(GeneratePlatformNotSupportedAssemblyMessage)' != ''">$(NoWarn);nullable;CA1052</NoWarn>

diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/apicompat/ApiCompat.proj
similarity index 100%
rename from src/libraries/shims/ApiCompat.proj
rename to src/libraries/apicompat/ApiCompat.proj

diff --git a/src/libraries/shims/ApiCompatBaseline.PreviousNetCoreApp.txt b/src/libraries/apicompat/ApiCompatBaseline.PreviousNetCoreApp.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.PreviousNetCoreApp.txt
rename to src/libraries/apicompat/ApiCompatBaseline.PreviousNetCoreApp.txt

diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandard.txt b/src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandard.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandard.txt
rename to src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandard.txt

diff --git a/src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt b/src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
similarity index 100%
rename from src/libraries/shims/ApiCompatBaseline.netcoreapp.netstandardOnly.txt
rename to src/libraries/apicompat/ApiCompatBaseline.netcoreapp.netstandardOnly.txt

diff --git a/src/libraries/shims/Directory.Build.targets b/src/libraries/shims/Directory.Build.targets
index aa615fd..d7674d2 100644 (file)
--- a/src/libraries/shims/Directory.Build.targets
+++ b/src/libraries/shims/Directory.Build.targets
@@ -3,8 +3,7 @@
 
   <PropertyGroup>
     <NETFrameworkReferenceAssemblyTFM>net48</NETFrameworkReferenceAssemblyTFM>
-    <NetFxRefPath>$(NuGetPackageRoot)microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)\$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)\build\.NETFramework\v4.8\</NetFxRefPath>
-    <NETStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library.ref', '$(NETStandardLibraryRefVersion)', 'ref', 'netstandard2.1'))</NETStandard21RefPath>
+    <NetFxRefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'microsoft.netframework.referenceassemblies.$(NETFrameworkReferenceAssemblyTFM)', '$(MicrosoftNETFrameworkReferenceAssembliesLatestPackageVersion)', 'build', '.NETFramework', 'v4.8'))</NetFxRefPath>
   </PropertyGroup>
 
   <!-- Download the corresponding targeting pack to build against the contract. -->

diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 5929fa3..f104c02 100644 (file)
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -40,7 +40,7 @@
                                 @(_allSrc)"
                        Exclude="@(NonNetCoreAppProject)" />
     <ManualShimProject Include="shims\manual\*.csproj" Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == ''" />
-    <ApiCompatProject Include="shims\ApiCompat.proj"
+    <ApiCompatProject Include="apicompat\ApiCompat.proj"
                       Condition="'$(DotNetBuildFromSource)' != 'true' and
                                  ('$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or '$(BuildTargetFramework)' == '') and
                                  '$(RunApiCompat)' != 'false'" />