Merge pull request #288 from drewnoakes/version-2.5.0

Version 2.5.0
drewnoakes · May 9, 2021 · 3f8f1dc · 3f8f1dc
2 parents 09ebbc8 + 5066a67
commit 3f8f1dc
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 13 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -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
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -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>

diff --git a/MetadataExtractor.sln b/MetadataExtractor.sln
@@ -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

diff --git a/MetadataExtractor/MetadataExtractor.csproj b/MetadataExtractor/MetadataExtractor.csproj
@@ -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>
@@ -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' ">

diff --git a/README.md b/README.md
@@ -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>
 ```