Skip to content

Commit

Permalink
Merge pull request #67 from jnm2/simplify_targets
Browse files Browse the repository at this point in the history 
Simplify targets
  • Loading branch information
@sharwell
sharwell authored Jan 3, 2020
2 parents da7f915 + cfcf06e commit 4951f6e
Showing 1 changed file with 18 additions and 130 deletions.
148 changes: 18 additions & 130 deletions ...VisionLabs.ReferenceAssemblyAnnotator/TunnelVisionLabs.ReferenceAssemblyAnnotator.targets
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,13 @@
</ResolveAssemblyReferencesDependsOn>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkVersion.Substring(1))' &gt;= '2.0'">
<_FrameworkReferenceName Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard'">NETStandard.Library</_FrameworkReferenceName>
<_FrameworkReferenceName Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp'">Microsoft.NETCore.App</_FrameworkReferenceName>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '3.0'">
<!-- This is the target that first produces the Reference items needed by each of these targets. -->
<!-- This is the target that first produces the Reference or ResolvedCompileFileDefinitionsToAdd items needed by each of these targets. -->
<RestoreTargetFrameworkDirectoryDependsOn>ResolveLockFileReferences</RestoreTargetFrameworkDirectoryDependsOn>
<AddStandardAssembliesForAnnotationDependsOn>ResolveLockFileReferences</AddStandardAssembliesForAnnotationDependsOn>
</PropertyGroup>
Expand Down Expand Up @@ -137,79 +142,21 @@
Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' OR '$(TargetFrameworkIdentifier)' == '.NETCoreApp'"
DependsOnTargets="$(RestoreTargetFrameworkDirectoryDependsOn)"
BeforeTargets="ResolveAvailableReferenceAssemblies">
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '2.0'">
<_TargetFrameworkReferences Include="@(Reference)"
Condition="
'%(NuGetPackageId)' == 'Microsoft.Win32.Primitives'
OR '%(NuGetPackageId)' == 'XXXSystem.AppContext'
OR '%(NuGetPackageId)' == 'System.Collections'
OR '%(NuGetPackageId)' == 'System.Collections.Concurrent'
OR '%(NuGetPackageId)' == 'XXXSystem.Console'
OR '%(NuGetPackageId)' == 'System.Diagnostics.Debug'
OR '%(NuGetPackageId)' == 'System.Diagnostics.Tools'
OR '%(NuGetPackageId)' == 'System.Diagnostics.Tracing'
OR '%(NuGetPackageId)' == 'System.Globalization'
OR '%(NuGetPackageId)' == 'System.Globalization.Calendars'
OR '%(NuGetPackageId)' == 'System.IO'
OR '%(NuGetPackageId)' == 'System.IO.Compression'
OR '%(NuGetPackageId)' == 'System.IO.Compression.ZipFile'
OR '%(NuGetPackageId)' == 'XXXSystem.IO.FileSystem'
OR '%(NuGetPackageId)' == 'XXXSystem.IO.FileSystem.Primitives'
OR '%(NuGetPackageId)' == 'System.Linq'
OR '%(NuGetPackageId)' == 'System.Linq.Expressions'
OR '%(NuGetPackageId)' == 'System.Net.Http'
OR '%(NuGetPackageId)' == 'System.Net.Primitives'
OR '%(NuGetPackageId)' == 'System.Net.Sockets'
OR '%(NuGetPackageId)' == 'System.ObjectModel'
OR '%(NuGetPackageId)' == 'System.Reflection'
OR '%(NuGetPackageId)' == 'System.Reflection.Extensions'
OR '%(NuGetPackageId)' == 'System.Reflection.Primitives'
OR '%(NuGetPackageId)' == 'System.Resources.ResourceManager'
OR '%(NuGetPackageId)' == 'System.Runtime'
OR '%(NuGetPackageId)' == 'System.Runtime.Extensions'
OR '%(NuGetPackageId)' == 'System.Runtime.Handles'
OR '%(NuGetPackageId)' == 'System.Runtime.InteropServices'
OR '%(NuGetPackageId)' == 'System.Runtime.InteropServices.RuntimeInformation'
OR '%(NuGetPackageId)' == 'System.Runtime.Numerics'
OR '%(NuGetPackageId)' == 'XXXSystem.Security.Cryptography.Algorithms'
OR '%(NuGetPackageId)' == 'XXXSystem.Security.Cryptography.Encoding'
OR '%(NuGetPackageId)' == 'XXXSystem.Security.Cryptography.Primitives'
OR '%(NuGetPackageId)' == 'XXXSystem.Security.Cryptography.X509Certificates'
OR '%(NuGetPackageId)' == 'System.Text.Encoding'
OR '%(NuGetPackageId)' == 'System.Text.Encoding.Extensions'
OR '%(NuGetPackageId)' == 'System.Text.RegularExpressions'
OR '%(NuGetPackageId)' == 'System.Threading'
OR '%(NuGetPackageId)' == 'System.Threading.Tasks'
OR '%(NuGetPackageId)' == 'System.Threading.Timer'
OR '%(NuGetPackageId)' == 'System.Xml.ReaderWriter'
OR '%(NuGetPackageId)' == 'System.Xml.XDocument'" />
<_TargetFrameworkNuGetPackageFoldersNoSlash Include="$([System.IO.Path]::GetDirectoryName('%(_TargetFrameworkReferences.Identity)'))" />
<_TargetFrameworkNuGetPackageFolders Include="$([MSBuild]::NormalizeDirectory('%(_TargetFrameworkNuGetPackageFoldersNoSlash.Identity)'))" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(NETStandardLibraryPackageVersion)' != ''">
<!-- .NET Standard 2.0 -->
<_NuGetPackageFoldersItems Include="$(NuGetPackageFolders)" />
<_TargetFrameworkNuGetPackageFolders Include="$([MSBuild]::NormalizeDirectory('%(_NuGetPackageFoldersItems.Identity)', 'netstandard.library', '$(NETStandardLibraryPackageVersion)', 'build', 'netstandard2.0', 'ref'))" />
</ItemGroup>
<ItemGroup Condition="'$(_FrameworkReferenceName)' != ''">
<_TargetFrameworkReferences Include="@(Reference)" Condition="'%(Reference.FrameworkReferenceName)' == '$(_FrameworkReferenceName)'
OR '%(Reference.PackageName)' == '$(_FrameworkReferenceName)'
OR '%(Reference.NuGetPackageId)' == '$(_FrameworkReferenceName)'" />

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion.Substring(1))' &gt;= '2.1'">
<_TargetFrameworkReferences Include="@(Reference)" Condition="'%(Reference.FrameworkReferenceName)' == 'NETStandard.Library'" />
<_TargetFrameworkNuGetPackageFoldersNoSlash Include="$([System.IO.Path]::GetDirectoryName('%(_TargetFrameworkReferences.Identity)'))" />
<_TargetFrameworkNuGetPackageFolders Include="$([MSBuild]::NormalizeDirectory('%(_TargetFrameworkNuGetPackageFoldersNoSlash.Identity)'))" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '2.0'">
<ItemGroup Condition="'$(TargetFrameworkVersion.Substring(1))' &lt; '2.0'">
<_TargetFrameworkNuGetPackageFoldersNoSlash Include="$([System.IO.Path]::GetDirectoryName('%(ResolvedCompileFileDefinitionsToAdd.Identity)'))" />
<_TargetFrameworkNuGetPackageFolders Include="$([MSBuild]::NormalizeDirectory('%(_TargetFrameworkNuGetPackageFoldersNoSlash.Identity)'))" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.Substring(1))' &gt;= '2.0'">
<_TargetFrameworkReferences Include="@(Reference)" Condition="'%(Reference.FrameworkReferenceName)' == 'Microsoft.NETCore.App' OR '%(Reference.PackageName)' == 'Microsoft.NETCore.App'" />
<_TargetFrameworkNuGetPackageFoldersNoSlash Include="$([System.IO.Path]::GetDirectoryName('%(_TargetFrameworkReferences.Identity)'))" />
<_TargetFrameworkNuGetPackageFolders Include="$([MSBuild]::NormalizeDirectory('%(_TargetFrameworkNuGetPackageFoldersNoSlash.Identity)'))" />
</ItemGroup>

