From 94b99e14ecf2f825814db037ea01ea671ef4ebb0 Mon Sep 17 00:00:00 2001
From: Drew Noakes <git@drewnoakes.com>
Date: Sun, 9 May 2021 20:01:29 +1000
Subject: [PATCH] Move to a single strong-named package

---
 Build.ps1                                  | 1 -
 MetadataExtractor/MetadataExtractor.csproj | 9 +--------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/Build.ps1 b/Build.ps1
index 566021c03..bc72cfe77 100644
--- 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/MetadataExtractor/MetadataExtractor.csproj b/MetadataExtractor/MetadataExtractor.csproj
index 4200a9425..159d9c2e7 100644
--- a/MetadataExtractor/MetadataExtractor.csproj
+++ b/MetadataExtractor/MetadataExtractor.csproj
@@ -12,12 +12,6 @@ Camera manufacturer specific support exists for Agfa, Canon, Casio, DJI, Epson,
     <NoWarn>$(NoWarn);1591</NoWarn>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <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>
@@ -33,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' ">