Skip to content

Commit

Permalink
Move to a single strong-named package
Browse files Browse the repository at this point in the history
  • Loading branch information
drewnoakes committed May 9, 2021
1 parent 550a0c8 commit 94b99e1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 9 deletions.
1 change: 0 additions & 1 deletion Build.ps1
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
9 changes: 1 addition & 8 deletions MetadataExtractor/MetadataExtractor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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' ">
Expand Down

0 comments on commit 94b99e1

Please sign in to comment.