Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port to .Net Standard 2.0 #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Port to .Net Standard 2.0 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,3 +181,4 @@ UpgradeLog*.htm

# Microsoft Fakes
FakesAssemblies/
/src/.vs/ImageDiff/v16/Server/sqlite3
71 changes: 30 additions & 41 deletions src/ImageDiff/ImageDiff.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8C9C4ABC-4D3A-4DCD-AEE1-95E07E4FAE9F}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ImageDiff</RootNamespace>
<AssemblyName>ImageDiff</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageId>ImageDiff-NetStandard</PackageId>
<Authors>Richard Clement</Authors>
<Company />
<Description>This is the .Net Standard port of https://github.com/richclement/ImageDiff . Sadly I did not get in contact with him so I'm publishing this.</Description>
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageProjectUrl>https://github.com/richclement/ImageDiff</PackageProjectUrl>
<RepositoryUrl>https://github.com/richclement/ImageDiff</RepositoryUrl>
<RepositoryType>git</RepositoryType>
<PackageTags>image diff difference visual regression</PackageTags>
<PackageReleaseNotes>Only a port to .Net Standard 2.0 of https://github.com/richclement/ImageDiff
No other changes at all</PackageReleaseNotes>
<AssemblyVersion>1.1.0.0</AssemblyVersion>
<FileVersion>1.1.0.0</FileVersion>
<Version>1.1.0</Version>
<Copyright>Richard Clement</Copyright>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand All @@ -29,40 +40,18 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Drawing.Common">
<Version>4.5.1</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Folder Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Compile Include="Analyzers\BitmapAnalyzerFactory.cs" />
<Compile Include="Analyzers\CIE76Analyzer.cs" />
<Compile Include="Analyzers\CIELab.cs" />
<Compile Include="Analyzers\CIExyz.cs" />
<Compile Include="BoundingBoxes\BoundingBoxIdentifierFactory.cs" />
<Compile Include="AnalyzerTypes.cs" />
<Compile Include="Analyzers\ExactMatchAnalyzer.cs" />
<Compile Include="Analyzers\IBitmapAnalyzer.cs" />
<Compile Include="BoundingBoxes\IBoundingBoxIdentifier.cs" />
<Compile Include="IImageComparer.cs" />
<Compile Include="Labelers\LabelerFactory.cs" />
<Compile Include="LabelerTypes.cs" />
<Compile Include="Labelers\BasicLabeler.cs" />
<Compile Include="BoundingBoxModes.cs" />
<Compile Include="CompareOptions.cs" />
<Compile Include="Labelers\ConnectedComponentLabeler.cs" />
<Compile Include="Labelers\IDifferenceLabeler.cs" />
<Compile Include="BitmapComparer.cs" />
<Compile Include="BoundingBoxes\MultipleBoundingBoxIdentifier.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="BoundingBoxes\SingleBoundingBoxIdentifer.cs" />
<None Include="..\..\LICENSE">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
30 changes: 2 additions & 28 deletions src/ImageDiff/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("ImageDiff")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ImageDiff")]
[assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: InternalsVisibleTo("ImageDiffTests")]

// Setting ComVisible to false makes the types in this assembly not visible
Expand All @@ -22,17 +9,4 @@
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("4e462185-6889-4657-a2a9-b3540463fa51")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: Guid("4e462185-6889-4657-a2a9-b3540463fa51")]
12 changes: 6 additions & 6 deletions src/ImageDiffTests/ImageDiffTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,6 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ImageDiff\ImageDiff.csproj">
<Project>{8c9c4abc-4d3a-4dcd-aee1-95e07e4fae9f}</Project>
<Name>ImageDiff</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="images\TestImage1.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
Expand All @@ -67,6 +61,12 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ImageDiff\ImageDiff.csproj">
<Project>{8c9c4abc-4d3a-4dcd-aee1-95e07e4fae9f}</Project>
<Name>ImageDiff</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down