Upgrade ApiCompat version and remove contract assemblies (#1308)

* Remove contract assemblies from the repo as build pipelines are now in charge of providing the correct contract assemblies. * Upgrade ApiCompat to version 5-beta. * Introduce ApiCompatExcludeAttributeList. * Introduce a workaround for missing contract assemblies.
AzureAD · Jan 7, 2020 · b9c40c0 · b9c40c0
1 parent 47dac47
commit b9c40c0
Show file tree

Hide file tree

Showing 51 changed files with 13 additions and 2 deletions.
diff --git a/Tools/apiCompat/ApiCompatExcludeAttributeList.txt b/Tools/apiCompat/ApiCompatExcludeAttributeList.txt
diff --git a/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.JsonWebTokens.dll b/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.JsonWebTokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Logging.dll b/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Logging.dll
diff --git a/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll b/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
diff --git a/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Protocols.WsFederation.dll b/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Protocols.WsFederation.dll
diff --git a/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Protocols.dll b/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Protocols.dll
diff --git a/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Tokens.Saml.dll b/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Tokens.Saml.dll
diff --git a/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Tokens.dll b/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Tokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Xml.dll b/Tools/apiCompat/contractAssemblies/net45/Microsoft.IdentityModel.Xml.dll
diff --git a/Tools/apiCompat/contractAssemblies/net45/System.IdentityModel.Tokens.Jwt.dll b/Tools/apiCompat/contractAssemblies/net45/System.IdentityModel.Tokens.Jwt.dll
diff --git a/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.JsonWebTokens.dll b/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.JsonWebTokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Logging.dll b/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Logging.dll
diff --git a/...s/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll b/...s/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
diff --git a/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Protocols.WsFederation.dll b/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Protocols.WsFederation.dll
diff --git a/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Protocols.dll b/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Protocols.dll
diff --git a/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Tokens.Saml.dll b/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Tokens.Saml.dll
diff --git a/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Tokens.dll b/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Tokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Xml.dll b/Tools/apiCompat/contractAssemblies/net451/Microsoft.IdentityModel.Xml.dll
diff --git a/Tools/apiCompat/contractAssemblies/net451/System.IdentityModel.Tokens.Jwt.dll b/Tools/apiCompat/contractAssemblies/net451/System.IdentityModel.Tokens.Jwt.dll
diff --git a/Tools/apiCompat/contractAssemblies/net452/Microsoft.IdentityModel.KeyVaultExtensions.dll b/Tools/apiCompat/contractAssemblies/net452/Microsoft.IdentityModel.KeyVaultExtensions.dll
diff --git a/...piCompat/contractAssemblies/net452/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.dll b/...piCompat/contractAssemblies/net452/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.dll
diff --git a/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.JsonWebTokens.dll b/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.JsonWebTokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Logging.dll b/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Logging.dll
diff --git a/...s/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll b/...s/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
diff --git a/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Protocols.WsFederation.dll b/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Protocols.WsFederation.dll
diff --git a/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Protocols.dll b/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Protocols.dll
diff --git a/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Tokens.Saml.dll b/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Tokens.Saml.dll
diff --git a/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Tokens.dll b/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Tokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Xml.dll b/Tools/apiCompat/contractAssemblies/net461/Microsoft.IdentityModel.Xml.dll
diff --git a/Tools/apiCompat/contractAssemblies/net461/System.IdentityModel.Tokens.Jwt.dll b/Tools/apiCompat/contractAssemblies/net461/System.IdentityModel.Tokens.Jwt.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.JsonWebTokens.dll b/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.JsonWebTokens.dll
diff --git a/...piCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.KeyVaultExtensions.dll b/...piCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.KeyVaultExtensions.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Logging.dll b/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Logging.dll
diff --git a/.../contractAssemblies/netstandard1.4/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.dll b/.../contractAssemblies/netstandard1.4/Microsoft.IdentityModel.ManagedKeyVaultSecurityKey.dll
diff --git a/...pat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll b/...pat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
diff --git a/...mpat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Protocols.WsFederation.dll b/...mpat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Protocols.WsFederation.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Protocols.dll b/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Protocols.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Tokens.Saml.dll b/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Tokens.Saml.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Tokens.dll b/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Tokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Xml.dll b/Tools/apiCompat/contractAssemblies/netstandard1.4/Microsoft.IdentityModel.Xml.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard1.4/System.IdentityModel.Tokens.Jwt.dll b/Tools/apiCompat/contractAssemblies/netstandard1.4/System.IdentityModel.Tokens.Jwt.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll b/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.JsonWebTokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Logging.dll b/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Logging.dll
diff --git a/...pat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll b/...pat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
diff --git a/...mpat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Protocols.WsFederation.dll b/...mpat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Protocols.WsFederation.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Protocols.dll b/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Protocols.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Tokens.Saml.dll b/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Tokens.Saml.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Tokens.dll b/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Tokens.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Xml.dll b/Tools/apiCompat/contractAssemblies/netstandard2.0/Microsoft.IdentityModel.Xml.dll
diff --git a/Tools/apiCompat/contractAssemblies/netstandard2.0/System.IdentityModel.Tokens.Jwt.dll b/Tools/apiCompat/contractAssemblies/netstandard2.0/System.IdentityModel.Tokens.Jwt.dll
diff --git a/build/apiCompat.props b/build/apiCompat.props
@@ -1,14 +1,17 @@
 <Project>
+	<!-- https://github.com/dotnet/arcade/tree/master/src/Microsoft.DotNet.ApiCompat -->
 	<PropertyGroup>
 		<RunApiCompat>false</RunApiCompat>
 		<RunApiCompatForSrc>true</RunApiCompatForSrc>
 		<RunMatchingRefApiCompat>false</RunMatchingRefApiCompat>
 		<ApiCompatEnforceOptionalRules>true</ApiCompatEnforceOptionalRules>
 		<ApiCompatBaseline>$(SolutionDir)Tools\apiCompat\baseline\ApiCompatBaseline.$(TargetFramework).txt</ApiCompatBaseline>
+		<ApiCompatExcludeAttributeList>$(SolutionDir)Tools\apiCompat\ApiCompatExcludeAttributeList.txt</ApiCompatExcludeAttributeList>
+		<AllowMissingContractAssemblies>true</AllowMissingContractAssemblies>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.DotNet.ApiCompat" Version="1.0.0-beta.18557.3" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.19626.1" PrivateAssets="All" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -25,8 +28,16 @@
 		<Message Importance="High" Text=">>> Running ApiCompat for the assembly: $(TargetFramework)\$(TargetName).dll"/>
 	</Target>
 
-	<Target Name="CheckIfContractAssemblyExists" Condition="'$(RunApiCompat)' == 'true' AND !Exists('@(ResolvedMatchingContract)')" BeforeTargets="ValidateApiCompatForSrc">
+	<!--
+		Only warn (don't throw) if a contract assembly is not found. ApiCompat > v5 by default throws if a contract assembly is not found.
+		Useful when a new assembly/target is introduced and there is no contract assembly available yet.
+	-->
+	<Target Name="CheckIfContractAssemblyExists" Condition="'$(RunApiCompat)' == 'true' AND '$(AllowMissingContractAssemblies)' == 'true' AND !Exists('@(ResolvedMatchingContract)')" BeforeTargets="ValidateApiCompatForSrc">
 		<Warning Text=">>> Contract assembly doesn't exist. ApiCompat will not run for the assembly: @(ResolvedMatchingContract)"/>
+		<Copy
+			SourceFiles="$(ProjectDir)$(IntermediateOutputPath)$(TargetFileName)"
+			DestinationFolder="$(SolutionDir)Tools\apiCompat\contractAssemblies\$(TargetFramework)\"
+		/>
 	</Target>
 
 	<Target Name="ResolveContractDependencyDirectories" BeforeTargets="ValidateApiCompatForSrc">