Skip to content

Commit

Permalink
Delete unused ApiCompat baseline files (#64190)
Browse files Browse the repository at this point in the history
* Delete unused ApiCompat baseline files

* Delete ApiCompatBaseline.netfx.netstandardOnly.txt

* Remove manual .NETFramework baseline validation

* Delete ApiCompatBaseline.netcoreapp.netfx461.ignore.txt

* Delete ApiCompatBaseline.netcoreapp.netfx461.txt
  • Loading branch information
ViktorHofer authored Jan 25, 2022
1 parent 8d0c3d1 commit 4d16d09
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 4,314 deletions.
20 changes: 1 addition & 19 deletions src/libraries/shims/ApiCompat.proj
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
<Project Sdk="Microsoft.Build.NoTargets">

<!-- Run API compat against the following 1:1 assemblies but don't include them in the list that is used to generate facades -->
<ItemGroup>
<NetFxReference Include="System.DirectoryServices" />
<NetFxReference Include="System.DirectoryServices.AccountManagement" />
<NetFxReference Include="System.DirectoryServices.Protocols" />
</ItemGroup>

<ItemGroup>
<PackageDownload Include="Microsoft.NETCore.App.Ref" Version="[$(NetCoreAppLatestStablePackageBaselineVersion)]" />
<PackageDownload Include="NETStandard.Library.Ref" Version="[$(NETStandardLibraryRefVersion)]" />
Expand All @@ -16,8 +9,6 @@

<Target Name="GetApiCompatInputsAndOutputs">
<PropertyGroup>
<ApiCompatBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netfx461.txt</ApiCompatBaselineFile>
<ApiCompatBaselineIgnoreFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netfx461.ignore.txt</ApiCompatBaselineIgnoreFile>
<ApiCompatNSBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netstandard.txt</ApiCompatNSBaselineFile>
<ApiCompatNSOnlyBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.netcoreapp.netstandardOnly.txt</ApiCompatNSOnlyBaselineFile>
<PreviousNetCoreAppBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.PreviousNetCoreApp.txt</PreviousNetCoreAppBaselineFile>
Expand All @@ -32,7 +23,7 @@
<Target Name="RunApiCompat"
DependsOnTargets="GetApiCompatInputsAndOutputs"
AfterTargets="Build"
Inputs="@(NetCoreAppCurrentRefFile);$(ApiCompatBaselineFile);$(ApiCompatBaselineIgnoreFile);$(ApiCompatNSBaselineFile);$(ApiCompatNSOnlyBaselineFile);$(PreviousNetCoreAppBaselineFile)"
Inputs="@(NetCoreAppCurrentRefFile);$(ApiCompatNSBaselineFile);$(ApiCompatNSOnlyBaselineFile);$(PreviousNetCoreAppBaselineFile)"
Outputs="$(ApiCompatMarkerFile)">

<PropertyGroup>
Expand All @@ -46,15 +37,6 @@
Lines="$(ApiCompatArgs)"
Overwrite="true" />

<Exec Command="$(_ApiCompatCommand) &quot;@(NetFxReference -> '$(NetFxRefPath)%(Identity).dll')&quot; --baseline &quot;$(ApiCompatBaselineIgnoreFile)&quot; @&quot;$(ApiCompatResponseFile)&quot; &gt; $(ApiCompatBaselineFile)"
Condition="'$(BaselineApiCompat)' == 'true'"
CustomErrorRegularExpression="^[a-zA-Z]+ :"
StandardOutputImportance="Low"
IgnoreExitCode="true">
<Output TaskParameter="ExitCode" PropertyName="ApiCompatExitCode" />
</Exec>
<Error Condition="'$(ApiCompatExitCode)' != '0'" Text="ApiCompat failed comparing $(NETFrameworkReferenceAssemblyTFM) to $(NetCoreAppCurrent)" />

<!-- In order to update the .NETStandard baseline, you can just start the build with /p:UpdateNETStandardBaseline=true -->
<PropertyGroup>
<NetStandardLibrary20RefPath>$([MSBuild]::NormalizeDirectory('$(NuGetPackageRoot)', 'netstandard.library', '$(NetStandardLibraryVersion)', 'build', 'netstandard2.0', 'ref'))</NetStandardLibrary20RefPath>
Expand Down
Loading

0 comments on commit 4d16d09

Please sign in to comment.