From 366767774c809482fad112f87f51e14738c0778d Mon Sep 17 00:00:00 2001
From: Jerome Haltom <jhaltom@alethic.solutions>
Date: Sun, 20 Nov 2022 12:04:53 -0600
Subject: [PATCH] Include self. Condition to hide Transform.

---
 Directory.Build.targets                       | 560 +-----------------
 src/IKVM.Core.MSBuild/Class1.cs               |   9 -
 .../IKVM.Core.MSBuild.csproj                  |   3 +-
 .../netstandard2.0/Transform.targets          |   2 +-
 src/dist-nuget/dist-nuget.csproj              |   2 +-
 5 files changed, 5 insertions(+), 571 deletions(-)
 delete mode 100644 src/IKVM.Core.MSBuild/Class1.cs

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 95b6ca4..583be33 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,563 +1,5 @@
 <Project>
 
-    <PropertyGroup>
-        <_GlobalPropertiesToRemoveFromProjectReferences>$(_GlobalPropertiesToRemoveFromProjectReferences);_GlobalPropertiesToRemoveFromProjectReferences;PublishDir;PackageOutputPath;</_GlobalPropertiesToRemoveFromProjectReferences>
-    </PropertyGroup>
-
-    <ItemDefinitionGroup>
-        <ResolvedFileToPublish>
-            <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
-        </ResolvedFileToPublish>
-    </ItemDefinitionGroup>
-
-    <UsingTask TaskName="Transform" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-        <ParameterGroup>
-            <Items ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
-            <Parameters ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                foreach (var file in Items)
-                {
-                    var i = file.ItemSpec;
-                    var o = file.GetMetadata("TargetPath");
-                    var c = File.ReadAllText(i);
-                    foreach (var parameter in Parameters)
-                    {
-                        var n = parameter.ItemSpec;
-                        var v = parameter.GetMetadata("Value");
-                        c = c.Replace($"#{n}#", v);
-                    }
-                    
-                    // check that there is actually a change
-                    if (File.Exists(o) && File.ReadAllText(o) == c)
-                        continue;
-                    
-                    Directory.CreateDirectory(Path.GetDirectoryName(o));
-                    File.WriteAllText(o, c);
-                }
-                ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-
-    <Target Name="Transform" BeforeTargets="BeforeBuild" Inputs="@(Transform)" Outputs="@(Transform->'%(TargetPath)')" Condition=" '$(TargetFramework)' != '' ">
-        <Transform Items="@(Transform)" Parameters="@(TransformValues)" />
-    </Target>
-
-    <!-- Adds an index value to each item. Can be used to ensure at least one unique metadata value is available on each item. -->
-    <UsingTask TaskName="AddIndexMetadata" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-        <ParameterGroup>
-            <Items ParameterType="Microsoft.Build.Framework.ITaskItem[]" Required="true" Output="true" />
-            <MetadataName ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Using Namespace="System" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                var i = 0;
-                foreach (var item in Items)
-                    item.SetMetadata(MetadataName, (i++).ToString());
-                ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-
-    <UsingTask TaskName="ReplaceFileText" TaskFactory="RoslynCodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.Core.dll">
-        <ParameterGroup>
-            <InputFilename ParameterType="System.String" Required="true" />
-            <OutputFilename ParameterType="System.String" Required="true" />
-            <MatchExpression ParameterType="System.String" Required="true" />
-            <ReplacementText ParameterType="System.String" Required="true" />
-        </ParameterGroup>
-        <Task>
-            <Reference Include="System.Core" />
-            <Using Namespace="System" />
-            <Using Namespace="System.IO" />
-            <Using Namespace="System.Text.RegularExpressions" />
-            <Code Type="Fragment" Language="cs">
-                <![CDATA[
-                File.WriteAllText(OutputFilename,Regex.Replace(File.ReadAllText(InputFilename), MatchExpression, ReplacementText));
-                ]]>
-            </Code>
-        </Task>
-    </UsingTask>
-
-    <!-- Attempt to remove the PublishDir from the evaluation graph to prevent multiple evaluation. -->
-    <Target Name="AddGlobalPropertiesToRemoveFromProperty" BeforeTargets="AssignProjectConfiguration">
-        <ItemGroup>
-            <ProjectReference Update="@(ProjectReference)">
-                <GlobalPropertiesToRemove>%(ProjectReference.GlobalPropertiesToRemove);$(_GlobalPropertiesToRemoveFromProjectReferences)</GlobalPropertiesToRemove>
-            </ProjectReference>
-        </ItemGroup>
-    </Target>
-
-    <!-- Publish target that returns publish directory. -->
-    <Target Name="GetPublishDir" DependsOnTargets="Publish" Returns="$(_PublishDir)">
-        <PropertyGroup>
-            <_PublishDir>$([System.IO.Path]::GetFullPath('$(PublishDir)'))</_PublishDir>
-        </PropertyGroup>
-    </Target>
-
-
-    <!-- 
-    
-        LibProjectReference
-        
-        These references point to native vcxprojs and have their produced libraries added to the project output.
-        
-    -->
-
-    <Target Name="AssignLibProjectConfiguration" Condition=" '$(DesignTimeBuild)' != 'true' And '@(LibProjectReference)' != '' ">
-        <ItemGroup>
-            <___LibProjectReference Include="@(LibProjectReference)">
-                <_SetPlatform>%(SetPlatform)</_SetPlatform>
-            </___LibProjectReference>
-        </ItemGroup>
-        <PropertyGroup>
-            <OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration Condition="'$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)' == ''">true</OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration>
-            <ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == '' and ('$(BuildingInsideVisualStudio)' == 'true' or '$(BuildingSolutionFile)' == 'true')">true</ShouldUnsetParentConfigurationAndPlatform>
-            <ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == ''">false</ShouldUnsetParentConfigurationAndPlatform>
-        </PropertyGroup>
-        <AssignProjectConfiguration ProjectReferences="@(___LibProjectReference)" CurrentProject="$(MSBuildProjectFullPath)" CurrentProjectConfiguration="$(Configuration)" CurrentProjectPlatform="$(Platform)" DefaultToVcxPlatformMapping="$(DefaultToVcxPlatformMapping)" VcxToDefaultPlatformMapping="$(VcxToDefaultPlatformMapping)" OutputType="$(OutputType)" ResolveConfigurationPlatformUsingMappings="true" SolutionConfigurationContents="$(CurrentSolutionConfigurationContents)" AddSyntheticProjectReferencesForSolutionDependencies="false" OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration="$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)" ShouldUnsetParentConfigurationAndPlatform="$(ShouldUnsetParentConfigurationAndPlatform)">
-            <Output TaskParameter="AssignedProjects" ItemName="__LibProjectReferenceWithConfiguration"/>
-            <Output TaskParameter="UnassignedProjects" ItemName="__LibProjectReferenceWithConfiguration"/>
-        </AssignProjectConfiguration>
-        <ItemGroup>
-            <_LibProjectReferenceWithConfiguration Include="@(__LibProjectReferenceWithConfiguration)">
-                <SetPlatform>%(_SetPlatform)</SetPlatform>
-            </_LibProjectReferenceWithConfiguration>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetLibProjectReferences" DependsOnTargets="AssignLibProjectConfiguration" Condition=" '@(_LibProjectReferenceWithConfiguration)' != '' ">
-        <ItemGroup>
-            <__LibProjectReference Include="@(_LibProjectReferenceWithConfiguration)">
-                <ProjectName>$([System.IO.Path]::GetFileNameWithoutExtension('%(Identity)'))</ProjectName>
-                <LibTargetPath Condition=" '%(_LibProjectReferenceWithConfiguration.LibTargetPath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_LibProjectReferenceWithConfiguration.LibTargetPath)'))</LibTargetPath>
-                <LibPackagePath Condition=" '%(_LibProjectReferenceWithConfiguration.LibPackagePath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_LibProjectReferenceWithConfiguration.LibPackagePath)'))</LibPackagePath>
-            </__LibProjectReference>
-        </ItemGroup>
-        <AddIndexMetadata Items="@(__LibProjectReference)" MetadataName="_Index">
-            <Output TaskParameter="Items" ItemName="_LibProjectReference" />
-        </AddIndexMetadata>
-    </Target>
-
-    <Target Name="GetLibProjectReferenceItems" DependsOnTargets="GetLibProjectReferences" Inputs="@(_LibProjectReference)" Outputs="@(_LibProjectReference->'%(Identity)\%(_Index)\null')" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_LibProjectReference)' != '' ">
-        <ItemGroup>
-            <_LibProjectReferencesToTarget Include="@(_LibProjectReference)">
-                <Properties>%(_LibProjectReference.SetConfiguration);%(_LibProjectReference.SetPlatform)</Properties>
-            </_LibProjectReferencesToTarget>
-        </ItemGroup>
-        <MSBuild Projects="@(_LibProjectReferencesToTarget)" Targets="Build" BuildInParallel="False" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;RuntimeIdentifier" />
-        <MSBuild Projects="@(_LibProjectReferencesToTarget)" Targets="GetTargetPath" BuildInParallel="False" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;RuntimeIdentifier" RebaseOutputs="true">
-            <Output TaskParameter="TargetOutputs" ItemName="_ResolvedLibProjectReferenceTargetOutput" />
-        </MSBuild>
-        <ItemGroup>
-            <_LibProjectReferenceTargetOutput Include="@(_ResolvedLibProjectReferenceTargetOutput)">
-                <ProjectName>%(_ResolvedLibProjectReferenceTargetOutput.ProjectName)</ProjectName>
-                <LibTargetPath>%(_ResolvedLibProjectReferenceTargetOutput.LibTargetPath)</LibTargetPath>
-                <LibPackagePath>%(_ResolvedLibProjectReferenceTargetOutput.LibPackagePath)</LibPackagePath>
-                <Pack>%(_ResolvedLibProjectReferenceTargetOutput.Pack)</Pack>
-            </_LibProjectReferenceTargetOutput>
-            <_LibProjectReferenceItems Include="@(_LibProjectReferenceTargetOutput)">
-                <TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
-            </_LibProjectReferenceItems>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetLibProjectReferenceCopyToOutputDirectoryItems" BeforeTargets="Build;AssignTargetPaths" DependsOnTargets="GetLibProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' and '@(_LibProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <ContentWithTargetPath Include="@(_LibProjectReferenceItems)" Condition=" '%(_LibProjectReferenceItems.LibTargetPath)' != '' ">
-                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-                <TargetPath>$([MSBuild]::MakeRelative('.', '%(_LibProjectReferenceItems.LibTargetPath)%(_LibProjectReferenceItems.TargetPath)'))</TargetPath>
-                <Pack>false</Pack>
-            </ContentWithTargetPath>
-        </ItemGroup>
-    </Target>
-
-    <PropertyGroup>
-        <GetCopyToOutputDirectoryItemsDependsOn>
-            AssignLibProjectConfiguration;
-            GetLibProjectReferences;
-            GetLibProjectReferenceItems;
-            GetLibProjectReferenceCopyToOutputDirectoryItems;
-            $(GetCopyToOutputDirectoryItemsDependsOn);
-        </GetCopyToOutputDirectoryItemsDependsOn>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);GetLibProjectReferenceTfmSpecificContent</TargetsForTfmSpecificContentInPackage>
-    </PropertyGroup>
-
-    <Target Name="GetLibProjectReferenceTfmSpecificContent" DependsOnTargets="GetLibProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' and '@(_LibProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <TfmSpecificPackageFile Include="@(_LibProjectReferenceItems)" Condition=" '%(_LibProjectReferenceItems.LibTargetPath)' != '' And '%(_LibProjectReferenceItems.Pack)' != 'false' ">
-                <PackagePath>contentFiles\any\$(TargetFramework)\%(_LibProjectReferenceItems.LibTargetPath)</PackagePath>
-                <PackagePath Condition=" '%(_LibProjectReferenceItems.LibPackagePath)' != '' ">contentFiles\any\$(TargetFramework)\%(_LibProjectReferenceItems.LibPackagePath)</PackagePath>
-            </TfmSpecificPackageFile>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetLibProjectReferencePackageItems" DependsOnTargets="GetLibProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_LibProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <_PackageFiles Include="@(_LibProjectReferenceItems)" Condition=" '%(_LibProjectReferenceItems.LibPackagePath)' != '' And '%(_LibProjectReferenceItems.Pack)' != 'false' ">
-                <PackagePath>%(_LibProjectReferenceItems.LibPackagePath)</PackagePath>
-            </_PackageFiles>
-        </ItemGroup>
-    </Target>
-
-    <PropertyGroup>
-        <GetLibProjectReferenceItemsBeforePackageFilesDependsOn>
-            AssignLibProjectConfiguration;
-            GetLibProjectReferences;
-            GetLibProjectReferenceItems;
-            GetLibProjectReferencePackageItems;
-            $(GetLibProjectReferenceItemsBeforePackageFilesDependsOn);
-        </GetLibProjectReferenceItemsBeforePackageFilesDependsOn>
-    </PropertyGroup>
-
-    <Target Name="GetLibProjectReferencePackageItemsBeforeGetPackageFiles" DependsOnTargets="$(GetLibProjectReferenceItemsBeforePackageFilesDependsOn)" BeforeTargets="_GetPackageFiles" Condition=" '$(DesignTimeBuild)' != 'true' ">
-
-    </Target>
-
-    <!-- 
-    
-        PublishProjectReference
-        
-        These references have their Publish target invoked, with the output being consumed by the containing project.
-        
-    -->
-
-    <Target Name="AssignPublishProjectConfiguration" Condition=" '$(DesignTimeBuild)' != 'true' And '@(PublishProjectReference)' != '' ">
-        <PropertyGroup>
-            <OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration Condition="'$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)' == ''">true</OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration>
-            <ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == '' and ('$(BuildingInsideVisualStudio)' == 'true' or '$(BuildingSolutionFile)' == 'true')">true</ShouldUnsetParentConfigurationAndPlatform>
-            <ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == ''">false</ShouldUnsetParentConfigurationAndPlatform>
-        </PropertyGroup>
-        <AssignProjectConfiguration ProjectReferences="@(PublishProjectReference)" CurrentProject="$(MSBuildProjectFullPath)" CurrentProjectConfiguration="$(Configuration)" CurrentProjectPlatform="$(Platform)" DefaultToVcxPlatformMapping="$(DefaultToVcxPlatformMapping)" VcxToDefaultPlatformMapping="$(VcxToDefaultPlatformMapping)" OutputType="$(OutputType)" ResolveConfigurationPlatformUsingMappings="false" SolutionConfigurationContents="$(CurrentSolutionConfigurationContents)" AddSyntheticProjectReferencesForSolutionDependencies="false" OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration="$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)" ShouldUnsetParentConfigurationAndPlatform="$(ShouldUnsetParentConfigurationAndPlatform)">
-            <Output TaskParameter="AssignedProjects" ItemName="_PublishProjectReferenceWithConfiguration"/>
-            <Output TaskParameter="UnassignedProjects" ItemName="_PublishProjectReferenceWithConfiguration"/>
-        </AssignProjectConfiguration>
-    </Target>
-
-    <Target Name="GetPublishProjectReferences" DependsOnTargets="AssignPublishProjectConfiguration" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_PublishProjectReferenceWithConfiguration)' != '' ">
-        <ItemGroup>
-            <__PublishProjectReference Include="@(_PublishProjectReferenceWithConfiguration)">
-                <ProjectName>$([System.IO.Path]::GetFileNameWithoutExtension('%(Identity)'))</ProjectName>
-                <ProjectTargetPath Condition=" '%(_PublishProjectReferenceWithConfiguration.ProjectTargetPath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_PublishProjectReferenceWithConfiguration.ProjectTargetPath)'))</ProjectTargetPath>
-                <ProjectPackagePath Condition=" '%(_PublishProjectReferenceWithConfiguration.ProjectPackagePath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_PublishProjectReferenceWithConfiguration.ProjectPackagePath)'))</ProjectPackagePath>
-            </__PublishProjectReference>
-        </ItemGroup>
-        <AddIndexMetadata Items="@(__PublishProjectReference)" MetadataName="_Index">
-            <Output TaskParameter="Items" ItemName="_PublishProjectReference" />
-        </AddIndexMetadata>
-    </Target>
-
-    <Target Name="GetPublishProjectReferenceItems" DependsOnTargets="GetPublishProjectReferences" Inputs="@(_PublishProjectReference)" Outputs="@(_PublishProjectReference->'%(Identity)\%(_Index)\null')" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_PublishProjectReference)' != '' ">
-        <ItemGroup>
-            <_PublishProjectReferencesToBuildTarget Include="@(_PublishProjectReference)">
-                <Properties>%(_PublishProjectReference.SetConfiguration);%(_PublishProjectReference.SetPlatform);%(_PublishProjectReference.SetTargetFramework)</Properties>
-            </_PublishProjectReferencesToBuildTarget>
-            <_PublishProjectReferencesToPublishTarget Include="@(_PublishProjectReference)">
-                <Properties>%(_PublishProjectReference.SetConfiguration);%(_PublishProjectReference.SetPlatform);%(_PublishProjectReference.SetTargetFramework);%(_PublishProjectReference.SetRuntimeIdentifier)</Properties>
-            </_PublishProjectReferencesToPublishTarget>
-        </ItemGroup>
-        <MSBuild Projects="@(_PublishProjectReferencesToBuildTarget)" Targets="Build" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier" />
-        <MSBuild Projects="@(_PublishProjectReferencesToPublishTarget)" Targets="GetPublishDir" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences)" RebaseOutputs="true">
-            <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPublishProjectReferencePublishDir" />
-        </MSBuild>
-        <ItemGroup>
-            <_PublishProjectReferenceInputItems Include="%(_ResolvedPublishProjectReferencePublishDir.Identity)\**\*">
-                <ProjectName>%(_ResolvedPublishProjectReferencePublishDir.ProjectName)</ProjectName>
-                <ProjectTargetPath>%(_ResolvedPublishProjectReferencePublishDir.ProjectTargetPath)</ProjectTargetPath>
-                <ProjectPackagePath>%(_ResolvedPublishProjectReferencePublishDir.ProjectPackagePath)</ProjectPackagePath>
-                <Pack>%(_ResolvedPublishProjectReferencePublishDir.Pack)</Pack>
-            </_PublishProjectReferenceInputItems>
-            <_PublishProjectReferenceItems Include="@(_PublishProjectReferenceInputItems)">
-                <TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
-            </_PublishProjectReferenceItems>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetPublishProjectReferenceCopyToOutputDirectoryItems" BeforeTargets="Build;AssignTargetPaths" DependsOnTargets="GetPublishProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' and '@(_PublishProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <ContentWithTargetPath Include="@(_PublishProjectReferenceItems)" Condition=" '%(_PublishProjectReferenceItems.ProjectTargetPath)' != '' ">
-                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-                <TargetPath>$([MSBuild]::MakeRelative('.', '%(_PublishProjectReferenceItems.ProjectTargetPath)%(_PublishProjectReferenceItems.TargetPath)'))</TargetPath>
-                <Pack>false</Pack>
-            </ContentWithTargetPath>
-        </ItemGroup>
-    </Target>
-
-    <PropertyGroup>
-        <GetCopyToOutputDirectoryItemsDependsOn>
-            AssignPublishProjectConfiguration;
-            GetPublishProjectReferences;
-            GetPublishProjectReferenceItems;
-            GetPublishProjectReferenceCopyToOutputDirectoryItems;
-            $(GetCopyToOutputDirectoryItemsDependsOn);
-        </GetCopyToOutputDirectoryItemsDependsOn>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);GetPublishProjectReferenceTfmSpecificContent</TargetsForTfmSpecificContentInPackage>
-    </PropertyGroup>
-
-    <Target Name="GetPublishProjectReferenceTfmSpecificContent" DependsOnTargets="GetPublishProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' and '@(_PublishProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <TfmSpecificPackageFile Include="@(_PublishProjectReferenceItems)" Condition=" '%(_PublishProjectReferenceItems.ProjectTargetPath)' != '' And '%(_PublishProjectReferenceItems.Pack)' != 'false' ">
-                <PackagePath>contentFiles\any\$(TargetFramework)\%(_PublishProjectReferenceItems.ProjectTargetPath)</PackagePath>
-                <PackagePath Condition=" '%(_PublishProjectReferenceItems.ProjectPackagePath)' != '' ">contentFiles\any\$(TargetFramework)\%(_PublishProjectReferenceItems.ProjectPackagePath)</PackagePath>
-            </TfmSpecificPackageFile>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetPublishProjectReferencePackageItems" DependsOnTargets="GetPublishProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_PublishProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <_PackageFiles Include="@(_PublishProjectReferenceItems)" Condition=" '%(_PublishProjectReferenceItems.ProjectPackagePath)' != '' And '%(_PublishProjectReferenceItems.Pack)' != 'false' ">
-                <PackagePath>%(_PublishProjectReferenceItems.ProjectPackagePath)</PackagePath>
-            </_PackageFiles>
-        </ItemGroup>
-    </Target>
-
-    <PropertyGroup>
-        <GetPublishProjectReferenceItemsBeforePackageFilesDependsOn>
-            AssignPublishProjectConfiguration;
-            GetPublishProjectReferences;
-            GetPublishProjectReferenceItems;
-            GetPublishProjectReferencePackageItems;
-            $(GetPublishProjectReferenceItemsBeforePackageFilesDependsOn);
-        </GetPublishProjectReferenceItemsBeforePackageFilesDependsOn>
-    </PropertyGroup>
-
-    <Target Name="GetPublishProjectReferencePackageItemsBeforeGetPackageFiles" DependsOnTargets="$(GetPublishProjectReferenceItemsBeforePackageFilesDependsOn)" BeforeTargets="_GetPackageFiles" Condition=" '$(DesignTimeBuild)' != 'true' ">
-
-    </Target>
-
-    <!--
-    
-        IncludeProjectReference
-        
-        These references have their build output included into the content output of the consuming project.
-        
-    -->
-
-    <Target Name="AssignIncludeProjectConfiguration" Condition=" '$(DesignTimeBuild)' != 'true' And '@(IncludeProjectReference)' != '' ">
-        <PropertyGroup>
-            <OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration Condition="'$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)' == ''">true</OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration>
-            <ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == '' and ('$(BuildingInsideVisualStudio)' == 'true' or '$(BuildingSolutionFile)' == 'true')">true</ShouldUnsetParentConfigurationAndPlatform>
-            <ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == ''">false</ShouldUnsetParentConfigurationAndPlatform>
-        </PropertyGroup>
-        <AssignProjectConfiguration ProjectReferences="@(IncludeProjectReference)" CurrentProject="$(MSBuildProjectFullPath)" CurrentProjectConfiguration="$(Configuration)" CurrentProjectPlatform="$(Platform)" DefaultToVcxPlatformMapping="$(DefaultToVcxPlatformMapping)" VcxToDefaultPlatformMapping="$(VcxToDefaultPlatformMapping)" OutputType="$(OutputType)" ResolveConfigurationPlatformUsingMappings="false" SolutionConfigurationContents="$(CurrentSolutionConfigurationContents)" AddSyntheticProjectReferencesForSolutionDependencies="false" OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration="$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)" ShouldUnsetParentConfigurationAndPlatform="$(ShouldUnsetParentConfigurationAndPlatform)">
-            <Output TaskParameter="AssignedProjects" ItemName="_IncludeProjectReferenceWithConfiguration"/>
-            <Output TaskParameter="UnassignedProjects" ItemName="_IncludeProjectReferenceWithConfiguration"/>
-        </AssignProjectConfiguration>
-    </Target>
-
-    <Target Name="GetIncludeProjectReferences" DependsOnTargets="AssignIncludeProjectConfiguration" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_IncludeProjectReferenceWithConfiguration)' != '' ">
-        <ItemGroup>
-            <__IncludeProjectReference Include="@(_IncludeProjectReferenceWithConfiguration)">
-                <ProjectName>$([System.IO.Path]::GetFileNameWithoutExtension('%(Identity)'))</ProjectName>
-                <IncludeTargetPath Condition=" '%(_IncludeProjectReferenceWithConfiguration.IncludeTargetPath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_IncludeProjectReferenceWithConfiguration.IncludeTargetPath)'))</IncludeTargetPath>
-                <IncludePackagePath Condition=" '%(_IncludeProjectReferenceWithConfiguration.IncludePackagePath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_IncludeProjectReferenceWithConfiguration.IncludePackagePath)'))</IncludePackagePath>
-            </__IncludeProjectReference>
-        </ItemGroup>
-        <AddIndexMetadata Items="@(__IncludeProjectReference)" MetadataName="_Index">
-            <Output TaskParameter="Items" ItemName="_IncludeProjectReference" />
-        </AddIndexMetadata>
-    </Target>
-
-    <Target Name="GetIncludeProjectReferenceItems" DependsOnTargets="GetIncludeProjectReferences" Inputs="@(_IncludeProjectReference)" Outputs="@(_IncludeProjectReference->'%(Identity)\%(_Index)\null')" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_IncludeProjectReference)' != '' ">
-        <ItemGroup>
-            <_IncludeProjectReferencesToTarget Include="@(_IncludeProjectReference)">
-                <Properties>%(_IncludeProjectReference.SetConfiguration);%(_IncludeProjectReference.SetPlatform);%(_IncludeProjectReference.SetTargetFramework)</Properties>
-            </_IncludeProjectReferencesToTarget>
-        </ItemGroup>
-        <MSBuild Projects="@(_IncludeProjectReferencesToTarget)" Targets="Build" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier" />
-        <MSBuild Projects="@(_IncludeProjectReferencesToTarget)" Targets="BuiltProjectOutputGroup" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);RuntimeIdentifier" RebaseOutputs="true">
-            <Output TaskParameter="TargetOutputs" ItemName="_ResolvedIncludeProjectReferenceItems" />
-        </MSBuild>
-        <ItemGroup>
-            <_IncludeProjectReferenceItemsInput Include="@(_ResolvedIncludeProjectReferenceItems)">
-                <ProjectName>%(_ResolvedIncludeProjectReferenceItems.ProjectName)</ProjectName>
-                <IncludeTargetPath>%(_ResolvedIncludeProjectReferenceItems.IncludeTargetPath)</IncludeTargetPath>
-                <IncludePackagePath>%(_ResolvedIncludeProjectReferenceItems.IncludePackagePath)</IncludePackagePath>
-                <Pack>%(_ResolvedIncludeProjectReferenceItems.Pack)</Pack>
-            </_IncludeProjectReferenceItemsInput>
-            <_IncludeProjectReferenceItems Include="@(_IncludeProjectReferenceItemsInput)">
-                <TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
-            </_IncludeProjectReferenceItems>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetIncludeProjectReferenceCopyToOutputDirectoryItems" DependsOnTargets="GetIncludeProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' ">
-        <ItemGroup>
-            <ContentWithTargetPath Include="@(_IncludeProjectReferenceItems)" Condition=" '%(_IncludeProjectReferenceItems.IncludeTargetPath)' != '' And '%(_IncludeProjectReferenceItems.TargetPath)' != '' ">
-                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-                <TargetPath>$([MSBuild]::MakeRelative('.', '%(_IncludeProjectReferenceItems.IncludeTargetPath)%(_IncludeProjectReferenceItems.TargetPath)'))</TargetPath>
-                <Pack>false</Pack>
-            </ContentWithTargetPath>
-        </ItemGroup>
-    </Target>
-
-    <PropertyGroup>
-        <GetCopyToOutputDirectoryItemsDependsOn>
-            AssignIncludeProjectConfiguration;
-            GetIncludeProjectReferences;
-            GetIncludeProjectReferenceItems;
-            GetIncludeProjectReferenceCopyToOutputDirectoryItems;
-            $(GetCopyToOutputDirectoryItemsDependsOn);
-        </GetCopyToOutputDirectoryItemsDependsOn>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);GetIncludeProjectReferenceTfmSpecificContent</TargetsForTfmSpecificContentInPackage>
-    </PropertyGroup>
-
-    <Target Name="GetIncludeProjectReferenceTfmSpecificContent" DependsOnTargets="GetIncludeProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_IncludeProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <TfmSpecificPackageFile Include="@(_IncludeProjectReferenceItems)" Condition=" '%(_IncludeProjectReferenceItems.IncludeTargetPath)' != '' And '%(_IncludeProjectReferenceItems.Pack)' != 'false' ">
-                <PackagePath>contentFiles\any\$(TargetFramework)\%(_IncludeProjectReferenceItems.IncludeTargetPath)</PackagePath>
-                <PackagePath Condition=" '%(_IncludeProjectReferenceItems.IncludePackagePath)' != '' ">contentFiles\any\$(TargetFramework)\%(_IncludeProjectReferenceItems.IncludePackagePath)</PackagePath>
-            </TfmSpecificPackageFile>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetIncludeProjectReferencePackageItems" DependsOnTargets="GetIncludeProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_IncludeProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <_PackageFiles Include="@(_IncludeProjectReferenceItems)" Condition=" '%(_IncludeProjectReferenceItems.IncludePackagePath)' != '' And '%(_IncludeProjectReferenceItems.Pack)' != 'false' ">
-                <PackagePath>%(_IncludeProjectReferenceItems.IncludePackagePath)</PackagePath>
-            </_PackageFiles>
-        </ItemGroup>
-    </Target>
-
-    <PropertyGroup>
-        <GetIncludeProjectReferenceItemsBeforePackageFilesDependsOn>
-            AssignIncludeProjectConfiguration;
-            GetIncludeProjectReferences;
-            GetIncludeProjectReferenceItems;
-            GetIncludeProjectReferencePackageItems;
-            $(GetIncludeProjectReferenceItemsBeforePackageFilesDependsOn);
-        </GetIncludeProjectReferenceItemsBeforePackageFilesDependsOn>
-    </PropertyGroup>
-
-    <Target Name="GetIncludeProjectReferencePackageItemsBeforeGetPackageFiles" DependsOnTargets="$(GetIncludeProjectReferenceItemsBeforePackageFilesDependsOn)" BeforeTargets="_GetPackageFiles" Condition=" '$(DesignTimeBuild)' != 'true' ">
-
-    </Target>
-
-    <!--
-    
-        PackageProjectReference
-        
-        These references have their produced NuGet file (Pack target) copied into the consuming project as a content file.
-        
-    -->
-
-    <Target Name="GetPackageOutputPath" DependsOnTargets="_GetAbsoluteOutputPathsForPack" Returns="$(PackageOutputAbsolutePath)">
-
-    </Target>
-
-    <Target Name="AssignPackageProjectConfiguration" Condition=" '$(DesignTimeBuild)' != 'true' And '@(PackageProjectReference)' != '' " >
-        <PropertyGroup>
-            <OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration Condition="'$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)' == ''">true</OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration>
-            <ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == '' and ('$(BuildingInsideVisualStudio)' == 'true' or '$(BuildingSolutionFile)' == 'true')">true</ShouldUnsetParentConfigurationAndPlatform>
-            <ShouldUnsetParentConfigurationAndPlatform Condition="'$(ShouldUnsetParentConfigurationAndPlatform)' == ''">false</ShouldUnsetParentConfigurationAndPlatform>
-        </PropertyGroup>
-        <AssignProjectConfiguration ProjectReferences="@(PackageProjectReference)" CurrentProject="$(MSBuildProjectFullPath)" CurrentProjectConfiguration="$(Configuration)" CurrentProjectPlatform="$(Platform)" DefaultToVcxPlatformMapping="$(DefaultToVcxPlatformMapping)" VcxToDefaultPlatformMapping="$(VcxToDefaultPlatformMapping)" OutputType="$(OutputType)" ResolveConfigurationPlatformUsingMappings="false" SolutionConfigurationContents="$(CurrentSolutionConfigurationContents)" AddSyntheticProjectReferencesForSolutionDependencies="false" OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration="$(OnlyReferenceAndBuildProjectsEnabledInSolutionConfiguration)" ShouldUnsetParentConfigurationAndPlatform="$(ShouldUnsetParentConfigurationAndPlatform)">
-            <Output TaskParameter="AssignedProjects" ItemName="_PackageProjectReferenceWithConfiguration" />
-            <Output TaskParameter="UnassignedProjects" ItemName="_PackageProjectReferenceWithConfiguration" />
-        </AssignProjectConfiguration>
-    </Target>
-
-    <Target Name="GetPackageProjectReferences" DependsOnTargets="AssignPackageProjectConfiguration" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_PackageProjectReferenceWithConfiguration)' != '' ">
-        <ItemGroup>
-            <__PackageProjectReference Include="@(_PackageProjectReferenceWithConfiguration)">
-                <ProjectName>$([System.IO.Path]::GetFileNameWithoutExtension('%(Identity)'))</ProjectName>
-                <PackageTargetPath Condition=" '%(_PackageProjectReferenceWithConfiguration.PackageTargetPath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_PackageProjectReferenceWithConfiguration.PackageTargetPath)'))</PackageTargetPath>
-                <PackagePackagePath Condition=" '%(_PackageProjectReferenceWithConfiguration.PackagePackagePath)' != '' ">$([MSBuild]::EnsureTrailingSlash('%(_PackageProjectReferenceWithConfiguration.PackagePackagePath)'))</PackagePackagePath>
-            </__PackageProjectReference>
-        </ItemGroup>
-        <AddIndexMetadata Items="@(__PackageProjectReference)" MetadataName="_Index">
-            <Output TaskParameter="Items" ItemName="_PackageProjectReference" />
-        </AddIndexMetadata>
-    </Target>
-
-    <Target Name="GetPackageProjectReferenceItems" DependsOnTargets="GetPackageProjectReferences" Inputs="@(_PackageProjectReference)" Outputs="@(_PackageProjectReference->'%(Identity)\%(_Index)\null')" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_PackageProjectReference)' != '' ">
-        <ItemGroup>
-            <_PackageProjectReferencesToTarget Include="@(_PackageProjectReference)">
-                <Properties>%(_PackageProjectReference.SetConfiguration);%(_PackageProjectReference.SetPlatform)</Properties>
-            </_PackageProjectReferencesToTarget>
-        </ItemGroup>
-        <MSBuild Projects="@(_PackageProjectReferencesToTarget)" Targets="Build" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;RuntimeIdentifier" />
-        <MSBuild Projects="@(_PackageProjectReferencesToTarget)" Targets="_CleanPackageFiles;Pack;GetPackageOutputPath" BuildInParallel="$(BuildInParallel)" RemoveProperties="$(_GlobalPropertiesToRemoveFromProjectReferences);TargetFramework;RuntimeIdentifier" RebaseOutputs="true">
-            <Output TaskParameter="TargetOutputs" ItemName="_ResolvedPackageOutputPath" />
-        </MSBuild>
-        <ItemGroup>
-            <_PackageProjectReferenceItemsInput Include="%(_ResolvedPackageOutputPath.Identity)\*.nupkg;%(_ResolvedPackageOutputPath.Identity)\*.snupkg">
-                <ProjectName>%(_ResolvedPackageOutputPath.ProjectName)</ProjectName>
-                <PackageTargetPath>%(_ResolvedPackageOutputPath.PackageTargetPath)</PackageTargetPath>
-                <PackagePackagePath>%(_ResolvedPackageOutputPath.PackagePackagePath)</PackagePackagePath>
-                <Pack>%(_ResolvedPackageOutputPath.Pack)</Pack>
-            </_PackageProjectReferenceItemsInput>
-            <_PackageProjectReferenceItems Include="@(_PackageProjectReferenceItemsInput)">
-                <TargetPath>%(RecursiveDir)%(Filename)%(Extension)</TargetPath>
-            </_PackageProjectReferenceItems>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetPackageProjectReferenceCopyToOutputDirectoryItems" BeforeTargets="Build;AssignTargetPaths" DependsOnTargets="GetPackageProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' and '@(_PackageProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <ContentWithTargetPath Include="@(_PackageProjectReferenceItems)" Condition=" '%(_PackageProjectReferenceItems.PackageTargetPath)' != '' ">
-                <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-                <TargetPath>$([MSBuild]::MakeRelative('.', '%(_PackageProjectReferenceItems.PackageTargetPath)%(_PackageProjectReferenceItems.TargetPath)'))</TargetPath>
-                <Pack>false</Pack>
-            </ContentWithTargetPath>
-        </ItemGroup>
-    </Target>
-
-    <PropertyGroup>
-        <GetCopyToOutputDirectoryItemsDependsOn>
-            AssignPackageProjectConfiguration;
-            GetPackageProjectReferences;
-            GetPackageProjectReferenceItems;
-            GetPackageProjectReferenceCopyToOutputDirectoryItems;
-            $(GetCopyToOutputDirectoryItemsDependsOn);
-        </GetCopyToOutputDirectoryItemsDependsOn>
-    </PropertyGroup>
-
-    <PropertyGroup>
-        <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);GetPackageProjectReferenceTfmSpecificContent</TargetsForTfmSpecificContentInPackage>
-    </PropertyGroup>
-
-    <Target Name="GetPackageProjectReferenceTfmSpecificContent" DependsOnTargets="GetPackageProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' and '@(_PackageProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <TfmSpecificPackageFile Include="@(_PackageProjectReferenceItems)" Condition=" '%(_PackageProjectReferenceItems.PackageTargetPath)' != '' And '%(_PackageProjectReferenceItems.Pack)' != 'false' ">
-                <PackagePath>contentFiles\any\$(TargetFramework)\%(_PackageProjectReferenceItems.PackageTargetPath)</PackagePath>
-                <PackagePath Condition=" '%(_PackageProjectReferenceItems.PackagePackagePath)' != '' ">contentFiles\any\$(TargetFramework)\%(_PackageProjectReferenceItems.PackagePackagePath)</PackagePath>
-            </TfmSpecificPackageFile>
-        </ItemGroup>
-    </Target>
-
-    <Target Name="GetPackageProjectReferencePackageItems" DependsOnTargets="GetPackageProjectReferenceItems" Condition=" '$(DesignTimeBuild)' != 'true' And '@(_PackageProjectReferenceItems)' != '' ">
-        <ItemGroup>
-            <_PackageFiles Include="@(_PackageProjectReferenceItems)" Condition=" '%(_PackageProjectReferenceItems.PackagePackagePath)' != '' And '%(_PackageProjectReferenceItems.Pack)' != 'false' ">
-                <PackagePath>%(_PackageProjectReferenceItems.PackagePackagePath)</PackagePath>
-            </_PackageFiles>
-        </ItemGroup>
-    </Target>
-
-    <PropertyGroup>
-        <GetPackageProjectReferenceItemsBeforePackageFilesDependsOn>
-            AssignPackageProjectConfiguration;
-            GetPackageProjectReferences;
-            GetPackageProjectReferenceItems;
-            GetPackageProjectReferencePackageItems;
-            $(GetPackageProjectReferenceItemsBeforePackageFilesDependsOn);
-        </GetPackageProjectReferenceItemsBeforePackageFilesDependsOn>
-    </PropertyGroup>
+    <Import Project="$(MSBuildThisFileDirectory)src\IKVM.Core.MSBuild\buildTransitive\netstandard2.0\IKVM.Core.MSBuild.targets" />
 
 </Project>
