diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2022-02-28 19:35:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 19:35:51 +0300 |
| commit | 7667e4112d5dd093dab7643e1dfe25997c0921a4 (patch) | |
| tree | 71d1ef124b613db8729d41a3435292fe2fa14c21 /eng | |
| parent | c41f452cc96a2f2e73c71610d423df3e9c133fef (diff) | |
Update GenAPI usage and code clean-up (#65887)
* Update GenAPI usage and code clean-up
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/Version.Details.xml | 4 | ||||
| -rw-r--r-- | eng/Versions.props | 2 | ||||
| -rw-r--r-- | eng/resolveContract.targets | 16 |
3 files changed, 19 insertions, 3 deletions
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c3149d8b0f..9cfb503beb9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -62,9 +62,9 @@ <Uri>https://github.com/dotnet/arcade</Uri> <Sha>68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b</Sha> </Dependency> - <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22122.3"> + <Dependency Name="Microsoft.DotNet.GenAPI" Version="7.0.0-beta.22124.4"> <Uri>https://github.com/dotnet/arcade</Uri> - <Sha>68a9b6dc9c0f375893fcdab74b7dd2538afb1c4b</Sha> + <Sha>f7136626d0109856df867481219eb7366951985d</Sha> </Dependency> <Dependency Name="Microsoft.DotNet.GenFacades" Version="7.0.0-beta.22122.3"> <Uri>https://github.com/dotnet/arcade</Uri> diff --git a/eng/Versions.props b/eng/Versions.props index fe7311358ef..887f5cc2136 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -42,7 +42,7 @@ <MicrosoftDotNetApiCompatVersion>7.0.0-beta.22122.3</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetBuildTasksFeedVersion>7.0.0-beta.22122.3</MicrosoftDotNetBuildTasksFeedVersion> <MicrosoftDotNetCodeAnalysisVersion>7.0.0-beta.22122.3</MicrosoftDotNetCodeAnalysisVersion> - <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22122.3</MicrosoftDotNetGenAPIVersion> + <MicrosoftDotNetGenAPIVersion>7.0.0-beta.22124.4</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenFacadesVersion>7.0.0-beta.22122.3</MicrosoftDotNetGenFacadesVersion> <MicrosoftDotNetXUnitExtensionsVersion>7.0.0-beta.22122.3</MicrosoftDotNetXUnitExtensionsVersion> <MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.22122.3</MicrosoftDotNetXUnitConsoleRunnerVersion> diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets index 0e0cfc05c56..37ab1d299a6 100644 --- a/eng/resolveContract.targets +++ b/eng/resolveContract.targets @@ -7,6 +7,13 @@ <ContractDependencyPaths Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', '$(NetCoreAppCurrent)'))">$(ContractDependencyPaths);$(MicrosoftNetCoreAppRefPackRefDir)</ContractDependencyPaths> </PropertyGroup> + <PropertyGroup> + <GenAPIExcludeAttributesList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt</GenAPIExcludeAttributesList> + <GenAPIHeaderFile>$(RepositoryEngineeringDir)LicenseHeader.txt</GenAPIHeaderFile> + <GenAPITargetPath>$([MSBuild]::NormalizePath('$(MSBuildProjectDirectory)', '..', 'ref', '$(AssemblyName).cs'))</GenAPITargetPath> + <GenAPILangVersion Condition="'$(LangVersion)' != ''">$(LangVersion)</GenAPILangVersion> + </PropertyGroup> + <PropertyGroup Condition="'$(IsSourceProject)' == 'true'"> <ContractProject Condition="'$(ContractProject)' == ''">$(LibrariesProjectRoot)$(MSBuildProjectName)\ref\$(MSBuildProjectName).csproj</ContractProject> <HasMatchingContract Condition="'$(HasMatchingContract)' == '' and Exists('$(ContractProject)')">true</HasMatchingContract> @@ -53,4 +60,13 @@ ReferenceAssembly="" /> </ItemGroup> </Target> + + <Target Name="SetGenAPIProperties" + BeforeTargets="GenerateReferenceAssemblySource"> + <PropertyGroup> + <GenAPIFollowTypeForwards Condition="'%(ProjectReference.Identity)' == '$(CoreLibProject)'">true</GenAPIFollowTypeForwards> + </PropertyGroup> + </Target> + + <Import Project="$(RepositoryEngineeringDir)outerBuild.targets" Condition="'$(IsCrossTargetingBuild)' == 'true'" /> </Project> |