Skip to content

Commit b3cf651

Browse files
authored
Fix regression that breaks projects using .NET Framework/Mono and packages.config (#3112)
* Fix regression for .NET Framework projects that use packages.config * Fix other related packages (for Mono)
1 parent cd00ab0 commit b3cf651

File tree

5 files changed

+5
-0
lines changed

5 files changed

+5
-0
lines changed

binding/SkiaSharp.NativeAssets.Linux.NoDependencies/SkiaSharp.NativeAssets.Linux.NoDependencies.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ The excluded dependencies are:
3030
<Target Name="IncludeAdditionalTfmSpecificPackageFiles">
3131
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
3232
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="buildTransitive\$(NuGetShortFolderName)\$(PackageId).targets" />
33+
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="build\$(NuGetShortFolderName)\$(PackageId).targets" />
3334
</ItemGroup>
3435
</Target>
3536
</Project>

binding/SkiaSharp.NativeAssets.Linux/SkiaSharp.NativeAssets.Linux.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<Target Name="IncludeAdditionalTfmSpecificPackageFiles">
2020
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
2121
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="buildTransitive\$(NuGetShortFolderName)\$(PackageId).targets" />
22+
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="build\$(NuGetShortFolderName)\$(PackageId).targets" />
2223
</ItemGroup>
2324
</Target>
2425
</Project>

binding/SkiaSharp.NativeAssets.NanoServer/SkiaSharp.NativeAssets.NanoServer.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<Target Name="IncludeAdditionalTfmSpecificPackageFiles">
1313
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
1414
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="buildTransitive\$(NuGetShortFolderName)\$(PackageId).targets" />
15+
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="build\$(NuGetShortFolderName)\$(PackageId).targets" />
1516
</ItemGroup>
1617
</Target>
1718
</Project>

binding/SkiaSharp.NativeAssets.Win32/SkiaSharp.NativeAssets.Win32.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<Target Name="IncludeAdditionalTfmSpecificPackageFiles">
1414
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
1515
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="buildTransitive\$(NuGetShortFolderName)\$(PackageId).targets" />
16+
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="build\$(NuGetShortFolderName)\$(PackageId).targets" />
1617
</ItemGroup>
1718
</Target>
1819
</Project>

binding/SkiaSharp.NativeAssets.macOS/SkiaSharp.NativeAssets.macOS.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
</ItemGroup>
1616
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
1717
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="buildTransitive\$(NuGetShortFolderName)\$(PackageId).targets" />
18+
<TfmSpecificPackageFile Include="buildTransitive\net4\SkiaSharp.targets" PackagePath="build\$(NuGetShortFolderName)\$(PackageId).targets" />
1819
</ItemGroup>
1920
</Target>
2021
</Project>

0 commit comments

Comments
 (0)