diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2022-04-27 18:27:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-27 18:27:56 +0300 |
| commit | b54561a957729ed479914db30dcda5b6873c21c7 (patch) | |
| tree | 5ba6e8d0777519983fb32008f8b47a9e9460d0ce /eng | |
| parent | 6af4abc5a0db0560e719539a869233d15d28dc09 (diff) | |
Fix VS complaining about missing projects in slns (continued) (#68543)
* Infra clean-up to simplify auto references
* Ref project file updates
* Src project file updates
* Test project file updates
Diffstat (limited to 'eng')
| -rw-r--r-- | eng/generators.targets | 2 | ||||
| -rw-r--r-- | eng/targetingpacks.targets | 16 |
2 files changed, 5 insertions, 13 deletions
diff --git a/eng/generators.targets b/eng/generators.targets index 8143fdf8e25..78afaac2569 100644 --- a/eng/generators.targets +++ b/eng/generators.targets @@ -21,7 +21,7 @@ or ('@(ProjectReference)' != '' and @(ProjectReference->AnyHaveMetadataValue('Identity', '$(CoreLibProject)'))) or ('$(NetCoreAppCurrentTargetFrameworkMoniker)' == '$(TargetFrameworkMoniker)' - and '$(DisableImplicitAssemblyReferences)' != 'true'))" /> + and '$(DisableImplicitFrameworkReferences)' != 'true'))" /> <EnabledGenerators Include="LibraryImportGenerator" Condition="'$(EnableLibraryImportGenerator)' == '' and '$(IsSourceProject)' == 'true' diff --git a/eng/targetingpacks.targets b/eng/targetingpacks.targets index b61f18b44c9..3033cb9c4d8 100644 --- a/eng/targetingpacks.targets +++ b/eng/targetingpacks.targets @@ -67,21 +67,13 @@ </Reference> </ItemGroup> - <Target Name="RemoveFrameworkReferences" - BeforeTargets="_HandlePackageFileConflicts" - AfterTargets="ResolveTargetingPackAssets" - Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'"> - <!-- Point MicrosoftNetCoreAppRefPackRefDir to the acquired targeting pack to use it later for AssemblySearchPaths resolution. --> - <PropertyGroup Condition="'$(TargetFrameworkVersion)' != 'v$(NetCoreAppCurrentVersion)'"> - <MicrosoftNetCoreAppRefPackRefDir>%(ResolvedFrameworkReference.TargetingPackPath)\ref\net$(TargetFrameworkVersion.TrimStart('v'))\</MicrosoftNetCoreAppRefPackRefDir> - </PropertyGroup> - </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> @@ -131,7 +123,7 @@ <!-- Filter out conflicting implicit assembly references. --> <Target Name="FilterImplicitAssemblyReferences" - Condition="'$(DisableImplicitAssemblyReferences)' != 'true'" + Condition="'$(DisableImplicitFrameworkReferences)' != 'true'" DependsOnTargets="ResolveProjectReferences" AfterTargets="ResolveTargetingPackAssets"> <ItemGroup> |