Merge pull request #43 from drewnoakes/move-to-strong-naming

Move to strong naming
drewnoakes · May 7, 2021 · 66b9755 · 66b9755
2 parents 9aa2d3b + ffdc261
commit 66b9755
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 27 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -31,6 +31,5 @@ if ((test-path $msbuild) -eq $false) {
 }
 
 &$msbuild XmpCore\XmpCore.csproj /t:Build,Pack /p:Configuration=Release /p:PackageOutputPath=..\artifacts
-&$msbuild XmpCore\XmpCore.csproj /t:Build,Pack /p:Configuration=Release /p:PackageOutputPath=..\artifacts /p:Signed=True /p:PackageId=XmpCore.StrongName
 
 Pop-Location
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ The easiest way to reference this project is to install the [`XmpCore` package](
 
 The NuGet package has no other dependencies.
 
-If you require strongly named assemblies, use the [`XmpCore.StrongName` package](https://www.nuget.org/packages/XmpCore.StrongName/) instead.
+As of version 6.1.10.1 the package is now strong named. Before then, a separate `XmpCore.StrongName` package exists.
 
 ## Framework support
 

diff --git a/XmpCore.Tests/XmpCore.Tests.csproj b/XmpCore.Tests/XmpCore.Tests.csproj
@@ -1,12 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netcoreapp1.0;net452</TargetFrameworks>
-    <DebugType>portable</DebugType>
-    <AssemblyName>XmpCore.Tests</AssemblyName>
-    <PackageId>XmpCore.Tests</PackageId>
-    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
-    <PackageTargetFallback Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">$(PackageTargetFallback);dotnet5.4;portable-net451+win8</PackageTargetFallback>
-    <RuntimeFrameworkVersion Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">1.0.4</RuntimeFrameworkVersion>
+    <TargetFrameworks>net5.0;net48</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\XmpCore\XmpCore.csproj" />
@@ -17,11 +11,4 @@
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.2.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net452' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-  <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
-  </ItemGroup>
 </Project>
diff --git a/XmpCore.sln b/XmpCore.sln
@@ -11,6 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		appveyor.yml = appveyor.yml
 		Build.ps1 = Build.ps1
 		README.md = README.md
+		XmpCore.snk = XmpCore.snk
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XmpCore", "XmpCore\XmpCore.csproj", "{205F08AB-1CBD-4FCA-96BD-5DE5C24BDF7E}"

diff --git a/XmpCore/XmpCore.csproj b/XmpCore/XmpCore.csproj
@@ -6,16 +6,13 @@
 This library is a port of Adobe's Java XMP SDK to .NET. It was initially ported by Yakov Danila and Nathanael Jones. Now maintained by Drew Noakes and contributors on GitHub.
 
 The API should be familiar to users of Adobe's XMPCore, though it has been modified in places to better suit .NET development.</Description>
-    <Copyright>Copyright 2015-2019</Copyright>
-    <AssemblyTitle>XmpCore</AssemblyTitle>
-    <VersionPrefix>6.1.10.0</VersionPrefix>
+    <Copyright>Copyright 2015-2021</Copyright>
+    <VersionPrefix>6.1.10.1</VersionPrefix>
     <Authors>Drew Noakes</Authors>
     <TargetFrameworks>netstandard1.0;netstandard2.0;net35</TargetFrameworks>
     <NoWarn>$(NoWarn);1591</NoWarn>
     <DebugType>portable</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>XmpCore</AssemblyName>
-    <PackageId>XmpCore</PackageId>
     <PackageTags>XMP;Metadata;Exif;IPTC;ICC</PackageTags>
     <PackageIconUrl>https://raw.githubusercontent.com/drewnoakes/xmp-core-dotnet/master/docs/logo-512px.png</PackageIconUrl>
     <PackageLicenseUrl>https://www.adobe.com/devnet/xmp/library/eula-xmp-library-java.html</PackageLicenseUrl>
@@ -26,18 +23,13 @@ The API should be familiar to users of Adobe's XMPCore, though it has been modif
     <IncludeSource>true</IncludeSource>
     <PackageProjectUrl>https://github.com/drewnoakes/xmp-core-dotnet/</PackageProjectUrl>
     <LangVersion>latest</LangVersion>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Signed)' == 'True' ">
-    <AssemblyTitle>XmpCore.StrongName</AssemblyTitle>
-    <AssemblyName>XmpCore.StrongName</AssemblyName>
     <AssemblyOriginatorKeyFile>../XmpCore.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.1.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net35' ">