Published Magick.NET 7.0.5.900.

dlemstra · May 28, 2017 · d21a875 · d21a875
1 parent ce20cd9
commit d21a875
Show file tree

Hide file tree

Showing 25 changed files with 30 additions and 50 deletions.
diff --git a/...agick.NET.Core/src/Magick.NET.Core-Q16-HDRI.Native/Magick.NET.Core-Q16-HDRI.Native.csproj b/...agick.NET.Core/src/Magick.NET.Core-Q16-HDRI.Native/Magick.NET.Core-Q16-HDRI.Native.csproj
@@ -4,7 +4,7 @@
     <Description>Dependency for Magick.NET.Core-Q16-HDRI that should be installed instead of this package.</Description>
     <Copyright>Copyright 2013-2017 Dirk Lemstra</Copyright>
     <AssemblyTitle>Magick.NET.Core-Q16-HDRI.Native</AssemblyTitle>
-    <VersionPrefix>7.0.5.800</VersionPrefix>
+    <VersionPrefix>7.0.5.900</VersionPrefix>
     <Authors>Dirk Lemstra</Authors>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyName>Magick.NET.Core-Q16-HDRI.Native</AssemblyName>
@@ -13,6 +13,7 @@
     <PackageIconUrl>http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=magick&amp;changeSetId=752622e7b2e069b698a47df994dd4aaaf1d8aebe&amp;itemId=Magick.NET.Tests%2fImages%2fMagick.NET.icon.png</PackageIconUrl>
     <PackageProjectUrl>https://magick.codeplex.com/documentation</PackageProjectUrl>
     <PackageLicenseUrl>https://magick.codeplex.com/license</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/dlemstra/Magick.NET/releases/tag/7.0.5.900</PackageReleaseNotes>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 

diff --git a/Publish/Magick.NET.Core/src/Magick.NET.Core-Q16-HDRI/Magick.NET.Core-Q16-HDRI.csproj b/Publish/Magick.NET.Core/src/Magick.NET.Core-Q16-HDRI/Magick.NET.Core-Q16-HDRI.csproj
@@ -4,7 +4,7 @@
     <Description>ImageMagick is a powerful image manipulation library that supports over 100 major file formats (not including sub-formats). With Magick.NET you can use ImageMagick without having to install ImageMagick on your server or desktop. Visit https://magick.codeplex.com/documentation before installing to help you decide the best version.</Description>
     <Copyright>Copyright 2013-2017 Dirk Lemstra</Copyright>
     <AssemblyTitle>Magick.NET.Core-Q16-HDRI</AssemblyTitle>
-    <VersionPrefix>7.0.5.800</VersionPrefix>
+    <VersionPrefix>7.0.5.900</VersionPrefix>
     <Authors>Dirk Lemstra</Authors>
     <TargetFramework>netstandard1.3</TargetFramework>
     <DefineConstants>$(DefineConstants);Q16HDRI;ANYCPU</DefineConstants>
@@ -20,6 +20,7 @@
     <PackageIconUrl>http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=magick&amp;changeSetId=752622e7b2e069b698a47df994dd4aaaf1d8aebe&amp;itemId=Magick.NET.Tests%2fImages%2fMagick.NET.icon.png</PackageIconUrl>
     <PackageProjectUrl>https://magick.codeplex.com/documentation</PackageProjectUrl>
     <PackageLicenseUrl>https://magick.codeplex.com/license</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/dlemstra/Magick.NET/releases/tag/7.0.5.900</PackageReleaseNotes>
     <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>

diff --git a/Publish/Magick.NET.Core/src/Magick.NET.Core-Q16.Native/Magick.NET.Core-Q16.Native.csproj b/Publish/Magick.NET.Core/src/Magick.NET.Core-Q16.Native/Magick.NET.Core-Q16.Native.csproj
@@ -4,7 +4,7 @@
     <Description>Dependency for Magick.NET.Core-Q16 that should be installed instead of this package.</Description>
     <Copyright>Copyright 2013-2017 Dirk Lemstra</Copyright>
     <AssemblyTitle>Magick.NET.Core-Q16.Native</AssemblyTitle>
