Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
4089ef2
ApiCompat infra changes
ViktorHofer Aug 2, 2022
9ec4dde
Convert baseline to suppression files
ViktorHofer Aug 2, 2022
c49347d
ApiCompat.proj
ViktorHofer Aug 19, 2022
9615fae
update suppressions
smasher164 Aug 25, 2022
49ce28d
sorted suppressions
smasher164 Aug 26, 2022
ce8871e
rebase and update suppressions
smasher164 Aug 29, 2022
610cc2a
enable attribute and param rules
smasher164 Aug 29, 2022
4d3cc27
Enable optional rules
ViktorHofer Aug 30, 2022
60147fd
WebAssemblyThreading proj
ViktorHofer Aug 30, 2022
5609581
CompatSuppression for XmlREaderWriter
ViktorHofer Aug 30, 2022
6d0769c
Enable optional rules correctly...
ViktorHofer Aug 30, 2022
ed11fbe
ThreadPool UnsupportedOSPlatformAttribute
ViktorHofer Aug 30, 2022
eff5465
VBCore CP0017
ViktorHofer Aug 30, 2022
2c55401
Migrate all CoreLibs over
ViktorHofer Aug 30, 2022
81ea902
Update ApiCompat.proj
ViktorHofer Aug 30, 2022
56b1070
Add ApiCompat.proj baselines
ViktorHofer Aug 30, 2022
a9d6da5
Update ApiCompat.proj
ViktorHofer Aug 30, 2022
0b9da8f
Clean-up suppression files with nint/IntPtr fix
ViktorHofer Aug 31, 2022
5ce44ea
Clean-up CoreLib suppression
ViktorHofer Aug 31, 2022
68d6d56
Update suppression files with latest apicompat fix
ViktorHofer Sep 8, 2022
54d37e1
Merge branch 'main' into ConsumeApiCompatValidateAssembliesTask
ViktorHofer Sep 8, 2022
c5236f4
Merge remote-tracking branch 'upstream/main' into ConsumeApiCompatVal…
ViktorHofer Sep 12, 2022
779582d
Update suppression files
ViktorHofer Sep 12, 2022
0630ec7
update suppressions
smasher164 Sep 19, 2022
5fb86eb
Update suppression files
ViktorHofer Sep 21, 2022
5ecd6fe
Clean-up obsolete suppression files
ViktorHofer Sep 21, 2022
4a1329d
Update suppression files
ViktorHofer Sep 21, 2022
c378e5c
Merge branch 'main' into ConsumeApiCompatValidateAssembliesTask
smasher164 Sep 29, 2022
a45f3d4
update suppressions
smasher164 Sep 29, 2022
b0e32ca
huge reduction in suppression file size
smasher164 Sep 29, 2022
857b383
update suppressions
smasher164 Oct 3, 2022
0998cbb
Merge branch 'main' of https://github.com/dotnet/runtime into Consume…
smasher164 Oct 3, 2022
b844b97
more suppressions removed
smasher164 Oct 3, 2022
2c34db6
update suppressions
smasher164 Oct 6, 2022
bd8c48f
Merge branch 'ConsumeApiCompatValidateAssembliesTask' of https://gith…
ViktorHofer Oct 12, 2022
346a5a4
Merge remote-tracking branch 'upstream/main' into ConsumeApiCompatVal…
ViktorHofer Oct 12, 2022
eaf59fd
Update dependencies and clean-up
ViktorHofer Oct 12, 2022
b1ca777
Add suppression files for CoreLib and fix path
ViktorHofer Oct 12, 2022
45b5aa5
Update CoreLib coreclr suppression file
ViktorHofer Oct 12, 2022
ea745fe
Update coreclr suppression files
ViktorHofer Oct 12, 2022
1054c68
Suppression file fixes and Linux path fixes
ViktorHofer Oct 12, 2022
08c7c89
Update coreclr suppression again)
ViktorHofer Oct 12, 2022
875b0ce
Fix suppression file path calculation
ViktorHofer Oct 12, 2022
6126424
Fix previous mistake
ViktorHofer Oct 12, 2022
504092f
Diagnostics.Tracing suppression file
ViktorHofer Oct 13, 2022
107080b
Threading suppression file fix
ViktorHofer Oct 13, 2022
48d56fa
Merge remote-tracking branch 'upstream/main' into ConsumeApiCompatVal…
ViktorHofer Oct 13, 2022
a3334bd
use global suppression for CryptoSignedXmlRecursionException
smasher164 Oct 14, 2022
ff41f8a
Merge remote-tracking branch 'upstream/main' into ConsumeApiCompatVal…
ViktorHofer Oct 15, 2022
5db9a5e
Add Specification.Tests suppression
ViktorHofer Oct 15, 2022
2af0165
Disable NoTargets ref copying
ViktorHofer Oct 15, 2022
ddf1391
Fix for coreclr build
ViktorHofer Oct 15, 2022
c346c88
Avoid duplicate project evals
ViktorHofer Oct 15, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update ApiCompat.proj
  • Loading branch information
