diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2022-04-25 23:06:10 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-25 23:06:10 +0300 |
| commit | 09dc0feb6a66d311a180b635abfd6472a918108e (patch) | |
| tree | 899e87cd1756943ebaa3670260eefceedb813557 /eng/targetingpacks.targets | |
| parent | fc2f06e5588bef13cc3c3c619c476746f9982bf8 (diff) | |
Fix VS complaining about missing projects in slns (#68488)
* Fix VS complaining about missing projects in slns
Remove inbox (Project-)References in out-of-band projects as these
projects already build on top of the shared framework (targeting pack).
* Update Microsoft.Extensions ref projects
* Update Microsoft.Extensions src projects
* Update graph dependencies of Microsoft.Extensions*
* Update sources that complained about Span usage
Diffstat (limited to 'eng/targetingpacks.targets')
| -rw-r--r-- | eng/targetingpacks.targets | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index 0505ecdb7dd..b61f18b44c9 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> @@ -67,20 +67,14 @@ </Reference> </ItemGroup> - <!-- DisableImplicitAssemblyReferences support. --> <Target Name="RemoveFrameworkReferences" BeforeTargets="_HandlePackageFileConflicts" AfterTargets="ResolveTargetingPackAssets" - Condition="'$(DisableImplicitAssemblyReferences)' == 'true' and - '$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> + Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> <!-- Point MicrosoftNetCoreAppRefPackRefDir to the acquired targeting pack to use it later for AssemblySearchPaths resolution. --> - <PropertyGroup Condition="'$(UseLocalTargetingRuntimePack)' != 'true'"> + <PropertyGroup Condition="'$(TargetFrameworkVersion)' != 'v$(NetCoreAppCurrentVersion)'"> <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. --> |