-    <VersionPrefix>7.0.5.800</VersionPrefix>
+    <VersionPrefix>7.0.5.900</VersionPrefix>
     <Authors>Dirk Lemstra</Authors>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyName>Magick.NET.Core-Q16.Native</AssemblyName>
@@ -13,6 +13,7 @@
     <PackageIconUrl>http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=magick&amp;changeSetId=752622e7b2e069b698a47df994dd4aaaf1d8aebe&amp;itemId=Magick.NET.Tests%2fImages%2fMagick.NET.icon.png</PackageIconUrl>
     <PackageProjectUrl>https://magick.codeplex.com/documentation</PackageProjectUrl>
     <PackageLicenseUrl>https://magick.codeplex.com/license</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/dlemstra/Magick.NET/releases/tag/7.0.5.900</PackageReleaseNotes>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 

diff --git a/Publish/Magick.NET.Core/src/Magick.NET.Core-Q16/Magick.NET.Core-Q16.csproj b/Publish/Magick.NET.Core/src/Magick.NET.Core-Q16/Magick.NET.Core-Q16.csproj
@@ -4,7 +4,7 @@
     <Description>ImageMagick is a powerful image manipulation library that supports over 100 major file formats (not including sub-formats). With Magick.NET you can use ImageMagick without having to install ImageMagick on your server or desktop. Visit https://magick.codeplex.com/documentation before installing to help you decide the best version.</Description>
     <Copyright>Copyright 2013-2017 Dirk Lemstra</Copyright>
     <AssemblyTitle>Magick.NET.Core-Q16</AssemblyTitle>
-    <VersionPrefix>7.0.5.800</VersionPrefix>
+    <VersionPrefix>7.0.5.900</VersionPrefix>
     <Authors>Dirk Lemstra</Authors>
     <TargetFramework>netstandard1.3</TargetFramework>
     <DefineConstants>$(DefineConstants);Q16;ANYCPU</DefineConstants>
@@ -20,6 +20,7 @@
     <PackageIconUrl>http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=magick&amp;changeSetId=752622e7b2e069b698a47df994dd4aaaf1d8aebe&amp;itemId=Magick.NET.Tests%2fImages%2fMagick.NET.icon.png</PackageIconUrl>
     <PackageProjectUrl>https://magick.codeplex.com/documentation</PackageProjectUrl>
     <PackageLicenseUrl>https://magick.codeplex.com/license</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/dlemstra/Magick.NET/releases/tag/7.0.5.900</PackageReleaseNotes>
     <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>

diff --git a/Publish/Magick.NET.Core/src/Magick.NET.Core-Q8.Native/Magick.NET.Core-Q8.Native.csproj b/Publish/Magick.NET.Core/src/Magick.NET.Core-Q8.Native/Magick.NET.Core-Q8.Native.csproj
@@ -4,7 +4,7 @@
     <Description>Dependency for Magick.NET.Core-Q8 that should be installed instead of this package.</Description>
     <Copyright>Copyright 2013-2017 Dirk Lemstra</Copyright>
     <AssemblyTitle>Magick.NET.Core-Q8.Native</AssemblyTitle>
-    <VersionPrefix>7.0.5.800</VersionPrefix>
+    <VersionPrefix>7.0.5.900</VersionPrefix>
     <Authors>Dirk Lemstra</Authors>
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyName>Magick.NET.Core-Q8.Native</AssemblyName>
@@ -13,6 +13,7 @@
     <PackageIconUrl>http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=magick&amp;changeSetId=752622e7b2e069b698a47df994dd4aaaf1d8aebe&amp;itemId=Magick.NET.Tests%2fImages%2fMagick.NET.icon.png</PackageIconUrl>
     <PackageProjectUrl>https://magick.codeplex.com/documentation</PackageProjectUrl>
     <PackageLicenseUrl>https://magick.codeplex.com/license</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/dlemstra/Magick.NET/releases/tag/7.0.5.900</PackageReleaseNotes>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 

