Build release artifacts on AppVeyor

fredericDelaporte · fredericDelaporte · commit 3e08893ef084 · 2018-03-27T12:11:30.000+02:00
diff --git a/CoreMemoryCache/default.build b/CoreMemoryCache/default.build
@@ -24,9 +24,4 @@
     <property name="clean.project" value="CoreMemoryCache" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages" depends="init">
-    <property name="nuget.package.project" value="NHibernate.Caches.CoreMemoryCache\NHibernate.Caches.CoreMemoryCache.csproj" />
-    <call target="common.nuget-package" />
-  </target>
 </project>
diff --git a/EnyimMemcached/default.build b/EnyimMemcached/default.build
@@ -34,9 +34,4 @@
     <property name="clean.project" value="EnyimMemcached" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages" depends="init">
-    <property name="nuget.package.project" value="NHibernate.Caches.EnyimMemcached\NHibernate.Caches.EnyimMemcached.csproj" />
-    <call target="common.nuget-package" />
-  </target>
 </project>
diff --git a/MemCache/NHibernate.Caches.MemCache/NHibernate.Caches.MemCache.csproj b/MemCache/NHibernate.Caches.MemCache/NHibernate.Caches.MemCache.csproj
@@ -8,6 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <!-- No more published, it depends on an outdated Memcache client. -->
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
diff --git a/MemCache/default.build b/MemCache/default.build
@@ -36,10 +36,4 @@
     <property name="clean.project" value="MemCache" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages" depends="init">
-    <!-- It depends on an outdated Memcached .Net client.
-    <property name="nuget.package.project" value="NHibernate.Caches.MemCache\NHibernate.Caches.MemCache.csproj" />
-    <call target="common.nuget-package" /> -->
-  </target>
 </project>
diff --git a/Prevalence/NHibernate.Caches.Prevalence/NHibernate.Caches.Prevalence.csproj b/Prevalence/NHibernate.Caches.Prevalence/NHibernate.Caches.Prevalence.csproj
@@ -8,6 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <!-- No NuGet packages are maintained for this cache. -->
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
diff --git a/Prevalence/default.build b/Prevalence/default.build
@@ -32,8 +32,4 @@
     <property name="clean.project" value="Prevalence" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages">
-    <!-- No NuGet packages are maintained for this cache. -->
-  </target>
 </project>
diff --git a/RtMemoryCache/default.build b/RtMemoryCache/default.build
@@ -25,9 +25,4 @@
     <property name="clean.project" value="RtMemoryCache" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages" depends="init">
-    <property name="nuget.package.project" value="NHibernate.Caches.RtMemoryCache\NHibernate.Caches.RtMemoryCache.csproj" />
-    <call target="common.nuget-package" />
-  </target>
 </project>
diff --git a/SharedCache/NHibernate.Caches.SharedCache/NHibernate.Caches.SharedCache.csproj b/SharedCache/NHibernate.Caches.SharedCache/NHibernate.Caches.SharedCache.csproj
@@ -6,6 +6,8 @@
     <Description>Cache provider for NHibernate using http://www.sharedcache.com</Description>
     <TargetFramework>net461</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <!-- No NuGet packages are maintained for this cache. -->
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Iesi.Collections" Version="4.0.2" />
diff --git a/SharedCache/default.build b/SharedCache/default.build
@@ -35,8 +35,4 @@
     <property name="clean.project" value="SharedCache" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages">
-    <!-- No NuGet packages are maintained for this cache. -->
-  </target>
 </project>
diff --git a/SysCache/default.build b/SysCache/default.build
@@ -25,9 +25,4 @@
     <property name="clean.project" value="SysCache" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages" depends="init">
-    <property name="nuget.package.project" value="NHibernate.Caches.SysCache\NHibernate.Caches.SysCache.csproj" />
-    <call target="common.nuget-package" />
-  </target>
 </project>
diff --git a/SysCache2/default.build b/SysCache2/default.build
@@ -25,9 +25,4 @@
     <property name="clean.project" value="SysCache2" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages" depends="init">
-    <property name="nuget.package.project" value="NHibernate.Caches.SysCache2\NHibernate.Caches.SysCache2.csproj" />
-    <call target="common.nuget-package" />
-  </target>
 </project>
diff --git a/Velocity/NHibernate.Caches.Velocity/NHibernate.Caches.Velocity.csproj b/Velocity/NHibernate.Caches.Velocity/NHibernate.Caches.Velocity.csproj
@@ -8,6 +8,8 @@
     <SignAssembly>True</SignAssembly>
     <AssemblyOriginatorKeyFile>..\..\NHibernate.Caches.snk</AssemblyOriginatorKeyFile>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <!-- No NuGet packages are maintained for this cache. -->
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
     <None Include="..\..\NHibernate.Caches.snk" Link="NHibernate.snk" />
