Skip to content

Commit ee0f5f1

Browse files
drewnoakesdrewnoakes
authored
Merge pull request #167 from drewnoakes/updates
Project structure and CI updates
2 parents c12ca1d + fd85356 commit ee0f5f1

File tree

11 files changed

+36
-54
lines changed

11 files changed

+36
-54
lines changed

‎Build.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ $instance = .\packages\vswhere\tools\vswhere.exe -latest -products $ids -require
2424
| convertfrom-json `
2525
| select-object -first 1
2626

27-
$msbuild = join-path $instance.installationPath 'MSBuild\15.0\Bin\MSBuild.exe'
27+
$msbuild = join-path $instance.installationPath 'MSBuild\Current\Bin\MSBuild.exe'
2828
if ((test-path $msbuild) -eq $false) {
2929
Write-Error "Could not find msbuild."
3030
exit 2

‎Directory.Build.props

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<Project>
2+
3+
<PropertyGroup>
4+
<VersionPrefix>2.1.0</VersionPrefix>
5+
<DebugType>portable</DebugType>
6+
<LangVersion>latest</LangVersion>
7+
<Authors>Drew Noakes</Authors>
8+
<Copyright>Copyright Drew Noakes 2002-2019</Copyright>
9+
<PackageIconUrl>https://raw.githubusercontent.com/drewnoakes/metadata-extractor-dotnet/master/docs/metadata-extractor-logo-122.png</PackageIconUrl>
10+
<PackageProjectUrl>https://github.com/drewnoakes/metadata-extractor-dotnet</PackageProjectUrl>
11+
<PackageLicense>Apache-2.0</PackageLicense>
12+
<RepositoryType>git</RepositoryType>
13+
<RepositoryUrl>https://github.com/drewnoakes/metadata-extractor-dotnet.git</RepositoryUrl>
14+
<IncludeSymbols>true</IncludeSymbols>
15+
<IncludeSource>true</IncludeSource>
16+
</PropertyGroup>
17+
18+
<ItemGroup>
19+
<PackageReference Include="JetBrains.Annotations" Version="2019.1.1" PrivateAssets="All" />
20+
</ItemGroup>
21+
22+
</Project>

‎MetadataExtractor.Benchmarks/MetadataExtractor.Benchmarks.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>net461</TargetFramework>
5-
<DebugType>portable</DebugType>
65
<OutputType>Exe</OutputType>
7-
<LangVersion>latest</LangVersion>
86
</PropertyGroup>
97

108
<ItemGroup>
@@ -14,7 +12,6 @@
1412
<ItemGroup>
1513
<PackageReference Include="BenchmarkDotNet" Version="0.10.12" />
1614
<PackageReference Include="BenchmarkDotNet.Core" Version="0.10.12" />
17-
<PackageReference Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
1815
</ItemGroup>
1916

2017
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎MetadataExtractor.PowerShell/MetadataExtractor.PowerShell.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
<PropertyGroup>
44
<TargetFramework>net40</TargetFramework>
5-
<LangVersion>latest</LangVersion>
65
</PropertyGroup>
76

87
<ItemGroup>
98
<ProjectReference Include="..\MetadataExtractor\MetadataExtractor.csproj" />
109
</ItemGroup>
1110

1211
<ItemGroup>
13-
<PackageReference Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
1412
<PackageReference Include="System.Management.Automation" Version="6.1.7601.17515" />
1513
</ItemGroup>
1614

‎MetadataExtractor.Samples/MetadataExtractor.Samples.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,13 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp1.0;net35;net45</TargetFrameworks>
5-
<DebugType>portable</DebugType>
65
<OutputType>Exe</OutputType>
7-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
8-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
9-
<LangVersion>latest</LangVersion>
106
</PropertyGroup>
117

128
<ItemGroup>
139
<ProjectReference Include="..\MetadataExtractor\MetadataExtractor.csproj" />
1410
</ItemGroup>
1511

16-
<ItemGroup>
17-
<PackageReference Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
18-
</ItemGroup>
19-
2012
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
2113
<Reference Include="System" />
2214
</ItemGroup>

‎MetadataExtractor.Tests/MetadataExtractor.Tests.csproj

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
5-
<DebugType>portable</DebugType>
6-
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
7-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
8-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
9-
<LangVersion>latest</LangVersion>
4+
<TargetFrameworks>netcoreapp2.1;net452</TargetFrameworks>
105
</PropertyGroup>
116

127
<ItemGroup>
138
<ProjectReference Include="..\MetadataExtractor\MetadataExtractor.csproj" />
149
</ItemGroup>
1510

1611
<ItemGroup>
17-
<PackageReference Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
18-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.1.1" />
1913
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
20-
<PackageReference Include="xunit" Version="2.3.1" />
21-
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
14+
<PackageReference Include="xunit" Version="2.4.1" />
15+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
16+
<PrivateAssets>all</PrivateAssets>
17+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
18+
</PackageReference>
2219
</ItemGroup>
2320

2421
<ItemGroup>

‎MetadataExtractor.Tools.FileProcessor/MetadataExtractor.Tools.FileProcessor.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,14 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp1.0;net35;net45</TargetFrameworks>
5-
<DebugType>portable</DebugType>
65
<OutputType>Exe</OutputType>
7-
<PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
8-
<RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
96
<LangVersion>latest</LangVersion>
107
</PropertyGroup>
118

129
<ItemGroup>
1310
<ProjectReference Include="..\MetadataExtractor\MetadataExtractor.csproj" />
1411
</ItemGroup>
1512

16-
<ItemGroup>
17-
<PackageReference Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
18-
</ItemGroup>
19-
2013
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
2114
<Reference Include="System" />
2215
</ItemGroup>

‎MetadataExtractor.Tools.JpegSegmentExtractor/MetadataExtractor.Tools.JpegSegmentExtractor.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>netcoreapp1.0;net35;net45</TargetFrameworks>
5-
<DebugType>portable</DebugType>
65
<OutputType>Exe</OutputType>
76
<LangLevel>latest</LangLevel>
87
</PropertyGroup>
@@ -11,10 +10,6 @@
1110
<ProjectReference Include="..\MetadataExtractor\MetadataExtractor.csproj" />
1211
</ItemGroup>
1312

14-
<ItemGroup>
15-
<PackageReference Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
16-
</ItemGroup>
17-
1813
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">
1914
<Reference Include="System" />
2015
</ItemGroup>

‎MetadataExtractor.sln

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.27130.2010
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.28917.182
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8CF154EA-6A2C-4BF4-B263-78758F834192}"
77
ProjectSection(SolutionItems) = preProject
@@ -10,6 +10,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1010
appveyor.yml = appveyor.yml
1111
Build.ps1 = Build.ps1
1212
CONTRIBUTING.md = CONTRIBUTING.md
13+
Directory.Build.props = Directory.Build.props
1314
LICENSE = LICENSE
1415
README.md = README.md
1516
EndProjectSection

‎MetadataExtractor/MetadataExtractor.csproj

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,11 @@
99

1010
Camera manufacturer specific support exists for Agfa, Canon, Casio, DJI, Epson, Fujifilm, Kodak, Kyocera, Leica, Minolta, Nikon, Olympus, Panasonic, Pentax, Reconyx, Sanyo, Sigma/Foveon and Sony models.
1111
</Description>
12-
<Copyright>Copyright Drew Noakes 2002-2019</Copyright>
1312
<AssemblyTitle>Metadata Extractor</AssemblyTitle>
14-
<VersionPrefix>2.0.0</VersionPrefix>
15-
<Authors>Drew Noakes</Authors>
1613
<TargetFrameworks>netstandard1.3;netstandard2.0;net35;net45</TargetFrameworks>
1714
<NoWarn>$(NoWarn);1591</NoWarn>
18-
<DebugType>portable</DebugType>
1915
<GenerateDocumentationFile>true</GenerateDocumentationFile>
2016
<PackageTags>Metadata;Exif;IPTC;XMP;ICC;Photoshop;WebP;PNG;BMP;ICO;PCX;JPEG;TIFF;PSD;Photography;QuickTime;MOV;MP4;M4V;Video</PackageTags>
21-
<PackageIconUrl>https://raw.githubusercontent.com/drewnoakes/metadata-extractor-dotnet/master/docs/metadata-extractor-logo-122.png</PackageIconUrl>
22-
<PackageProjectUrl>https://github.com/drewnoakes/metadata-extractor-dotnet</PackageProjectUrl>
23-
<PackageLicenseUrl>http://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
24-
<RepositoryType>git</RepositoryType>
25-
<RepositoryUrl>https://github.com/drewnoakes/metadata-extractor-dotnet.git</RepositoryUrl>
26-
<IncludeSymbols>true</IncludeSymbols>
27-
<IncludeSource>true</IncludeSource>
28-
<LangVersion>latest</LangVersion>
2917
</PropertyGroup>
3018

3119
<PropertyGroup Condition=" '$(Signed)' == 'True' ">
@@ -40,11 +28,10 @@
4028
<ItemGroup>
4129
<PackageReference Include="XmpCore" Version="5.1.3.1" Condition=" '$(Signed)' != 'True' " />
4230
<PackageReference Include="XmpCore.StrongName" Version="5.1.3" Condition=" '$(Signed)' == 'True' " />
43-
<PackageReference Include="JetBrains.Annotations" Version="11.1.0" PrivateAssets="All" />
4431
</ItemGroup>
4532

4633
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
47-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.3.0" />
34+
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.5.1" />
4835
</ItemGroup>
4936

5037
<ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">

0 commit comments

Comments
 (0)