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

Version 2.5.0 #288

Merged
merged 5 commits into from
May 9, 2021
Merged

Version 2.5.0 #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
59fd865
Remove redundant MSBuild property
drewnoakes May 9, 2021
6bb8868
Bump copyright year
drewnoakes May 9, 2021
550a0c8
Add solution items
drewnoakes May 9, 2021
94b99e1
Move to a single strong-named package
drewnoakes May 9, 2021
5066a67
Version 2.5.0
drewnoakes May 9, 2021
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: 0 additions & 1 deletion Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,5 @@ if ((test-path $msbuild) -eq $false) {
}

&$msbuild MetadataExtractor\MetadataExtractor.csproj /t:Restore,Build,Pack /p:Configuration=Release /p:ContinuousIntegrationBuild=True /p:PackageOutputPath=..\artifacts
&$msbuild MetadataExtractor\MetadataExtractor.csproj /t:Restore,Build,Pack /p:Configuration=Release /p:ContinuousIntegrationBuild=True /p:PackageOutputPath=..\artifacts /p:Signed=True /p:PackageId=MetadataExtractor.StrongName

Pop-Location
4 changes: 2 additions & 2 deletions Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<Project>

<PropertyGroup>
<VersionPrefix>2.4.3</VersionPrefix>
<VersionPrefix>2.5.0</VersionPrefix>
<DebugType>portable</DebugType>
<LangVersion>preview</LangVersion>
<Nullable>enable</Nullable>
<Authors>Drew Noakes</Authors>
<Copyright>Copyright Drew Noakes 2002-2020</Copyright>
<Copyright>Copyright Drew Noakes 2002-2021</Copyright>
<PackageIcon>metadata-extractor-logo-122.png</PackageIcon>
<PackageProjectUrl>https://github.com/drewnoakes/metadata-extractor-dotnet</PackageProjectUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
Expand Down
2 changes: 2 additions & 0 deletions MetadataExtractor.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
.editorconfig = .editorconfig
.gitattributes = .gitattributes
.gitignore = .gitignore
.gitmodules = .gitmodules
appveyor.yml = appveyor.yml
azure-pipelines.yml = azure-pipelines.yml
Build.ps1 = Build.ps1
CONTRIBUTING.md = CONTRIBUTING.md
Directory.Build.props = Directory.Build.props
Directory.Build.targets = Directory.Build.targets
LICENSE = LICENSE
MetadataExtractor.snk = MetadataExtractor.snk
README.md = README.md
EndProjectSection
EndProject
Expand Down
10 changes: 1 addition & 9 deletions MetadataExtractor/MetadataExtractor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,7 @@ Camera manufacturer specific support exists for Agfa, Canon, Casio, DJI, Epson,
<TargetFrameworks>netstandard1.3;netstandard2.0;net35;net45</TargetFrameworks>
<NoWarn>$(NoWarn);1591</NoWarn>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageId>MetadataExtractor</PackageId>
<PackageTags>Metadata;Exif;IPTC;XMP;ICC;Photoshop;WebP;PNG;BMP;ICO;PCX;JPEG;TIFF;PSD;Photography;QuickTime;MOV;MP4;M4V;Video;MP3;WAV;Imaging;Video;Audio</PackageTags>
</PropertyGroup>

<PropertyGroup Condition=" '$(Signed)' == 'True' ">
<PackageId>MetadataExtractor.StrongName</PackageId>
<AssemblyTitle>Metadata Extractor (Strong Name)</AssemblyTitle>
<AssemblyName>MetadataExtractor.StrongName</AssemblyName>
<AssemblyOriginatorKeyFile>../MetadataExtractor.snk</AssemblyOriginatorKeyFile>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
Expand All @@ -34,8 +27,7 @@ Camera manufacturer specific support exists for Agfa, Canon, Casio, DJI, Epson,
</ItemGroup>

<ItemGroup>
<PackageReference Include="XmpCore" Version="6.1.10" Condition=" '$(Signed)' != 'True' " />
<PackageReference Include="XmpCore.StrongName" Version="6.1.10" Condition=" '$(Signed)' == 'True' " />
<PackageReference Include="XmpCore" Version="6.1.10.1" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' OR '$(TargetFramework)' == 'netstandard2.0' ">
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Either add this to your project file

```xml
<ItemGroup>
<PackageReference Include="MetadataExtractor" Version="2.4.3" />
<PackageReference Include="MetadataExtractor" Version="2.5.0" />
</ItemGroup>
```

Expand Down