diff --git a/Velocity/default.build b/Velocity/default.build
@@ -38,8 +38,4 @@
     <property name="clean.project" value="Velocity" />
     <call target="common.clean" />
   </target>
-
-  <target name="nuget-packages">
-    <!-- No NuGet packages are maintained for this cache. -->
-  </target>
 </project>
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,13 +2,18 @@ version: 5.2.0.{build}
 image: Visual Studio 2017
 configuration:
 - Debug
+- Release
 environment:
   global:
     netTargetFx: net461
     coreTargetFx: netcoreapp2.0
   matrix:
-    - tests: net
-    - tests: core
+  - tests: net
+  - tests: core
+matrix:
+  exclude:
+  - tests: core
+    configuration: Release
 install:
 # memcache server
 - curl -L -O -S -s http://downloads.northscale.com/memcached-1.4.5-amd64.zip
@@ -17,9 +22,77 @@ install:
 before_build:
 - which msbuild.exe
 - nuget restore NHibernate.Caches.Everything.sln
-build:
-  project: NHibernate.Caches.Everything.sln
-  verbosity: minimal
+# Disable automated build, use build script instead
+build: off
+build_script:
+- ps: >-
+    Invoke-Command -ScriptBlock {
+        $nugetFolderName = 'nuget_gallery'
+        $nugetPath = (Join-Path $env:APPVEYOR_BUILD_FOLDER $nugetFolderName)
+        $generatePackage = 'False'
+        If ($env:CONFIGURATION -eq 'Release') {
+            $generatePackage = 'True'
+        }
+        mkdir $nugetPath
+        dotnet msbuild (Join-Path $env:APPVEYOR_BUILD_FOLDER 'NHibernate.Caches.Everything.sln') /verbosity:minimal `
+            '/p:Platform="Any CPU"' "/p:Configuration=$env:CONFIGURATION" "/p:GeneratePackageOnBuild=$generatePackage" `
+            /p:IncludeSymbols=True /p:IncludeSource=True "/p:PackageOutputPath=$nugetPath"
+    }
+after_build:
+- ps: >-
+    Invoke-Command -ScriptBlock {
+        # Package artificats if this is a release build.
+        If ($env:CONFIGURATION -ne 'Release') {
+            return
+        }
+
+        $version = ($env:APPVEYOR_BUILD_VERSION).Substring(0, ($env:APPVEYOR_BUILD_VERSION).lastIndexOf('.'))
+        $netTargetFx = 'net461'
+        $nugetFolderName = 'nuget_gallery'
+        $nugetPath = (Join-Path $env:APPVEYOR_BUILD_FOLDER $nugetFolderName)
+
+        # Binaries package (does not include .Net Core libs)
+        $libsWithDependencies = @{
+            'EnyimMemcached' = @('Enyim.*');
+            'MemCache' = @('Memcached.ClientLibrary.*', 'ICSharpCode.SharpZipLib.dll');
+            'Prevalence' = @('Bamboo.Prevalence.*');
+            'RtMemoryCache' = @();
+            'SharedCache' = @('MergeSystem.Indexus.WinServiceCommon.dll', 'NLog.dll');
+            'SysCache' = @();
+            'SysCache2' = @();
+            'Velocity' = @('CacheBaseLibrary.dll', 'CASBase.dll', 'CASClient.dll', 'ClientLibrary.dll', 'FabricCommon.dll');
+        }
+
+        $binPackage = (Join-Path $env:APPVEYOR_BUILD_FOLDER "NHCH-$version-bin")
+        mkdir $binPackage
+        cp (Join-Path $env:APPVEYOR_BUILD_FOLDER 'readme.md') $binPackage
+        cp (Join-Path $env:APPVEYOR_BUILD_FOLDER 'LICENSE.txt') $binPackage
+
+        foreach($lib in $libsWithDependencies.keys) {
+            $fullProjectName = "NHibernate.Caches.$lib"
+            $libDir = Join-Path $binPackage $lib
+            mkdir $libDir
+            cp (Join-Path $env:APPVEYOR_BUILD_FOLDER 'NHibernate.Caches.snk') $libDir
+            cp (Join-Path $env:APPVEYOR_BUILD_FOLDER "$lib/$fullProjectName/bin/$env:CONFIGURATION/$netTargetFx/$fullProjectName.*") $libDir
+            foreach($dep in $libsWithDependencies[$lib]) {
+                cp (Join-Path (Join-Path $env:APPVEYOR_BUILD_FOLDER 'Lib\net\4.0') $dep) $libDir
+            }
+        }
+        cd $env:APPVEYOR_BUILD_FOLDER
+        7z a "NHCH-$version-bin.zip" "NHCH-$version-bin\"
+
+        #NuGet push bat
+        cd $nugetPath
+        $wc = New-Object System.Net.WebClient
+        $nugetExe = Join-Path $nugetPath 'NuGet.exe'
+        $wc.DownloadFile('https://dist.nuget.org/win-x86-commandline/latest/nuget.exe', $nugetExe)
+        Add-Content 'NuGetPush.bat' "rem In order to use this bat you have to be sure you have executed 'nuget SetApiKey'"
+        Get-Item '*.nupkg' -exclude '*.symbols.nupkg' | ForEach-Object {
+            Add-Content 'NuGetPush.bat' "nuget push -source https://nuget.org/ $($_.Name)"
+        }
+        cd $env:APPVEYOR_BUILD_FOLDER
+        7z a "$nugetFolderName.zip" "$nugetFolderName\"
+    }
 test_script:
 - ps: >-
     Invoke-Command -ScriptBlock {
@@ -56,5 +129,11 @@ test_script:
             exit 1
         }
     }