diff --git a/src/IKVM.Core.MSBuild/Class1.cs b/src/IKVM.Core.MSBuild/Class1.cs
deleted file mode 100644
index f51aac8..0000000
--- a/src/IKVM.Core.MSBuild/Class1.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System;
-
-namespace IKVM.Core.MSBuild
-{
-    public class Class1
-    {
-
-    }
-}
diff --git a/src/IKVM.Core.MSBuild/IKVM.Core.MSBuild.csproj b/src/IKVM.Core.MSBuild/IKVM.Core.MSBuild.csproj
index ba6f525..8b941d1 100644
--- a/src/IKVM.Core.MSBuild/IKVM.Core.MSBuild.csproj
+++ b/src/IKVM.Core.MSBuild/IKVM.Core.MSBuild.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
+<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
 
     <PropertyGroup>
         <TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -9,6 +9,7 @@
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Description>MSBuild utilities for development of IKVM itself.</Description>
         <GenerateDocumentationFile>false</GenerateDocumentationFile>
+        <DevelopmentDependency>true</DevelopmentDependency>
     </PropertyGroup>
 
     <PropertyGroup>
diff --git a/src/IKVM.Core.MSBuild/buildTransitive/netstandard2.0/Transform.targets b/src/IKVM.Core.MSBuild/buildTransitive/netstandard2.0/Transform.targets
index 0e72b5b..1a5b0b7 100644
--- a/src/IKVM.Core.MSBuild/buildTransitive/netstandard2.0/Transform.targets
+++ b/src/IKVM.Core.MSBuild/buildTransitive/netstandard2.0/Transform.targets
@@ -38,7 +38,7 @@
         </Task>
     </UsingTask>
 
-    <Target Name="Transform" BeforeTargets="BeforeBuild" Inputs="@(Transform)" Outputs="@(Transform->'%(TargetPath)')" Condition=" '$(TargetFramework)' != '' ">
+    <Target Name="Transform" BeforeTargets="BeforeBuild" Inputs="@(Transform)" Outputs="@(Transform->'%(TargetPath)')" Condition=" '$(TargetFramework)' != '' And '@(Transform)' != '' ">
         <Transform Items="@(Transform)" Parameters="@(TransformValues)" />
     </Target>
 
diff --git a/src/dist-nuget/dist-nuget.csproj b/src/dist-nuget/dist-nuget.csproj
index a5083ba..3a66652 100644
--- a/src/dist-nuget/dist-nuget.csproj
+++ b/src/dist-nuget/dist-nuget.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
+<Project Sdk="Microsoft.Build.NoTargets/3.5.6">
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>