diff --git a/Publish/Magick.NET.Core/src/Magick.NET.Core-Q8/Magick.NET.Core-Q8.csproj b/Publish/Magick.NET.Core/src/Magick.NET.Core-Q8/Magick.NET.Core-Q8.csproj
@@ -4,7 +4,7 @@
     <Description>ImageMagick is a powerful image manipulation library that supports over 100 major file formats (not including sub-formats). With Magick.NET you can use ImageMagick without having to install ImageMagick on your server or desktop. Visit https://magick.codeplex.com/documentation before installing to help you decide the best version.</Description>
     <Copyright>Copyright 2013-2017 Dirk Lemstra</Copyright>
     <AssemblyTitle>Magick.NET.Core-Q8</AssemblyTitle>
-    <VersionPrefix>7.0.5.800</VersionPrefix>
+    <VersionPrefix>7.0.5.900</VersionPrefix>
     <Authors>Dirk Lemstra</Authors>
     <TargetFramework>netstandard1.3</TargetFramework>
     <DefineConstants>$(DefineConstants);Q8;ANYCPU</DefineConstants>
@@ -20,6 +20,7 @@
     <PackageIconUrl>http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=magick&amp;changeSetId=752622e7b2e069b698a47df994dd4aaaf1d8aebe&amp;itemId=Magick.NET.Tests%2fImages%2fMagick.NET.icon.png</PackageIconUrl>
     <PackageProjectUrl>https://magick.codeplex.com/documentation</PackageProjectUrl>
     <PackageLicenseUrl>https://magick.codeplex.com/license</PackageLicenseUrl>
+    <PackageReleaseNotes>https://github.com/dlemstra/Magick.NET/releases/tag/7.0.5.900</PackageReleaseNotes>
     <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>

diff --git a/Publish/NuGet/Magick.NET.Sample.nuspec b/Publish/NuGet/Magick.NET.Sample.nuspec
@@ -11,6 +11,7 @@
     <iconUrl>http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=magick&amp;changeSetId=752622e7b2e069b698a47df994dd4aaaf1d8aebe&amp;itemId=Magick.NET.Tests%2fImages%2fMagick.NET.icon.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>This package contains samples that demonstrate the use of the Magick.NET library.</description>
+    <releaseNotes/>
     <copyright>Copyright 2013-2017 Dirk Lemstra</copyright>
     <tags>ImageMagick Magick.NET Image Convert Resize Draw Effects</tags>
     <dependencies>

diff --git a/Publish/NuGet/Magick.NET.Web.nuspec b/Publish/NuGet/Magick.NET.Web.nuspec
@@ -11,6 +11,7 @@
     <iconUrl>http://download-codeplex.sec.s-msft.com/Download/SourceControlFileDownload.ashx?ProjectName=magick&amp;changeSetId=752622e7b2e069b698a47df994dd4aaaf1d8aebe&amp;itemId=Magick.NET.Tests%2fImages%2fMagick.NET.icon.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>This package contains a httpmodule that uses various handlers to script/optimize/compress images.</description>
+    <releaseNotes/>
     <copyright>Copyright 2013-2017 Dirk Lemstra</copyright>
     <tags>ImageMagick Magick.NET Image Convert Resize Draw Effects</tags>
     <dependencies>

diff --git a/Publish/Publish.cmd b/Publish/Publish.cmd
@@ -1,4 +1,4 @@
 @echo off
 call "%vs140comntools%vsvars32.bat"
-powershell -ExecutionPolicy Unrestricted ..\Tools\Scripts\Publish.ps1 "7.0.5.800"
+powershell -ExecutionPolicy Unrestricted ..\Tools\Scripts\Publish.ps1 "7.0.5.900"
 pause