ViktorHofer authored and smasher164 committed Sep 1, 2022
commit 81ea90200d187053c8a13804d5d4c587680402ff
22 changes: 14 additions & 8 deletions src/libraries/apicompat/ApiCompat.proj
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@

<ItemGroup>
<ApiCompatNetCoreAppLatestStableLeftAssembliesTransformationPattern Include=".+\$([System.IO.Path]::DirectorySeparatorChar)(.+)" ReplacementString="$(NetCoreAppLatestStable)/$1" />
<ApiCompatNetCoreAppLatestStableRightAssembliesTransformationPattern Include=".+\$([System.IO.Path]::DirectorySeparatorChar)(.+)" ReplacementString="$(NetCoreAppCurrent)/$1" />
<ApiCompatNetStandard21LeftAssembliesTransformationPattern Include=".+\$([System.IO.Path]::DirectorySeparatorChar)(.+)" ReplacementString="netstandard2.1/$1" />
<ApiCompatNetStandard20LeftAssembliesTransformationPattern Include=".+\$([System.IO.Path]::DirectorySeparatorChar)(.+)" ReplacementString="netstandard2.0/$1" />
<ApiCompatNetCoreAppCurrentRightAssembliesTransformationPattern Include=".+\$([System.IO.Path]::DirectorySeparatorChar)(.+)" ReplacementString="$(NetCoreAppCurrent)/$1" />
</ItemGroup>

<!-- For API comparison, ApiCompat needs both the inbox and the out-of-band assemblies plus the shims to be built. -->
Expand Down Expand Up @@ -55,7 +57,7 @@
ExcludeAttributesFiles="@(ApiCompatExcludeAttributesFile)"
EnableRuleCannotChangeParameterName="true"
LeftAssembliesTransformationPattern="@(ApiCompatNetCoreAppLatestStableLeftAssembliesTransformationPattern)"
RightAssembliesTransformationPattern="@(ApiCompatNetCoreAppLatestStableRightAssembliesTransformationPattern)" />
RightAssembliesTransformationPattern="@(ApiCompatNetCoreAppCurrentRightAssembliesTransformationPattern)" />

<!-- ApiCompat: NetCoreAppCurrent <-> netstandard2.1 -->
<!-- <Microsoft.DotNet.ApiCompat.Task.ValidateAssembliesTask
Expand All @@ -64,9 +66,11 @@
RoslynAssembliesPath="$(RoslynAssembliesPath)"
GenerateCompatibilitySuppressionFile="$(GenerateCompatibilitySuppressionFile)"
CompatibilitySuppressionFilePath="$(ApiCompatNetStandard21BaselineFile)"
EnableStrictMode="$(ApiCompatStrictMode)"
LeftAssembliesTransformationPattern="@(ApiCompatLeftAssembliesTransformationPattern)"
RightAssembliesTransformationPattern="@(ApiCompatRightAssembliesTransformationPattern)" /> -->
EnableRuleAttributesMustMatch="true"
ExcludeAttributesFiles="@(ApiCompatExcludeAttributesFile)"
EnableRuleCannotChangeParameterName="true"
LeftAssembliesTransformationPattern="@(ApiCompatNetStandard21LeftAssembliesTransformationPattern)"
RightAssembliesTransformationPattern="@(ApiCompatNetCoreAppCurrentRightAssembliesTransformationPattern)" /> -->

<!-- ApiCompat: NetCoreAppCurrent <-> netstandard2.0 -->
<!-- <Microsoft.DotNet.ApiCompat.Task.ValidateAssembliesTask
Expand All @@ -75,9 +79,11 @@
RoslynAssembliesPath="$(RoslynAssembliesPath)"
GenerateCompatibilitySuppressionFile="$(GenerateCompatibilitySuppressionFile)"
CompatibilitySuppressionFilePath="$(ApiCompatNetStandard20BaselineFile)"
EnableStrictMode="$(ApiCompatStrictMode)"
LeftAssembliesTransformationPattern="@(ApiCompatLeftAssembliesTransformationPattern)"
RightAssembliesTransformationPattern="@(ApiCompatRightAssembliesTransformationPattern)" /> -->
EnableRuleAttributesMustMatch="true"
ExcludeAttributesFiles="@(ApiCompatExcludeAttributesFile)"
EnableRuleCannotChangeParameterName="true"
LeftAssembliesTransformationPattern="@(ApiCompatNetStandard20LeftAssembliesTransformationPattern)"
RightAssembliesTransformationPattern="@(ApiCompatNetCoreAppCurrentRightAssembliesTransformationPattern)" /> -->

<!-- Create a marker file which serves as the target's output to enable incremental builds. -->
<Touch Files="$(IntermediateOutputPath)$(TargetArchitecture)-marker.txt"
Expand Down
Loading