Skip to content

Commit

Permalink
Move .NET 4.6.1 to 4.6.2 and update to Imageflow 2.0.0-preview4
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilith
lilith committed Jan 6, 2023
1 parent c37dd82 commit 20d4c94
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[![Build status](https://ci.appveyor.com/api/projects/status/vqfofqe3bwqwdu4a?svg=true)](https://ci.appveyor.com/project/imazen/imageflow-dotnet)


Imageflow.NET is a .NET API for [Imageflow](https://github.com/imazen/imageflow), the fast image optimization and processing library for web servers. Imageflow focuses on security, quality, and performance - in that order. Imageflow.NET is a .NET Standard 2.0 library, and as such is compatible with .NET 4.6.1+, .NET Core 2.0+, and .NET 5/6/7.
Imageflow.NET is a .NET API for [Imageflow](https://github.com/imazen/imageflow), the fast image optimization and processing library for web servers. Imageflow focuses on security, quality, and performance - in that order. Imageflow.NET is a .NET Standard 2.0 library, and as such is compatible with .NET 4.6.2+, .NET Core 2.0+, and .NET 5/6/7.

### On .NET Core 3.x and .NET 5/6/7 (or if using PackageReference on .NET 4.x)

Expand Down
8 changes: 4 additions & 4 deletions src/Imageflow.AllPlatforms/Imageflow.AllPlatforms.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@
<ProjectReference Include="..\Imageflow\Imageflow.Net.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Imageflow.NativeRuntime.osx-x86_64" Version="2.0.0-preview3" />
<PackageReference Include="Imageflow.NativeRuntime.ubuntu-x86_64" Version="2.0.0-preview3" />
<PackageReference Include="Imageflow.NativeRuntime.win-x86" Version="2.0.0-preview3" />
<PackageReference Include="Imageflow.NativeRuntime.win-x86_64" Version="2.0.0-preview3" />
<PackageReference Include="Imageflow.NativeRuntime.osx-x86_64" Version="2.0.0-preview4" />
<PackageReference Include="Imageflow.NativeRuntime.ubuntu-x86_64" Version="2.0.0-preview4" />
<PackageReference Include="Imageflow.NativeRuntime.win-x86" Version="2.0.0-preview4" />
<PackageReference Include="Imageflow.NativeRuntime.win-x86_64" Version="2.0.0-preview4" />
</ItemGroup>
<ItemGroup>
<None Include="images\icon.png" Pack="true" PackagePath="" />
Expand Down
19 changes: 10 additions & 9 deletions tests/Imageflow.TestDotNetFull/Imageflow.TestDotNetFull.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Imageflow.TestDotNetFull</RootNamespace>
<AssemblyName>Imageflow.TestDotNetFull</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">15.0</VisualStudioVersion>
Expand All @@ -19,6 +19,7 @@
<TestProjectType>UnitTest</TestProjectType>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down Expand Up @@ -68,14 +69,14 @@
</PropertyGroup>
<Error Condition="!Exists('..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.props'))" />
<Error Condition="!Exists('..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets'))" />
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview1\build\net45\Imageflow.NativeRuntime.win-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview1\build\net45\Imageflow.NativeRuntime.win-x86.targets'))" />
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview1\build\net45\Imageflow.NativeRuntime.win-x86_64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview1\build\net45\Imageflow.NativeRuntime.win-x86_64.targets'))" />
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview1\build\net45\Imageflow.NativeTool.win-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview1\build\net45\Imageflow.NativeTool.win-x86.targets'))" />
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview1\build\net45\Imageflow.NativeTool.win-x86_64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview1\build\net45\Imageflow.NativeTool.win-x86_64.targets'))" />
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview4\build\net45\Imageflow.NativeRuntime.win-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview4\build\net45\Imageflow.NativeRuntime.win-x86.targets'))" />
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview4\build\net45\Imageflow.NativeRuntime.win-x86_64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview4\build\net45\Imageflow.NativeRuntime.win-x86_64.targets'))" />
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview4\build\net45\Imageflow.NativeTool.win-x86.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview4\build\net45\Imageflow.NativeTool.win-x86.targets'))" />
<Error Condition="!Exists('..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview4\build\net45\Imageflow.NativeTool.win-x86_64.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview4\build\net45\Imageflow.NativeTool.win-x86_64.targets'))" />
</Target>
<Import Project="..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets" Condition="Exists('..\..\src\packages\MSTest.TestAdapter.2.1.1\build\net45\MSTest.TestAdapter.targets')" />
<Import Project="..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview1\build\net45\Imageflow.NativeRuntime.win-x86.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview1\build\net45\Imageflow.NativeRuntime.win-x86.targets')" />
<Import Project="..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview1\build\net45\Imageflow.NativeRuntime.win-x86_64.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview1\build\net45\Imageflow.NativeRuntime.win-x86_64.targets')" />
<Import Project="..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview1\build\net45\Imageflow.NativeTool.win-x86.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview1\build\net45\Imageflow.NativeTool.win-x86.targets')" />
<Import Project="..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview1\build\net45\Imageflow.NativeTool.win-x86_64.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview1\build\net45\Imageflow.NativeTool.win-x86_64.targets')" />
<Import Project="..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview4\build\net45\Imageflow.NativeRuntime.win-x86.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86.2.0.0-preview4\build\net45\Imageflow.NativeRuntime.win-x86.targets')" />
<Import Project="..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview4\build\net45\Imageflow.NativeRuntime.win-x86_64.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeRuntime.win-x86_64.2.0.0-preview4\build\net45\Imageflow.NativeRuntime.win-x86_64.targets')" />
<Import Project="..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview4\build\net45\Imageflow.NativeTool.win-x86.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeTool.win-x86.2.0.0-preview4\build\net45\Imageflow.NativeTool.win-x86.targets')" />
<Import Project="..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview4\build\net45\Imageflow.NativeTool.win-x86_64.targets" Condition="Exists('..\..\src\packages\Imageflow.NativeTool.win-x86_64.2.0.0-preview4\build\net45\Imageflow.NativeTool.win-x86_64.targets')" />
</Project>
12 changes: 6 additions & 6 deletions tests/Imageflow.TestDotNetFull/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Imageflow.NativeRuntime.win-x86" version="2.0.0-preview1" targetFramework="net461" />
<package id="Imageflow.NativeRuntime.win-x86_64" version="2.0.0-preview1" targetFramework="net461" />
<package id="Imageflow.NativeTool.win-x86" version="2.0.0-preview1" targetFramework="net461" />
<package id="Imageflow.NativeTool.win-x86_64" version="2.0.0-preview1" targetFramework="net461" />
<package id="MSTest.TestAdapter" version="2.1.1" targetFramework="net461" />
<package id="MSTest.TestFramework" version="2.1.1" targetFramework="net461" />
<package id="Imageflow.NativeRuntime.win-x86" version="2.0.0-preview4" targetFramework="net462" />
<package id="Imageflow.NativeRuntime.win-x86_64" version="2.0.0-preview4" targetFramework="net462" />
<package id="Imageflow.NativeTool.win-x86" version="2.0.0-preview4" targetFramework="net462" />
<package id="Imageflow.NativeTool.win-x86_64" version="2.0.0-preview4" targetFramework="net462" />
<package id="MSTest.TestAdapter" version="2.1.1" targetFramework="net462" />
<package id="MSTest.TestFramework" version="2.1.1" targetFramework="net462" />
</packages>

0 comments on commit 20d4c94

Please sign in to comment.