Browse Source

Move package to build props

pull/1424/head
AlexNDRmac 5 years ago
parent
commit
8f2da28358
No known key found for this signature in database GPG Key ID: ECCF738337BCF66F
  1. 4
      .github/workflows/build-and-test.yml
  2. 8
      src/ImageSharp/ImageSharp.csproj
  3. 2
      tests/Directory.Build.targets
  4. 2
      tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj
  5. 2
      tests/ImageSharp.Tests/ImageSharp.Tests.csproj

4
.github/workflows/build-and-test.yml

@ -18,6 +18,10 @@ jobs:
framework: netcoreapp3.1
runtime: -x64
codecov: true
- os: macos-latest
framework: netcoreapp3.1
runtime: -x64
codecov: false
- os: windows-latest
framework: netcoreapp3.1
runtime: -x64

8
src/ImageSharp/ImageSharp.csproj

@ -28,14 +28,6 @@
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" />
</ItemGroup>
<!-- Enable support for using libgdiplus on macOS -->
<ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp')) AND $([MSBuild]::IsOSPlatform('OSX'))">
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2')) AND $([MSBuild]::IsOSPlatform('OSX'))">
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) OR '$(TargetFramework)' == 'net472'">
<PackageReference Include="System.Numerics.Vectors" />
<PackageReference Include="System.Buffers" />

2
tests/Directory.Build.targets

@ -35,6 +35,8 @@
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.7.1" />
<PackageReference Update="Moq" Version="4.14.6" />
<PackageReference Update="Pfim" Version="0.9.1" />
<!-- Enable support for using libgdiplus on macOS -->
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
<PackageReference Update="SharpZipLib" Version="1.3.0" />
<PackageReference Update="System.Drawing.Common" Version="4.7.0" />
<PackageReference Update="xunit" Version="2.4.1" />

2
tests/ImageSharp.Benchmarks/ImageSharp.Benchmarks.csproj

@ -26,8 +26,6 @@
<PackageReference Include="BenchmarkDotNet.Diagnostics.Windows" Condition="'$(OS)' == 'Windows_NT'" />
<PackageReference Include="Colourful" />
<PackageReference Include="Pfim" />
<!-- Enable support for using libgdiplus on macOS -->
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
<PackageReference Include="SharpZipLib" />
<PackageReference Include="System.Drawing.Common" />
</ItemGroup>

2
tests/ImageSharp.Tests/ImageSharp.Tests.csproj

@ -22,8 +22,6 @@
<PackageReference Include="Microsoft.DotNet.RemoteExecutor" />
<PackageReference Include="Microsoft.DotNet.XUnitExtensions" />
<PackageReference Include="Moq" />
<!-- Enable support for using libgdiplus on macOS -->
<PackageReference Include="runtime.osx.10.10-x64.CoreCompat.System.Drawing" Version="5.8.64" Condition="$([MSBuild]::IsOSPlatform('OSX'))" />
<PackageReference Include="SharpZipLib" />
<PackageReference Include="System.Drawing.Common" />
</ItemGroup>

Loading…
Cancel
Save