+artifacts:
+  - path: 'nuget_gallery\*.nupkg'
+  - path: 'nuget_gallery.zip'
+    name: NuGet packages
+  - path: 'NHCH-*-bin.zip'
+    name: Binaries
 on_finish:
 - ps: Stop-Process -Id $MemCached.Id
diff --git a/buildcommon.xml b/buildcommon.xml
@@ -79,6 +79,10 @@
       <arg value="${root.dir}/NHibernate.Caches.Everything.sln" />
       <arg value="/p:Platform=&quot;Any CPU&quot;" />
       <arg value="/p:Configuration=&quot;${build.config}&quot;"/>
+      <arg value="/p:GeneratePackageOnBuild=&quot;True&quot;" />
+      <arg value="/p:IncludeSymbols=&quot;True&quot;" />
+      <arg value="/p:IncludeSource=&quot;True&quot;" />
+      <arg value="/p:PackageOutputPath=&quot;${nuget.nupackages.dir}&quot;" />
       <arg value="/t:Restore" />
       <arg value="/t:Rebuild" />
       <arg value="/v:q" />
@@ -146,17 +150,6 @@
     <property name="async-generator-console"  value="${nuget-package-path}/tools/AsyncGenerator.CommandLine.exe" />
   </target>
 
-  <target name="common.nuget-package">
-    <exec program="${path::combine(tools.dir, 'nuget-package.cmd')}" verbose="true">
-      <arg value="${nuget.package.project}" />
-      <arg value="-c &quot;Debug&quot;" if="${build.debug == 'true'}" />
-      <arg value="-c &quot;Release&quot;" if="${build.release == 'true'}" />
-      <arg value="--include-symbols" />
-      <arg value="--include-source" />
-      <arg value="-o &quot;${nuget.nupackages.dir}&quot;" />
-    </exec>
-  </target>
-
   <target name="common.nuget-pushbat"
           description="Creates files for the release on nuget gallery.">
 
@@ -172,7 +165,7 @@
         </items>
       </in>
       <do>
-        <echo message="nuget push -source https://www.nuget.org/api/v2/package ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
+        <echo message="nuget push -source https://nuget.org/ ${filename} ${environment::newline()}" file="${nuget.nupackages.pushbatfile}" append="true"/>
       </do>
     </foreach>
   </target>
diff --git a/default.build b/default.build
@@ -61,15 +61,12 @@
     <delete dir="${nuget.nupackages.dir}" failonerror="false"/>
   </target>
 
-  <target name="nuget-packages" depends="init common.nuget-restore common.solution-restore clean-nuget-packages"
+  <target name="nuget-packages" depends="init build clean-nuget-packages"
           description="Builds NHibernate.Caches NuGet packages in the current configuration">
-    <nant target="nuget-packages">
-      <buildfiles refid="buildfiles.all" />
-    </nant>
     <call target="common.nuget-pushbat" />
   </target>
 
-  <target name="release" depends="init build binaries-zip nuget-packages"
+  <target name="release" depends="init clean-nuget-packages build binaries-zip common.nuget-pushbat"
           description="Creates files for the partial (Alpha-Beta-Candidate) Release on SourceForge">
 
     <echo message="Created a '${project.config}' package in ${build.dir}" />