<PropertyGroup>
<TargetFrameworkDirectory>@(_TargetFrameworkNuGetPackageFolders)</TargetFrameworkDirectory>
</PropertyGroup>
Expand All @@ -232,7 +179,6 @@
</When>
</Choose>

<!-- Automatically annotate .NET Standard assemblies -->
<Target Name="AddStandardAssembliesForAnnotation"
DependsOnTargets="$(AddStandardAssembliesForAnnotationDependsOn)"
BeforeTargets="ResolveOutputReferenceAssemblies">
Expand All @@ -250,79 +196,21 @@
OR '%(Reference.Identity)' == 'System.Xml.Linq')" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '2.0'">
<ItemGroup Condition="'$(_FrameworkReferenceName)' != ''">
<UnannotatedReferenceAssembly Include="@(Reference->'%(FileName)')"
Condition="Exists('$(AnnotatedReferenceAssemblyDirectory)%(Reference.FileName)%(Reference.Extension)')
AND ('%(Reference.NuGetPackageId)' == 'Microsoft.Win32.Primitives'
OR '%(Reference.NuGetPackageId)' == 'XXXSystem.AppContext'
OR '%(Reference.NuGetPackageId)' == 'System.Collections'
OR '%(Reference.NuGetPackageId)' == 'System.Collections.Concurrent'
OR '%(Reference.NuGetPackageId)' == 'XXXSystem.Console'
OR '%(Reference.NuGetPackageId)' == 'System.Diagnostics.Debug'
OR '%(Reference.NuGetPackageId)' == 'System.Diagnostics.Tools'
OR '%(Reference.NuGetPackageId)' == 'System.Diagnostics.Tracing'
OR '%(Reference.NuGetPackageId)' == 'System.Globalization'
OR '%(Reference.NuGetPackageId)' == 'System.Globalization.Calendars'
OR '%(Reference.NuGetPackageId)' == 'System.IO'
OR '%(Reference.NuGetPackageId)' == 'System.IO.Compression'
OR '%(Reference.NuGetPackageId)' == 'System.IO.Compression.ZipFile'
OR '%(Reference.NuGetPackageId)' == 'XXXSystem.IO.FileSystem'
OR '%(Reference.NuGetPackageId)' == 'XXXSystem.IO.FileSystem.Primitives'
OR '%(Reference.NuGetPackageId)' == 'System.Linq'
OR '%(Reference.NuGetPackageId)' == 'System.Linq.Expressions'
OR '%(Reference.NuGetPackageId)' == 'System.Net.Http'
OR '%(Reference.NuGetPackageId)' == 'System.Net.Primitives'
OR '%(Reference.NuGetPackageId)' == 'System.Net.Sockets'
OR '%(Reference.NuGetPackageId)' == 'System.ObjectModel'
OR '%(Reference.NuGetPackageId)' == 'System.Reflection'
OR '%(Reference.NuGetPackageId)' == 'System.Reflection.Extensions'
OR '%(Reference.NuGetPackageId)' == 'System.Reflection.Primitives'
OR '%(Reference.NuGetPackageId)' == 'System.Resources.ResourceManager'
OR '%(Reference.NuGetPackageId)' == 'System.Runtime'
OR '%(Reference.NuGetPackageId)' == 'System.Runtime.Extensions'
OR '%(Reference.NuGetPackageId)' == 'System.Runtime.Handles'
OR '%(Reference.NuGetPackageId)' == 'System.Runtime.InteropServices'
OR '%(Reference.NuGetPackageId)' == 'System.Runtime.InteropServices.RuntimeInformation'
OR '%(Reference.NuGetPackageId)' == 'System.Runtime.Numerics'
OR '%(Reference.NuGetPackageId)' == 'XXXSystem.Security.Cryptography.Algorithms'
OR '%(Reference.NuGetPackageId)' == 'XXXSystem.Security.Cryptography.Encoding'
OR '%(Reference.NuGetPackageId)' == 'XXXSystem.Security.Cryptography.Primitives'
OR '%(Reference.NuGetPackageId)' == 'XXXSystem.Security.Cryptography.X509Certificates'
OR '%(Reference.NuGetPackageId)' == 'System.Text.Encoding'
OR '%(Reference.NuGetPackageId)' == 'System.Text.Encoding.Extensions'
OR '%(Reference.NuGetPackageId)' == 'System.Text.RegularExpressions'
OR '%(Reference.NuGetPackageId)' == 'System.Threading'
OR '%(Reference.NuGetPackageId)' == 'System.Threading.Tasks'
OR '%(Reference.NuGetPackageId)' == 'System.Threading.Timer'
OR '%(Reference.NuGetPackageId)' == 'System.Xml.ReaderWriter'
OR '%(Reference.NuGetPackageId)' == 'System.Xml.XDocument')"
Condition="('%(Reference.FrameworkReferenceName)' == '$(_FrameworkReferenceName)'
OR '%(Reference.PackageName)' == '$(_FrameworkReferenceName)'
OR '%(Reference.NuGetPackageId)' == '$(_FrameworkReferenceName)')
AND Exists('$(AnnotatedReferenceAssemblyDirectory)%(Reference.FileName)%(Reference.Extension)')"
OriginalReference="%(Reference.Identity)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(NETStandardLibraryPackageVersion)' != ''">
<!-- .NET Standard 2.0 -->
<UnannotatedReferenceAssembly Include="@(Reference->'%(FileName)')"
Condition="'%(Reference.NuGetPackageId)' == 'NETStandard.Library' AND Exists('$(AnnotatedReferenceAssemblyDirectory)%(Reference.FileName)%(Reference.Extension)')"
OriginalReference="%(Reference.Identity)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETStandard' AND '$(TargetFrameworkVersion.Substring(1))' &gt;= '2.1'">
<UnannotatedReferenceAssembly Include="@(Reference->'%(FileName)')"
Condition="'%(Reference.FrameworkReferenceName)' == 'NETStandard.Library' AND Exists('$(AnnotatedReferenceAssemblyDirectory)%(Reference.FileName)%(Reference.Extension)')"
OriginalReference="%(Reference.Identity)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.Substring(1))' &lt; '2.0'">
<ItemGroup Condition="('$(TargetFrameworkIdentifier)' == '.NETStandard' OR '$(TargetFrameworkIdentifier)' == '.NETCoreApp')
AND '$(TargetFrameworkVersion.Substring(1))' &lt; '2.0'">
<UnannotatedReferenceAssembly Include="@(ResolvedCompileFileDefinitionsToAdd->'%(FileName)')"
Condition="Exists('$(AnnotatedReferenceAssemblyDirectory)%(ResolvedCompileFileDefinitionsToAdd.FileName)%(ResolvedCompileFileDefinitionsToAdd.Extension)')"
OriginalReference="%(ResolvedCompileFileDefinitionsToAdd.Identity)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' AND '$(TargetFrameworkVersion.Substring(1))' &gt;= '2.0'">
<UnannotatedReferenceAssembly Include="@(Reference->'%(FileName)')"
Condition="('%(Reference.FrameworkReferenceName)' == 'Microsoft.NETCore.App' OR '%(Reference.PackageName)' == 'Microsoft.NETCore.App') AND Exists('$(AnnotatedReferenceAssemblyDirectory)%(Reference.FileName)%(Reference.Extension)')"
OriginalReference="%(Reference.Identity)" />
</ItemGroup>
</Target>

<Target Name="UpdateReferences"
Expand Down

0 comments on commit 4951f6e

Please sign in to comment.