Reverted some changes that shouldnt be committed and made it possible…

… to use nuget versions with a prerelease suffix in the nightlybuilder (#795)

#FIX nightly updater now can handle prerelease suffixes
#FIX nightly updater now uses the correct path for nunit
#CHANGE tool projects now use net framework 4.7.2

Build/NightlyBuild/NightlyBuilder.exe.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <!-- The following runtime tag is required because MSBuild moved from .Net to Visual Studio as of VS2013 -->
   <runtime>

Build/Scripts/bin/VersionUpdater.exe.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>

Tools/NightlyBuilder/NightlyBuilder.csproj

@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>NightlyBuilder</RootNamespace>
     <AssemblyName>NightlyBuilder</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
@@ -42,17 +42,9 @@
   <ItemGroup>
     <Compile Include="ConfigFile.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

Tools/NightlyBuilder/Program.cs

@@ -147,7 +147,7 @@ public static void PerformNightlyBuild(ConfigFile config)
 							ExecuteBackgroundCommand(resultFile);
 							ExecuteBackgroundCommand(
 								string.Format("{0} {1}", 
-									Path.Combine(config.NUnitBinDir, "nunit.exe"), 
+									Path.Combine(config.NUnitBinDir, "nunit3-console.exe"), 
 									nunitProjectFile));
 							throw new ApplicationException(string.Format("At least one unit test has failed. See {0} for more information.", resultFile));
 						}
@@ -294,7 +294,7 @@ public static void PerformNightlyBuild(ConfigFile config)
 					}
 
 					Console.WriteLine("Determining package data from '{0}'...", config.NuGetPackageSpecsDir);
-					Dictionary<string,Version> packageVersions = new Dictionary<string,Version>();
+					Dictionary<string,string> packageVersions = new Dictionary<string,string>();
 					foreach (string file in Directory.EnumerateFiles(config.NuGetPackageSpecsDir, "*.nuspec", SearchOption.AllDirectories))
 					{
 						Console.Write("  {0}: ", Path.GetFileName(file));
@@ -305,7 +305,7 @@ public static void PerformNightlyBuild(ConfigFile config)
 						XElement elemVersion = doc.Descendants("version").FirstOrDefault();
 
 						string id = elemId.Value.Trim();
-						Version version = Version.Parse(elemVersion.Value.Trim());
+						string version = elemVersion.Value.Trim();
 						packageVersions[id] = version;
 
 						Console.WriteLine("{0}", version);
@@ -324,8 +324,8 @@ public static void PerformNightlyBuild(ConfigFile config)
 						foreach (XElement elemDependency in doc.Descendants("dependency"))
 						{
 							string id = elemDependency.Attribute("id").Value.Trim();
-							Version version = Version.Parse(elemDependency.Attribute("version").Value.Trim());
-							Version developedAgainstVersion;
+							string version = elemDependency.Attribute("version").Value.Trim();
+							string developedAgainstVersion;
 							if (packageVersions.TryGetValue(id, out developedAgainstVersion))
 							{
 								if (version != developedAgainstVersion)
@@ -336,14 +336,14 @@ public static void PerformNightlyBuild(ConfigFile config)
 							}
 						}
 
-						//if (skip)
-						//{
-						//	Console.ForegroundColor = ConsoleColor.Yellow;
-						//	Console.WriteLine("dependency mismatch (skip)");
-						//	Console.ResetColor();
-						//	continue;
-						//}
-						
+						if (skip)
+						{
+							Console.ForegroundColor = ConsoleColor.Yellow;
+							Console.WriteLine("dependency mismatch (skip)");
+							Console.ResetColor();
+							continue;
+						}
+
 						XElement elemId = doc.Descendants("id").FirstOrDefault();
 						XElement elemVersion = doc.Descendants("version").FirstOrDefault();
 						string targetFileName = string.Format("{0}.{1}.nupkg", elemId.Value.Trim(), elemVersion.Value.Trim());
@@ -357,7 +357,7 @@ public static void PerformNightlyBuild(ConfigFile config)
 								packResult);
 
 							// If in non-interactive mode, continue to build packages even if one of them failed.
-							if (true)
+							if (config.NonInteractive)
 							{
 								Console.ForegroundColor = ConsoleColor.Red;
 								Console.WriteLine("failed");

Tools/NightlyBuilder/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
   </startup>
   <!-- The following runtime tag is required because MSBuild moved from .Net to Visual Studio as of VS2013 -->
   <runtime>

Tools/VersionUpdater/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
-</configuration>
+</configuration>

Tools/VersionUpdater/VersionUpdater.csproj

@@ -9,8 +9,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>VersionUpdater</RootNamespace>
     <AssemblyName>VersionUpdater</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -41,17 +42,9 @@
   <ItemGroup>
     <Compile Include="ConfigFile.cs" />
     <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>

Tools/VisualStudio/DualityDebugging/DualityDebugging.csproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Duality.VisualStudio</RootNamespace>
     <AssemblyName>DualityDebugging</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <TargetFrameworkProfile />
@@ -77,7 +77,6 @@
     <Compile Include="RenderTargetVisualizer.cs" />
     <Compile Include="TextureVisualizer.cs" />
     <Compile Include="PixmapVisualizer.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="BitmapView.resx">
@@ -95,11 +94,4 @@
     <None Include="Resources\disk.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>