mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix bugged BundledDotnetTools.targets execution (wasn't processing the item group properly).

Browse source
This commit is contained in:
Michael Yanni 2024-02-07 10:16:57 -08:00
parent 8e86e03d37
commit c0806dddee
1 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/redist/targets/BundledDotnetTools.targets
View file

@ -16,18 +16,12 @@
</ItemGroup>
<Target Name="LayoutBundledTools" DependsOnTargets="SetupBundledComponents">
<PropertyGroup>
<PackageToRestore>%(BundledDotnetTool.Identity)</PackageToRestore>
<PackageVersionToRestore>%(BundledDotnetTool.Version)</PackageVersionToRestore>
<RestoredToolRoot>$([System.IO.Path]::GetFullPath('$(NuGetPackageRoot)/$(PackageToRestore)/$(PackageVersionToRestore)'))</RestoredToolRoot>
</PropertyGroup>
<ItemGroup>
<BundledToolLayoutProject Include="$(MSBuildThisFileDirectory)..\projects\DownloadPackage.csproj">
<!-- For this unique RestoreProjectStyle, see: https://aka.ms/global-tools-nuget -->
<Properties>
PackageToRestore=$(PackageToRestore);
PackageVersionToRestore=$(PackageVersionToRestore);
PackageToRestore=%(BundledDotnetTool.Identity);
PackageVersionToRestore=%(BundledDotnetTool.Version);
TargetFramework=$(TargetFramework);
RestoreProjectStyle=DotnetToolReference
</Properties>
@ -37,14 +31,13 @@
<MSBuild BuildInParallel="False" Projects="@(BundledToolLayoutProject)" />
<ItemGroup>
<BundledToolFiles Include="$(RestoredToolRoot)\**\*.*" />
<BundledToolFiles Remove="$(RestoredToolRoot)\*.*" />
<BundledToolFiles Include="%(BundledDotnetTool.RestoredPackagePath)\**\*.*" PackageToRestore="%(BundledDotnetTool.Identity)" PackageVersionToRestore="%(BundledDotnetTool.Version)" />
<BundledToolFiles Remove="%(BundledDotnetTool.RestoredPackagePath)\*.*" />
</ItemGroup>
<Copy SourceFiles="@(BundledToolFiles)"
DestinationFiles="@(BundledToolFiles->'$(SdkOutputDirectory)DotnetTools/$(PackageToRestore)\$(PackageVersionToRestore)\%(RecursiveDir)%(Filename)%(Extension)')"
SkipUnchangedFiles="true"
Condition="'$(PackageToRestore)' != ''" />
DestinationFiles="@(BundledToolFiles->'$(SdkOutputDirectory)DotnetTools/%(PackageToRestore)\%(PackageVersionToRestore)\%(RecursiveDir)%(Filename)%(Extension)')"
SkipUnchangedFiles="true" />
</Target>
</Project>