8000 [ApiDiff] Implementation of the new ApiDiff that reuses GenAPI featur… · dotnet/sdk@291eea7 · GitHub
[go: up one dir, main page]
Skip to content

Commit 291eea7

Browse files
carlossanlopcarlossanlop
authored
[ApiDiff] Implementation of the new ApiDiff that reuses GenAPI features (#46425)
2 parents 4d6b1e0 + dc02b78 commit 291eea7

File tree

67 files changed

+7679
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+7679
-108
lines changed

‎CODEOWNERS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,15 @@
8484

8585
# Compatibility tools owned by runtime team
8686
/src/Compatibility/ @dotnet/area-infrastructure-libraries
87+
88+
# Area-ApiCompat
8789
/test/Microsoft.DotNet.ApiCompatibility*/ @dotnet/area-infrastructure-libraries
8890
/test/Microsoft.DotNet.ApiCompat*/ @dotnet/area-infrastructure-libraries
8991
/test/Microsoft.DotNet.PackageValidation*/ @dotnet/area-infrastructure-libraries
9092

93+
# Area-ApiDiff
94+
/test/Microsoft.DotNet.ApiDiff.Tests/ @dotnet/area-infrastructure-libraries
95+
9196
# Area-GenAPI
9297
/src/Compatibility/GenAPI/ @dotnet/area-infrastructure-libraries
9398
/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/ @dotnet/area-infrastructure-libraries

‎Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
<PackageVersion Include="StyleCop.Analyzers" Version="$(StyleCopAnalyzersPackageVersion)" />
102102
<PackageVersion Include="System.CodeDom" Version="$(SystemCodeDomPackageVersion)" />
103103
<PackageVersion Include="System.CommandLine" Version="$(SystemCommandLineVersion)" />
104+
<PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="$(SystemCommandLineNamingConventionBinderVersion)" />
104105
<PackageVersion Include="System.Composition.AttributedModel" Version="$(SystemCompositionAttributedModelPackageVersion)" />
105106
<PackageVersion Include="System.Composition.Convention" Version="$(SystemCompositionConventionPackageVersion)" />
106107
10000 <PackageVersion Include="System.Composition.Hosting" Version="$(SystemCompositionHostingPackageVersion)" />

‎eng/Signing.props

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<FileSignInfo Include="PackageWithFakeNativeDep.dll" CertificateName="None" />
2323
<FileSignInfo Include="dotnet-tool-with-output-name.dll" CertificateName="None" />
2424

25-
<!-- Third party DLLs used by tests -->
25+
<!-- Third party DLLs used by tests-->
2626
<FileSignInfo Include="Castle.Core.dll" CertificateName="None" />
2727
<FileSignInfo Include="Moq.dll" CertificateName="None" />
2828

@@ -71,6 +71,17 @@
7171
<FileSignInfo Include="@(MacOSPkg->'%(Filename)%(Extension)')" CertificateName="MacDeveloperWithNotarization" />
7272
</ItemGroup>
7373

74+
<!-- Third party DLLs used in src projects that are not participating in source-build -->
75+
<ItemGroup>
76+
<FileSignInfo Include="Argon.dll" CertificateName="$(ExternalCertificateId)" />
77+
<FileSignInfo Include="DiffEngine.dll" CertificateName="$(ExternalCertificateId)" />
78+
<FileSignInfo Include="DiffPlex.dll" CertificateName="$(ExternalCertificateId)" />
79+
<FileSignInfo Include="EmptyFiles.dll" CertificateName="$(ExternalCertificateId)" />
80+
<FileSignInfo Include="SimpleInfoName.dll" CertificateName="$(ExternalCertificateId)" />
81+
<FileSignInfo Include="Verify.dll" CertificateName="$(ExternalCertificateId)" />
82+
<FileSignInfo Include="Verify.DiffPlex.dll" CertificateName="$(ExternalCertificateId)" />
83+
</ItemGroup>
84+
7485
<ItemGroup>
7586
<FileSignInfo Include="StreamJsonRpc.dll" CertificateName="MicrosoftSHA2" />
7687
</ItemGroup>

‎eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<StyleCopAnalyzersPackageVersion>1.2.0-beta.435</StyleCopAnalyzersPackageVersion>
6565
<WebDeploymentPackageVersion>4.0.5</WebDeploymentPackageVersion>
6666
<SystemCommandLineVersion>2.0.0-beta5.25227.101</SystemCommandLineVersion>
67+
<SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25227.101</SystemCommandLineNamingConventionBinderVersion>
6768
<MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2-beta1.22216.1</MicrosoftCodeAnalysisAnalyzerTestingVersion>
6869
<MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
6970
<MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>

‎sdk.sln

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio Version 17
33
VisualStudioVersion = 17.1.31903.286
44
MinimumVisualStudioVersion = 10.0.40219.1
@@ -537,6 +537,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS.Redist.Common.Net.Core.S
537537
EndProject
538538
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VS.Redist.Common.NetCore.Templates", "src\Layout\VS.Redist.Common.NetCore.Templates\VS.Redist.Common.NetCore.Templates.proj", "{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}"
539539
EndProject
540+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiDiff", "ApiDiff", "{C66B5859-B05E-5DF4-58E9-78CA919DB89A}"
541+
EndProject
542+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ApiDiff", "ApiDiff", "{AFA55F45-CFCB-9821-A210-2D3496088416}"
543+
EndProject
544+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ApiDiff.Tool", "src\Compatibility\ApiDiff\Microsoft.DotNet.ApiDiff.Tool\Microsoft.DotNet.ApiDiff.Tool.csproj", "{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}"
545+
EndProject
546+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ApiDiff.Tests", "test\Microsoft.DotNet.ApiDiff.Tests\Microsoft.DotNet.ApiDiff.Tests.csproj", "{A57B724D-D12B-483E-82F2-2183DEA2DFA7}"
547+
EndProject
548+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.DotNet.ApiDiff", "src\Compatibility\ApiDiff\Microsoft.DotNet.ApiDiff\Microsoft.DotNet.ApiDiff.csproj", "{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}"
549+
EndProject
540550
Global
541551
GlobalSection(SolutionConfigurationPlatforms) = preSolution
542552
Debug|Any CPU = Debug|Any CPU
@@ -1023,7 +1033,18 @@ Global
10231033
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
10241034
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
10251035
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4}.Release|Any CPU.Build.0 = Release|Any CPU
1026-
EndGlobalSection
1036+
{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1037+
{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Debug|Any CPU.Build.0 = Debug|Any CPU
1038+
{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Release|Any CPU.ActiveCfg = Release|Any CPU
1039+
{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF}.Release|Any CPU.Build.0 = Release|Any CPU
1040+
{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1041+
{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
1042+
{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
1043+
{A57B724D-D12B-483E-82F2-2183DEA2DFA7}.Release|Any CPU.Build.0 = Release|Any CPU
1044+
{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1045+
{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
1046+
{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
1047+
{4F23A9C8-945A-A4F4-51E9-FCA215943C0D}.Release|Any CPU.Build.0 = Release|Any CPU
10271048
GlobalSection(SolutionProperties) = preSolution
10281049
HideSolutionNode = FALSE
10291050
EndGlobalSection
@@ -1211,6 +1232,11 @@ Global
12111232
{93A4A3DA-9D0F-FAEA-5AD7-A34650D326D0} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
12121233
{C5C4F9CA-25B8-2B20-826D-EA93F667C316} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
12131234
{6A7E16BE-FF2F-7927-AAF7-366CC0C42AE4} = {71C279BD-E850-4A8D-9775-11CA26B8E5BA}
1235+
{C66B5859-B05E-5DF4-58E9-78CA919DB89A} = {44E564E1-AE0D-4313-A4E9-CBF2109397E3}
1236+
{AFA55F45-CFCB-9821-A210-2D3496088416} = {3AD322BF-405B-4A53-9858-51CF66E8509F}
1237+
{3F0093BF-A64D-4EE8-8A2A-22800BB25CFF} = {C66B5859-B05E-5DF4-58E9-78CA919DB89A}
1238+
{A57B724D-D12B-483E-82F2-2183DEA2DFA7} = {AFA55F45-CFCB-9821-A210-2D3496088416}
1239+
{4F23A9C8-945A-A4F4-51E9-FCA215943C0D} = {C66B5859-B05E-5DF4-58E9-78CA919DB89A}
12141240
EndGlobalSection
12151241
GlobalSection(ExtensibilityGlobals) = postSolution
12161242
SolutionGuid = {FB8F26CE-4DE6-433F-B32A-79183020BBD6}

‎src/Compatibility/ApiDiff/Directory.Build.props

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
3+
<Import Project="..\Directory.Build.props" />
4+
5+
<PropertyGroup>
6+
<SkipMicrosoftCodeAnalysisCSharpPinning>true</SkipMicrosoftCodeAnalysisCSharpPinning>
7+
</PropertyGroup>
8+
9+
</Project>

‎src/Compatibility/ApiDiff/Microsoft.DotNet.ApiDiff.Tool/AttributesToExclude.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
T:System.AttributeUsageAttribute
2+
T:System.ComponentModel.EditorBrowsableAttribute
3+
T:System.Diagnostics.CodeAnalysis.RequiresDynamicCodeAttribute
4+
T:System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute

‎src/Compatibility/ApiDiff/Microsoft.DotNet.ApiDiff.Tool/Microsoft.DotNet.ApiDiff.Tool.csproj

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>$(NetToolMinimum)</TargetFramework>
5+
<OutputType>Exe</OutputType>
6+
<IsPackable>true</IsPackable>
7+
<IsShippingPackage>false</IsShippingPackage>
8+
<PackAsTool>true</PackAsTool>
9+
<ToolCommandName>apidiff</ToolCommandName>
10+
<PackageDescription>Tool to emit markdown diffs between sets of assemblies.</PackageDescription>
11+
<DotNetBuildSourceOnly>false</DotNetBuildSourceOnly>
12+
<ExcludeFromSourceOnlyBuild>true</ExcludeFromSourceOnlyBuild>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<None Update="AttributesToExclude.txt">
17+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
18+
</None>
19+
</ItemGroup>
20+
21+
<ItemGroup>
22+
<ProjectReference Include="..\..\Microsoft.DotNet.ApiSymbolExtensions\Microsoft.DotNet.ApiSymbolExtensions.csproj" />
23+
<ProjectReference Include="..\Microsoft.DotNet.ApiDiff\Microsoft.DotNet.ApiDiff.csproj" />
24+
</ItemGroup>
25+
26+
<ItemGroup>
27+
<PackageReference Include="System.CommandLine" />
28+
<PackageReference Include="System.CommandLine.NamingConventionBinder" />
29+
</ItemGroup>
30+
31+
</Project>

0 commit comments

Comments
 (0)
0