Fix CI build removing the dotnet new template nupkg (#835)

AdamsLair · Jun 11, 2020 · fba2bc9 · fba2bc9
1 parent 5735917
commit fba2bc9
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 13 deletions.
diff --git a/Build/NightlyBuild/NightlyBuilder.exe b/Build/NightlyBuild/NightlyBuilder.exe
diff --git a/Build/NightlyBuild/NightlyBuilder.pdb b/Build/NightlyBuild/NightlyBuilder.pdb
diff --git a/Build/Scripts/Package Binary CI Script.bat b/Build/Scripts/Package Binary CI Script.bat
@@ -1,9 +1,6 @@
 cd %~dp0./../../Build/NightlyBuild/
 
-:: delete old nupkg files, so failed packages don't generate artifacts
-for /r %%i in (NuGetPackages\*.nupkg) do del %%i
-
-NightlyBuilder.exe NoDocs=true NoBuild=true NoTests=true NonInteractive=true
+NightlyBuilder.exe NoDocs=true NoBuild=true NoTests=true NonInteractive=true NoCleanNugetPackageTargetDir=true
 
 if %ERRORLEVEL% NEQ 0 (
   echo NightlyBuilder.exe returned with error code %ERRORLEVEL%

diff --git a/Build/Scripts/bin/VersionUpdater.exe b/Build/Scripts/bin/VersionUpdater.exe
diff --git a/Build/Scripts/bin/VersionUpdater.pdb b/Build/Scripts/bin/VersionUpdater.pdb
diff --git a/Source/DualityTemplates/DualityTemplates.csproj b/Source/DualityTemplates/DualityTemplates.csproj
@@ -61,7 +61,7 @@
 		<ItemGroup>
 			<NugetPackages Include="$(OutputPath)\*.nupkg" />
 		</ItemGroup>
-
+		<Message Importance="High" Text="Copying @(NugetPackages) to $(MSBuildProjectDirectory)\..\..\Build\NightlyBuild\NuGetPackages" />
 		<Copy SourceFiles="@(NugetPackages)" DestinationFolder="$(MSBuildProjectDirectory)\..\..\Build\NightlyBuild\NuGetPackages" />
 	</Target>
 

diff --git a/Tools/NightlyBuilder/ConfigFile.cs b/Tools/NightlyBuilder/ConfigFile.cs
@@ -17,6 +17,7 @@ public sealed class ConfigFile
 		public string CopyPackageTo { get; set; }
 		public string NuGetPath { get; set; }
 		public string NuGetPackageSpecsDir { get; set; }
+		public bool NoCleanNugetPackageTargetDir { get; set; }
 		public string NuGetPackageTargetDir { get; set; }
 		public bool NoBuild { get; set; }
 		public bool NoTests { get; set; }

diff --git a/Tools/NightlyBuilder/Program.cs b/Tools/NightlyBuilder/Program.cs
@@ -86,18 +86,23 @@ public static void Main(string[] args)
 
 		public static void PerformNightlyBuild(ConfigFile config)
 		{
-			Console.WriteLine("============================= Clean NuGet Packages ============================");
-			if (Directory.Exists(config.NuGetPackageTargetDir))
+			if (!config.NoCleanNugetPackageTargetDir)
 			{
-				Console.WriteLine("Deleting old package files in '{0}'...", config.NuGetPackageTargetDir);
-				foreach (string file in Directory.EnumerateFiles(config.NuGetPackageTargetDir, "*.nupkg", SearchOption.TopDirectoryOnly))
+				Console.WriteLine("============================= Clean NuGet Packages ============================");
+				if (Directory.Exists(config.NuGetPackageTargetDir))
 				{
-					File.Delete(file);
+					Console.WriteLine("Deleting old package files in '{0}'...", config.NuGetPackageTargetDir);
+					foreach (string file in Directory.EnumerateFiles(config.NuGetPackageTargetDir, "*.nupkg",
+						SearchOption.TopDirectoryOnly))
+					{
+						File.Delete(file);
+					}
 				}
+
+				Console.WriteLine("===============================================================================");
+				Console.WriteLine();
+				Console.WriteLine();
 			}
-			Console.WriteLine("===============================================================================");
-			Console.WriteLine();
-			Console.WriteLine();
 
 			string packagePath = Path.Combine(config.PackageDir, config.PackageName);
 			FileVersionInfo versionCore = null;