Merge pull request #4 from neilharvey/target-frameworks

Adds .NET 4.5.2 support

FileSignatures.sln

@@ -1,20 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.15
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A34CAB26-B589-4531-884B-E50BF89CCF2D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D50F777-A2A1-4FE8-B703-5010D7000DEF}"
-	ProjectSection(SolutionItems) = preProject
-		global.json = global.json
-	EndProjectSection
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FileSignatures", "src\FileSignatures\FileSignatures.xproj", "{52D4F79F-BB2C-46E9-9D27-59FF8DC9BD81}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D9653CFC-5C1F-4751-BE1E-B85EAAF73203}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FileSignatures.Tests", "test\FileSignatures.Tests\FileSignatures.Tests.xproj", "{5FE9AF07-5928-482E-9917-285956E7731C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileSignatures", "src\FileSignatures\FileSignatures.csproj", "{52D4F79F-BB2C-46E9-9D27-59FF8DC9BD81}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileSignatures.Tests", "test\FileSignatures.Tests\FileSignatures.Tests.csproj", "{5FE9AF07-5928-482E-9917-285956E7731C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

appveyor.yml

@@ -7,13 +7,15 @@ build_script:
   - dotnet build src\FileSignatures -c Release
 
 after_build:
-  - dotnet pack src\FileSignatures -c Release -o .\artifacts
+  - dotnet pack src\FileSignatures -c Release -o ..\..\artifacts
 
 test_script:
-  - dotnet test test\FileSignatures.Tests -c Release -appveyor
+  # Workaround until appveyor/ci#1404 is resolved
+  - cd test\FileSignatures.Tests
+  - dotnet xunit -appveyor
 
 artifacts:
-  - path: '.\artifacts\**\*.nupkg'
+  - path: '.\artifacts\*.nupkg'
     name: NuGet Package
 
 deploy:

src/FileSignatures/FileSignatures.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>A small library for detecting the type of a file based on header signature (also known as magic number) rather than file extension.</Description>
+    <VersionPrefix>1.2.0-rc</VersionPrefix>
+    <Authors>Neil Harvey</Authors>
+    <TargetFrameworks>netstandard1.6;net461;net452</TargetFrameworks>
+    <AssemblyName>FileSignatures</AssemblyName>
+    <PackageId>FileSignatures</PackageId>
+    <PackageTags>File Format;Mime Type;Media Type;Header;Signature;Detection</PackageTags>
+    <PackageReleaseNotes>https://github.com/neilharvey/FileSignatures/releases</PackageReleaseNotes>
+    <PackageProjectUrl>https://github.com/neilharvey/FileSignatures/</PackageProjectUrl>
+    <PackageLicenseUrl>https://github.com/neilharvey/FileSignatures/blob/master/LICENCE</PackageLicenseUrl>
+    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netstandard1.6' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' == 'netstandard1.6' ">1.6.0</NetStandardImplicitPackageVersion>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.6' ">
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+    <PackageReference Include="System.Runtime" Version="4.3.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net452' ">
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+
+</Project>

test/FileSignatures.Tests/FileSignatures.Tests.csproj

@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp1.0</TargetFramework>
+    <AssemblyName>FileSignatures.Tests</AssemblyName>
+    <PackageId>FileSignatures.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Update="xunit.runner.json;samples\*">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\FileSignatures\FileSignatures.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Reflection" Version="4.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta3-build3705" />
+    <PackageReference Include="xunit" Version="2.3.0-beta3-build3705" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta3-build3705" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
+</Project>