|
4 | 4 | <PackageReference Include="Microsoft.Azure.Functions.DotNetIsolatedNativeHost" Version="1.0.12" />
|
5 | 5 | </ItemGroup>
|
6 | 6 |
|
7 |
| - <Target Name="CleanDotnetWorkerFiles" BeforeTargets="AssignTargetPaths" Condition="$(RuntimeIdentifier.StartsWith(win))"> |
| 7 | + <Target Name="CleanDotnetWorkerFiles" BeforeTargets="AssignTargetPaths" Condition="'$(RuntimeIdentifier)' != ''"> |
8 | 8 | <!-- Remove unnecessary dotnet isolated files -->
|
| 9 | + <PropertyGroup> |
| 10 | + <!-- Using Path.Combine to ensure correct dir separator for the OS. --> |
| 11 | + <_DotnetWorkerBinFolder>$([System.IO.Path]::Combine('workers', 'dotnet-isolated', 'bin'))</_DotnetWorkerBinFolder> |
| 12 | + <_DotnetWorkerBinFolder>$([MSBuild]::EnsureTrailingSlash($(_DotnetWorkerBinFolder)))</_DotnetWorkerBinFolder> |
| 13 | + <_DotnetWorkerManifestFolder>$([System.IO.Path]::Combine('$(_DotnetWorkerBinFolder)', 'prelaunchapps', '_manifest', 'spdx_2.2'))</_DotnetWorkerManifestFolder> |
| 14 | + <_DotnetWorkerManifestFolder>$([MSBuild]::EnsureTrailingSlash($(_DotnetWorkerManifestFolder)))</_DotnetWorkerManifestFolder> |
| 15 | + </PropertyGroup> |
| 16 | + |
9 | 17 | <ItemGroup>
|
10 |
| - <_DotnetWorkerFiles Include="@(None)" Condition="'%(None.DestinationSubDirectory)' == 'workers\dotnet-isolated\bin\'" /> |
11 |
| - <None Remove="@(_DotnetWorkerFiles)" Condition="'%(Extension)' != '.dll' AND '%(Extension)' != '.exe'" /> |
| 18 | + <!-- Get all files from the dotnet worker package. --> |
| 19 | + <_DotnetWorkerFiles Include="@(None)" Condition="'%(None.NuGetPackageId)' == 'Microsoft.Azure.Functions.DotNetIsolatedNativeHost'" /> |
| 20 | + <!-- Remove 'bin/prelaunchapps/_manifest' folder for all runtimes. --> |
| 21 | + <_DotnetWorkerToRemove Include="@(_DotnetWorkerFiles)" Condition="'%(DestinationSubDirectory)' == '$(_DotnetWorkerManifestFolder)'" /> |
| 22 | + <!-- Get files immediately under /bin --> |
| 23 | + <_DotnetWorkerBinFiles Include="@(_DotnetWorkerFiles)" Condition="'%(DestinationSubDirectory)' == '$(_DotnetWorkerBinFolder)'" /> |
| 24 | + <!-- For Windows, remove all non .dll and .exe files --> |
| 25 | + <_DotnetWorkerToRemove Include="@(_DotnetWorkerBinFiles)" Condition="$(RuntimeIdentifier.StartsWith('win')) AND '%(Extension)' != '.dll' AND '%(Extension)' != '.exe'" /> |
| 26 | + <!-- For Linux, remove all non no-extension and .so files --> |
| 27 | + <_DotnetWorkerToRemove Include="@(_DotnetWorkerBinFiles)" Condition="$(RuntimeIdentifier.StartsWith('linux')) AND '%(Extension)' != '.so' AND '%(Extension)' != ''" /> |
| 28 | + <None Remove="@(_DotnetWorkerToRemove)" /> |
12 | 29 | </ItemGroup>
|
13 | 30 | </Target>
|
14 | 31 |
|
|
0 commit comments