diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2022-01-18 18:07:01 +0300 |
|---|---|---|
| committer | Viktor Hofer <viktor.hofer@microsoft.com> | 2022-02-24 14:32:04 +0300 |
| commit | 9ebe0efa4850fb2e451befe1fdf7c2d3cbb5c862 (patch) | |
| tree | b89ad195ff24e3ddf4d092b3953731de4d55ace5 /eng/generators.targets | |
| parent | fbf95fde7c4a23571dab5586b649729ff454000f (diff) | |
sfx+oob split, shim project refactoring, P2Ps
Split the build of shared framework and out-of-band projects so that
it's possible to just build the shard framework projects, which was
requested by the CLR teams. In the next infrastructure rollout, the
current "libs.ref+libs.src" subsets should be removed. Generate the
targeting pack with an incomplete (without shims) frameworklist as part
of the "libs.sfx" subset.
Build the shim projects after the shared framework and oob projects and
re-generate the targeting pack's frameworklist to include the shims.
Refactor the shims so that they aren't grouped anymore by generated &
manual. Instead group them by "ref" and "src" same as other libraries
in the tree which allows to reference the source project shims and read
from the ReferenceAssembly metadata.
Use ProjectReferences in traversal projects and shim projects instead
of named references that point to binplace directories (see graph below)
This allows to build parts of the product dynamically, i.e. the shim
projects, apicompat.proj, sfx.proj and oob.proj.
Diffstat (limited to 'eng/generators.targets')
| -rw-r--r-- | eng/generators.targets | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/eng/generators.targets b/eng/generators.targets index f13e56995af..e7835650b04 100644 --- a/eng/generators.targets +++ b/eng/generators.targets @@ -13,8 +13,7 @@ - references System.Runtime.InteropServices --> <EnabledGenerators Include="DllImportGenerator" Condition="'$(EnableDllImportGenerator)' == '' - and '$(IsFrameworkSupportFacade)' != 'true' - and '$(IsSourceProject)' == 'true' + and '$(IsRuntimeAssembly)' == 'true' and '$(MSBuildProjectExtension)' == '.csproj' and ( ('@(Reference)' != '' @@ -25,8 +24,7 @@ and '$(DisableImplicitAssemblyReferences)' == 'false'))" /> <EnabledGenerators Include="DllImportGenerator" Condition="'$(EnableDllImportGenerator)' == '' - and '$(IsFrameworkSupportFacade)' != 'true' - and '$(IsSourceProject)' == 'true' + and '$(IsRuntimeAssembly)' == 'true' and '$(MSBuildProjectExtension)' == '.csproj' and ('$(TargetFrameworkIdentifier)' == '.NETStandard' or '$(TargetFrameworkIdentifier)' == '.NETFramework' or ('$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionLessThan($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))))" /> </ItemGroup> |