Remove no longer necessary overwrite of GeneratePkgDef

The original error that prompted this fix is no longer happening (limit of cmdline hit).
This commit is contained in:
Daniel Cazzulino 2020-03-02 16:27:36 -03:00
Родитель 52e63da8da
Коммит 64435dbca9
2 изменённых файлов: 0 добавлений и 46 удалений

Просмотреть файл

@ -1,45 +0,0 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<CreatePkgDefAssemblyToProcess Condition="'$(CreatePkgDefAssemblyToProcess)' == ''">$(TargetPath)</CreatePkgDefAssemblyToProcess>
</PropertyGroup>
<!--
==================================================================================================================
Overrides Generate PkgDef (filtering the reference path to avoid the "filename or extension is too long" )
==================================================================================================================
-->
<Target Name="GeneratePkgDef"
Inputs="$(CreatePkgDefAssemblyToProcess)"
Outputs="$(IntermediateOutputPath)$(TargetName).pkgdef"
Condition="'$(GeneratePkgDefFile)'=='true'"
DependsOnTargets="$(GeneratePkgDefDependsOn)">
<Message Text="Creating intermediate PkgDef file." />
<ItemGroup>
<_AssembliesToIncludeForBinding Include="@(ReferencePath)"
Condition="'%(ReferencePath.ResolvedFrom)' != 'ImplicitlyExpandDesignTimeFacades' and '%(ReferencePath.FrameworkFile)' != 'true'" />
</ItemGroup>
<CreatePkgDef AssemblyToProcess="$(CreatePkgDefAssemblyToProcess)"
ProductVersion="$(TargetVSVersion)"
OutputFile="$(IntermediateOutputPath)$(TargetName).latest.pkgdef"
UseCodebase="$(UseCodebase)"
ReferencedAssemblies="@(_AssembliesToIncludeForBinding)" />
<CopyIfChanged Condition="Exists('$(IntermediateOutputPath)$(TargetName).latest.pkgdef')"
SourceFile="$(IntermediateOutputPath)$(TargetName).latest.pkgdef"
DestinationFile="$(IntermediateOutputPath)$(TargetName).pkgdef" />
<!-- If the CTO file was changed, touch the pkgdef file to cause a re-merge -->
<Touch Files="$(IntermediateOutputPath)$(TargetName).pkgdef"
Condition="'$(CTOFileHasChanged)'=='true' AND Exists('$(IntermediateOutputPath)$(TargetName).pkgdef')" />
<ItemGroup>
<FileWrites Include="$(IntermediateOutputPath)$(TargetName).pkgdef" Condition="Exists('$(IntermediateOutputPath)$(TargetName).pkgdef')"/>
<FileWrites Include="$(IntermediateOutputPath)$(TargetName).latest.pkgdef" Condition="Exists('$(IntermediateOutputPath)$(TargetName).latest.pkgdef')"/>
</ItemGroup>
</Target>
</Project>

Просмотреть файл

@ -24,7 +24,6 @@
<Import Project="Xamarin.VSSDK.BuildTools.FindSourceVsixManifest.targets" Condition="'$(OverrideDeployVsixExtensionFiles)' == 'true' and '$(Dev)' &gt;= '15.0'" />
<Import Project="Xamarin.VSSDK.BuildTools.GetVsixDeploymentPath.targets" Condition="'$(OverrideDeployVsixExtensionFiles)' == 'true' and '$(Dev)' &gt;= '15.0'" />
<Import Project="Xamarin.VSSDK.BuildTools.FindExistingDeploymentPath.targets" Condition="'$(OverrideDeployVsixExtensionFiles)' == 'true' and '$(Dev)' &gt;= '15.0'" />
<Import Project="Xamarin.VSSDK.BuildTools.GeneratePkgDef.targets" />
<Import Project="Xamarin.VSSDK.BuildTools.GenerateBindingRedirects.targets" />
<!-- This fixes the GetVsixSourceItems target when the project references are being evaluated in a cross targeting build -->