diff --git a/Source/Magick.NET.Native/Resources/DebugQ16-HDRI/Win32/Magick.NET.rc b/Source/Magick.NET.Native/Resources/DebugQ16-HDRI/Win32/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/DebugQ16-HDRI/x64/Magick.NET.rc b/Source/Magick.NET.Native/Resources/DebugQ16-HDRI/x64/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/DebugQ16/Win32/Magick.NET.rc b/Source/Magick.NET.Native/Resources/DebugQ16/Win32/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/DebugQ16/x64/Magick.NET.rc b/Source/Magick.NET.Native/Resources/DebugQ16/x64/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/DebugQ8/Win32/Magick.NET.rc b/Source/Magick.NET.Native/Resources/DebugQ8/Win32/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/DebugQ8/x64/Magick.NET.rc b/Source/Magick.NET.Native/Resources/DebugQ8/x64/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/ReleaseQ16-HDRI/Win32/Magick.NET.rc b/Source/Magick.NET.Native/Resources/ReleaseQ16-HDRI/Win32/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/ReleaseQ16-HDRI/x64/Magick.NET.rc b/Source/Magick.NET.Native/Resources/ReleaseQ16-HDRI/x64/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/ReleaseQ16/Win32/Magick.NET.rc b/Source/Magick.NET.Native/Resources/ReleaseQ16/Win32/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/ReleaseQ16/x64/Magick.NET.rc b/Source/Magick.NET.Native/Resources/ReleaseQ16/x64/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/ReleaseQ8/Win32/Magick.NET.rc b/Source/Magick.NET.Native/Resources/ReleaseQ8/Win32/Magick.NET.rc
diff --git a/Source/Magick.NET.Native/Resources/ReleaseQ8/x64/Magick.NET.rc b/Source/Magick.NET.Native/Resources/ReleaseQ8/x64/Magick.NET.rc
diff --git a/Source/Magick.NET.Web/Properties/AssemblyInfo.cs b/Source/Magick.NET.Web/Properties/AssemblyInfo.cs
@@ -53,7 +53,7 @@
 [assembly: AssemblyConfiguration("Release")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.5.800")]
+[assembly: AssemblyFileVersion("7.0.5.900")]
 [assembly: ComVisible(false)]
 #if Q16
 [assembly: CLSCompliant(false)]

diff --git a/Source/Magick.NET/Core/Properties/AssemblyInfo.Core.cs b/Source/Magick.NET/Core/Properties/AssemblyInfo.Core.cs
@@ -26,7 +26,7 @@
 [assembly: AssemblyConfiguration("Release")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.5.800")]
+[assembly: AssemblyFileVersion("7.0.5.900")]
 [assembly: ComVisible(false)]
 #if Q16
 [assembly: CLSCompliant(false)]

diff --git a/Source/Magick.NET/Properties/AssemblyInfo.cs b/Source/Magick.NET/Properties/AssemblyInfo.cs
@@ -75,7 +75,7 @@
 [assembly: AssemblyConfiguration("Release")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.5.800")]
+[assembly: AssemblyFileVersion("7.0.5.900")]
 [assembly: ComVisible(false)]
 #if Q16
 [assembly: CLSCompliant(false)]

diff --git a/Tools/Scripts/Shared/Publish.ps1 b/Tools/Scripts/Shared/Publish.ps1
@@ -53,34 +53,6 @@ function CheckStrongNames($builds)
   }
 }
 
-function GetImageMagickVersion()
-{
-  $versionPath = FullPath "ImageMagick\Include\MagickCore\version.h"
-  $lines = [IO.File]::ReadAllLines($versionPath, [System.Text.Encoding]::UTF8)
-
-  $version = "0.0.0"
-  $addendum = "--0"
-  foreach ($line in $lines)
-  {
-    if ($line.StartsWith("#define MagickLibVersionText  "))
-    {
-      $version = $line.Replace("""","").SubString(30);
-    }
-    elseif ($line.StartsWith("#define MagickLibAddendum  "))
-    {
-      $addendum = $line.Replace("""","").SubString(27);
-    }
-  }
-
-  if (("$version" -eq "0.0.0") -or ("$addendum" -eq "--0"))
-  {
-    Write-Error "Unable to find ImageMagickVersion"
-    Exit
-  }
-
-  return "$version$addendum"
-}
-
 function CreateNuGetPackage($id, $version, $build)
 {
   $path = FullPath "Publish\NuGet\Magick.NET.nuspec"
@@ -92,9 +64,6 @@ function CreateNuGetPackage($id, $version, $build)
     $platform = "Win32"
   }
 
-  $imVersion = GetImageMagickVersion
-  $xml.package.metadata.releaseNotes = "Magick.NET linked with ImageMagick " + $imVersion
-
   AddFileElement $xml "..\..\Source\Magick.NET\bin\Release$($build.Quantum)\$($build.Platform).net20\Magick.NET-$($build.Quantum)-$($build.Platform).dll" "lib\net20"
   AddFileElement $xml "..\..\Source\Magick.NET\bin\Release$($build.Quantum)\$($build.Platform).net20\Magick.NET-$($build.Quantum)-$($build.Platform).xml" "lib\net20"
 
@@ -125,7 +94,7 @@ function CreateNuGetPackage($id, $version, $build)
   WriteNuGetPackage $webId $version $xml
 }
 
-function SetVersion($content, $startMatch, $endMatch, $version)
+function SetValue($content, $startMatch, $endMatch, $value)
 {
   $start = $content.IndexOf($startMatch)
   if ($start -eq -1)
@@ -137,7 +106,7 @@ function SetVersion($content, $startMatch, $endMatch, $version)
   $start += $startMatch.Length
 
   $newContent = $content.Substring(0, $start)
-  $newContent += $version
+  $newContent += $value
 
   $start = $content.IndexOf($endMatch, $start)
   if ($start -eq -1)
@@ -154,7 +123,7 @@ function UpdateAssemblyInfo($fileName, $version)
 {
   $path = FullPath $fileName
   $content = [IO.File]::ReadAllText($path, [System.Text.Encoding]::Default)
-  $content = SetVersion $content "AssemblyFileVersion(`"" "`"" $version
+  $content = SetValue $content "AssemblyFileVersion(`"" "`"" $version
   [IO.File]::WriteAllText($path, $content, [System.Text.Encoding]::Default)
 }
 
@@ -170,7 +139,9 @@ function UpdateCoreProject($directory, $version)
   $path = FullPath "Publish\Magick.NET.Core\src\$directory\$directory.csproj"
 
   $content = [IO.File]::ReadAllText($path, [System.Text.Encoding]::Default)
-  $content = SetVersion $content "`<VersionPrefix`>" "`<" $version
+  $content = SetValue $content "`<VersionPrefix`>" "`<" $version
+  $content = SetValue $content "`<PackageReleaseNotes`>" "`<" "https://github.com/dlemstra/Magick.NET/releases/tag/$version"
+
   [IO.File]::WriteAllText($path, $content, [System.Text.Encoding]::Default)
 }
 
@@ -187,11 +158,11 @@ function UpdateCoreProjects($version)
 function UpdateResourceFile($fileName, $version)
 {
   $content = [IO.File]::ReadAllText($fileName, [System.Text.Encoding]::Unicode)
-  $content = SetVersion $content "FILEVERSION " `r $version.Replace('.', ',')
-  $content = SetVersion $content "PRODUCTVERSION " `r $version.Replace('.', ',')
-  $content = SetVersion $content "`"FileVersion`", `""  "`"" $version
-  $content = SetVersion $content "`"ProductVersion`", `"" "`"" $version
-  $content = SetVersion $content "`"LegalCopyright`", `"" "`"" "Copyright © Dirk Lemstra $((Get-Date).year)"
+  $content = SetValue $content "FILEVERSION " `r $version.Replace('.', ',')
+  $content = SetValue $content "PRODUCTVERSION " `r $version.Replace('.', ',')
+  $content = SetValue $content "`"FileVersion`", `""  "`"" $version
+  $content = SetValue $content "`"ProductVersion`", `"" "`"" $version
+  $content = SetValue $content "`"LegalCopyright`", `"" "`"" "Copyright © Dirk Lemstra $((Get-Date).year)"
 
   [IO.File]::WriteAllText($fileName, $content, [System.Text.Encoding]::Unicode)
 }
@@ -229,6 +200,7 @@ function WriteNuGetPackage($id, $version, $xml)
   $xml.package.metadata.id = $id
   $xml.package.metadata.title = $id
   $xml.package.metadata.version = $version
+  $xml.package.metadata.releaseNotes = "https://github.com/dlemstra/Magick.NET/releases/tag/$version"
 
   $dir = FullPath "Publish\NuGet"
   $nuspecFile = "$dir\$id.nuspec"