diff options
| author | Marek Safar <marek.safar@gmail.com> | 2022-05-02 11:19:33 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-02 11:19:33 +0300 |
| commit | 85d2aff4da96ac01babd461a1c76c358d4979d68 (patch) | |
| tree | f971abe5d27174a882dda9a2088d6cbe9fbf9689 /eng/targetingpacks.targets | |
| parent | bc1cffa6312338dbc8ce794b9dbc15f961b59575 (diff) | |
| parent | 8823eefe91f6b774961c32800dea977b687d7328 (diff) | |
Merge branch 'main' into darc-main-31d4c308-6782-4440-8589-61f58f239059
Diffstat (limited to 'eng/targetingpacks.targets')
| -rw-r--r-- | eng/targetingpacks.targets | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 1c9c576e649..7e2b8e17ac1 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -16,7 +16,7 @@ <PropertyGroup Condition="'$(DisableImplicitFrameworkReferences)' != 'true' and '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and - $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '$(NetCoreAppCurrentVersion)'))"> + '$(TargetFrameworkVersion)' == 'v$(NetCoreAppCurrentVersion)'"> <UseLocalTargetingRuntimePack Condition="'$(UseLocalTargetingRuntimePack)' == ''">true</UseLocalTargetingRuntimePack> <!-- Tests don't yet use a live build of the apphost: https://github.com/dotnet/runtime/issues/58109. --> <UseLocalAppHostPack Condition="'$(UseLocalAppHostPack)' == ''">false</UseLocalAppHostPack> @@ -65,27 +65,13 @@ </Reference> </ItemGroup> - <!-- DisableImplicitAssemblyReferences support. --> - <Target Name="RemoveFrameworkReferences" - BeforeTargets="_HandlePackageFileConflicts" - AfterTargets="ResolveTargetingPackAssets" - Condition="'$(DisableImplicitAssemblyReferences)' == 'true' and - '$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <!-- Point MicrosoftNetCoreAppRefPackRefDir to the acquired targeting pack to use it later for AssemblySearchPaths resolution. --> - <PropertyGroup Condition="'$(UseLocalTargetingRuntimePack)' != 'true'"> - <MicrosoftNetCoreAppRefPackRefDir>%(ResolvedFrameworkReference.TargetingPackPath)\ref\net$(TargetFrameworkVersion.TrimStart('v'))\</MicrosoftNetCoreAppRefPackRefDir> - </PropertyGroup> - <ItemGroup> - <Reference Remove="@(Reference)" - Condition="'%(Reference.FrameworkReferenceName)' == '$(LocalFrameworkOverrideName)'" /> - </ItemGroup> - </Target> - <!-- Add the resolved targeting pack to the assembly search path. --> <Target Name="UseTargetingPackForAssemblySearchPaths" BeforeTargets="ResolveAssemblyReferences; DesignTimeResolveAssemblyReferences" - Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and + '$(TargetFrameworkVersion)' == 'v$(NetCoreAppCurrentVersion)' and + '$(DisableImplicitFrameworkReferences)' == 'true'"> <PropertyGroup> <AssemblySearchPaths>$(AssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</AssemblySearchPaths> <DesignTimeAssemblySearchPaths>$(DesignTimeAssemblySearchPaths);$(MicrosoftNetCoreAppRefPackRefDir.TrimEnd('/\'))</DesignTimeAssemblySearchPaths> @@ -135,7 +121,7 @@ <!-- Filter out conflicting implicit assembly references. --> <Target Name="FilterImplicitAssemblyReferences" - Condition="'$(DisableImplicitAssemblyReferences)' != 'true'" + Condition="'$(DisableImplicitFrameworkReferences)' != 'true'" DependsOnTargets="ResolveProjectReferences" AfterTargets="ResolveTargetingPackAssets"> <ItemGroup> |