diff --git a/Build/NightlyBuild/BuildConfig.xml b/Build/NightlyBuild/BuildConfig.xml
index 7afac36e6..35569f8aa 100644
--- a/Build/NightlyBuild/BuildConfig.xml
+++ b/Build/NightlyBuild/BuildConfig.xml
@@ -3,75 +3,13 @@
..\..\Duality.sln
..\Output
..\Documentation\Documentation.shfbproj
- AdditionalFiles
..\NUnit
..\..\Test\
nuget.exe
..\NuGetPackageSpecs
NuGetPackages
- Duality
Package
Duality.zip
false
false
-
- Backup
- Source
- Data
- DDoc.chm
- GamePlugin.*.dll
- DynamicLighting.*.dll
- Steering.*.dll
- GamePlugin.*.xml
- DynamicLighting.*.xml
- Steering.*.xml
- *.vshost.*
- logfile*
- perflog*
- userdata.dat
- defaultuserdata.dat
- designtimedata.dat
- appdata.dat
- editoruserdata.xml
- FarseerOpenTK.xml
- OpenTK.GLControl.xml
- OpenTK.GLControl.xml
- VistaBridgeLibrary.xml
- WeifenLuo.WinFormsUI.Docking.pdb
- Windows7.DesktopIntegration.xml
- OpenAL32.dll
-
- Plugins
- AdamsLair.WinForms.*
- Aga.Controls.*
- DualityPrimitives.pdb
- DualityPrimitives.xml
- Duality.pdb
- Duality.xml
- DualityEditor.pdb
- DualityEditor.xml
- DualityLauncher.*
- DualityUpdater.*
- DualityPhysics.pdb
- DualityPhysics.xml
- Ionic.Zip.*
- NVorbis.*
- OpenALSoft32.*
- OpenALSoft64.*
- OpenTK.*
- OpenTK.GLControl.*
- PopupControl.*
- WeifenLuo.WinFormsUI.Docking.*
-
- *Tests.dll
- *Tests.pdb
- nunit.framework.dll
- nunit.framework.xml
- nunit.framework.pdb
- nunit.engine.api.dll
- nunit.engine.dll
- nunit_random_seed.tmp
- NUnit3.TestAdapter.dll
- NUnit3.TestAdapter.pdb
-
\ No newline at end of file
diff --git a/Build/NightlyBuild/NightlyBuilder.exe b/Build/NightlyBuild/NightlyBuilder.exe
index 30769619e..f86d733c6 100644
Binary files a/Build/NightlyBuild/NightlyBuilder.exe and b/Build/NightlyBuild/NightlyBuilder.exe differ
diff --git a/Build/NightlyBuild/NightlyBuilder.pdb b/Build/NightlyBuild/NightlyBuilder.pdb
index 0fb8ca3aa..af757f9f6 100644
Binary files a/Build/NightlyBuild/NightlyBuilder.pdb and b/Build/NightlyBuild/NightlyBuilder.pdb differ
diff --git a/Tools/NightlyBuilder/ConfigFile.cs b/Tools/NightlyBuilder/ConfigFile.cs
index 7b4c50107..018bea9d8 100644
--- a/Tools/NightlyBuilder/ConfigFile.cs
+++ b/Tools/NightlyBuilder/ConfigFile.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.IO;
+using System.IO;
using System.Xml.Serialization;
namespace NightlyBuilder
@@ -14,10 +10,8 @@ public sealed class ConfigFile
public string DocSolutionPath { get; set; }
public string DocBuildResultDir { get; set; }
public string DocBuildResultFile { get; set; }
- public string AdditionalFileDir { get; set; }
public string NUnitBinDir { get; set; }
public string UnitTestProjectDir { get; set; }
- public string IntermediateTargetDir { get; set; }
public string PackageDir { get; set; }
public string PackageName { get; set; }
public string CopyPackageTo { get; set; }
@@ -28,7 +22,6 @@ public sealed class ConfigFile
public bool NoTests { get; set; }
public bool NoDocs { get; set; }
public bool NonInteractive { get; set; }
- public List FileCopyBlackList { get; set; }
public void Save(string filePath)
{
diff --git a/Tools/NightlyBuilder/Program.cs b/Tools/NightlyBuilder/Program.cs
index fe495e5cc..fb1aef3eb 100644
--- a/Tools/NightlyBuilder/Program.cs
+++ b/Tools/NightlyBuilder/Program.cs
@@ -6,7 +6,6 @@
using System.Text;
using System.Text.RegularExpressions;
using System.IO;
-using System.IO.Compression;
using System.Diagnostics;
using System.Reflection;
@@ -207,75 +206,6 @@ public static void PerformNightlyBuild(ConfigFile config)
Console.WriteLine();
Console.WriteLine();
}
-
- // Copy the results to the target directory
- Console.WriteLine("================================ Copy to Target ===============================");
- {
- Console.WriteLine("Creating target directory '{0}'", config.IntermediateTargetDir);
- if (Directory.Exists(config.IntermediateTargetDir))
- Directory.Delete(config.IntermediateTargetDir, true);
- CopyDirectory(config.BuildResultDir, config.IntermediateTargetDir, true, path =>
- {
- string fileName = Path.GetFileName(path);
- foreach (string blackListEntry in config.FileCopyBlackList)
- {
- if (Regex.IsMatch(fileName, WildcardToRegex(blackListEntry), RegexOptions.IgnoreCase))
- {
- Console.ForegroundColor = ConsoleColor.DarkGray;
- Console.WriteLine("Ignore {0}", path);
- Console.ForegroundColor = ConsoleColor.Gray;
- return false;
- }
- }
- Console.WriteLine("Copy {0}", path);
- return true;
- });
- if (!string.IsNullOrEmpty(config.AdditionalFileDir) && Directory.Exists(config.AdditionalFileDir))
- {
- CopyDirectory(config.AdditionalFileDir, config.IntermediateTargetDir, true);
- }
- }
- Console.WriteLine("===============================================================================");
- Console.WriteLine();
- Console.WriteLine();
-
- // Create the ZIP package
- Console.WriteLine("============================== Create ZIP Package =============================");
- {
- Console.WriteLine("Package Path: {0}", packagePath);
- if (!Directory.Exists(config.PackageDir))
- Directory.CreateDirectory(config.PackageDir);
-
- string[] files = Directory.GetFiles(config.IntermediateTargetDir, "*", SearchOption.AllDirectories);
- using (FileStream packageStream = File.Open(packagePath, FileMode.Create))
- using (ZipArchive archive = new ZipArchive(packageStream, ZipArchiveMode.Create, true))
- {
- foreach (string filePath in files)
- {
- ZipArchiveEntry fileEntry = archive.CreateEntry(filePath);
- using (Stream entryStream = fileEntry.Open())
- using (BinaryWriter entryWriter = new BinaryWriter(entryStream))
- {
- byte[] fileData = File.ReadAllBytes(filePath);
- entryWriter.Write(fileData);
- }
- }
- }
- }
- Console.WriteLine("===============================================================================");
- Console.WriteLine();
- Console.WriteLine();
-
- // Cleanup
- Console.WriteLine("=================================== Cleanup ===================================");
- {
- Console.WriteLine("Deleting target directory '{0}'", config.IntermediateTargetDir);
- if (Directory.Exists(config.IntermediateTargetDir))
- Directory.Delete(config.IntermediateTargetDir, true);
- }
- Console.WriteLine("===============================================================================");
- Console.WriteLine();
- Console.WriteLine();
// Build all NuGet Packages
Console.WriteLine("============================= Build NuGet Packages ============================");
diff --git a/appveyor.yml b/appveyor.yml
index 9f82b7e53..b57876c52 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -24,25 +24,26 @@ test:
categories:
except:
- Rendering # AppVeyor VMs don't have GPU access.
-
+
#
# The following lines trigger a complete NuGet Package and Binary Release build.
# They do not attempt to deploy them - it's just a build, made available through artifacts.
-# The reason why it's inactive is that releases are in fact a relatively rare thing,
-# while AppVeyor runs on each commit. It's probably for the best to not accumulate 6 - 11 MB
-# of disk space in the AppVeyor VM on each commit, never to go away because of build history.
#
# In order to do a manual build on your local machine, use the "Package Binary NoDocs.bat" script,
# or, if you have SandCastle HelpFile Builder installed, use the "Package Binary.bat" script.
# You will find the build results in the below artifact paths.
-#
-
-#after_test: '"Build\Scripts\Package Binary CI Script.bat"'
+#
+
+after_test: '"Build\Scripts\Package Binary CI Script.bat"'
+
+artifacts:
+ - path: 'Source\DualityTemplates\bin\Duality.zip'
+ name: "Binary Release"
+ - path: 'Build\NightlyBuild\NuGetPackages\*.nupkg'
+ name: "NuGet Packages"
-#artifacts:
-# - path: 'Build\NightlyBuild\Package\Duality.zip'
-# name: "Binary Release"
-# - path: 'Build\NightlyBuild\NuGetPackages'
-# name: "All NuGet Packages"
-# - path: 'Build\NightlyBuild\NuGetPackages\*.nupkg'
-# name: "NuGet Packages"
+deploy:
+ - provider: Environment
+ name: NuGetPackageRelease
+ on:
+ branch: release
\ No newline at end of file