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/versioning.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/versioning.targets')
| -rw-r--r-- | eng/versioning.targets | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/eng/versioning.targets b/eng/versioning.targets index 3a40200c173..f31612f41a4 100644 --- a/eng/versioning.targets +++ b/eng/versioning.targets @@ -107,7 +107,10 @@ <Target Name="AddOSPlatformAttributes" BeforeTargets="GenerateAssemblyInfo" AfterTargets="PrepareForBuild" - Condition="'$(TargetPlatformIdentifier)' == '' and '$(IsTestProject)' != 'true' and '$(TargetFrameworkIdentifier)' != '.NETFramework'"> + Condition="'$(TargetPlatformIdentifier)' == '' and + '$(IsTestProject)' != 'true' and + '$(TargetFrameworkIdentifier)' != '.NETFramework' + and '$(AddOSPlatformAttributes)' != 'false'"> <!-- Defensively de-dupe the values --> <ItemGroup> <_unsupportedOSPlatforms Include="$(UnsupportedOSPlatforms)" /> @@ -133,12 +136,15 @@ </ItemGroup> </Target> - <!-- Removes assembly level attributes from test projects. --> - <Target Name="RemoveSupportedOSPlatformAttributeFromTestProjects" + <!-- Remove assembly level attributes from certain projects. + Use a target for that until https://github.com/dotnet/sdk/issues/14836 is implemented. --> + <Target Name="RemoveSupportedOSTargetPlatformAttributeFromProjects" AfterTargets="GetAssemblyAttributes" - Condition="'$(IsTestProject)' == 'true'"> + BeforeTargets="CreateGeneratedAssemblyInfoInputsCacheFile"> <ItemGroup> - <AssemblyAttribute Remove="System.Runtime.Versioning.SupportedOSPlatformAttribute" /> + <AssemblyAttribute Remove="System.Runtime.Versioning.SupportedOSPlatformAttribute" + Condition="'$(IsTestProject)' == 'true' or '$(AddOSPlatformAttributes)' == 'false'" /> + <!-- Don't include target platform attributes, since we use the target platform to represent RIDs instead. --> <AssemblyAttribute Remove="System.Runtime.Versioning.TargetPlatformAttribute" /> </ItemGroup> </Target> |