Updated Prebuild to support .NET 4.5

Resolves http://opensimulator.org/mantis/view.php?id=6951
opensim · Mar 24, 2014 · f5ae36d · f5ae36d
1 parent 425d76b
commit f5ae36d
Show file tree

Hide file tree

Showing 8 changed files with 358 additions and 10 deletions.
diff --git a/Prebuild/prebuild.xml b/Prebuild/prebuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.9.xsd" version="1.9">
-	<Solution name="Prebuild" version="2.0.5">
+<Prebuild xmlns="http://dnpb.sourceforge.net/schemas/prebuild-1.10.xsd" version="1.10">
+	<Solution name="Prebuild" version="2.0.6">
 		<Configuration name="Debug">
 			<Options>
 				<CompilerDefines>DEBUG;TRACE</CompilerDefines>
@@ -31,7 +31,7 @@
 		         type="Exe"
 		         rootNamespace="Prebuild"
 		         startupObject="Prebuild.Prebuild"
-		         version="2.0.5"
+		         version="2.0.6"
 		         frameworkVersion="v3_5"
 		>
 			<Author>Matthew Holmes (matthew@wildfiregames.com)</Author>
@@ -66,7 +66,7 @@
 			<Reference name="System" />
 			<Files>
 				<Match pattern="App.ico" buildAction="EmbeddedResource"/>
-				<Match path="data" pattern="prebuild-1.9.xsd" buildAction="EmbeddedResource"/>
+				<Match path="data" pattern="prebuild-1.10.xsd" buildAction="EmbeddedResource"/>
 				<Match path="data" pattern="autotools.xml" buildAction="EmbeddedResource"/>
 				<Match pattern="*.cs" recurse="true"/>
 			</Files>

diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs
@@ -73,7 +73,7 @@ private struct NodeEntry
 		/// <summary>
 		/// This must match the version of the schema that is embeeded
 		/// </summary>
-		private const string m_SchemaVersion = "1.9";
+		private const string m_SchemaVersion = "1.10";
 		private const string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd";
 		private const string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema;
 		bool disposed;

diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -93,7 +93,15 @@ public enum FrameworkVersion
 		/// .NET 4.0
 		/// </summary>
 		v4_0,
-	}
+        /// <summary>
+        /// .NET 4.5
+        /// </summary>
+        v4_5,
+        /// <summary>
+        /// .NET 4.5.1
+        /// </summary>
+        v4_5_1
+    }
 	/// <summary>
 	/// The Node object representing /Prebuild/Solution/Project elements
 	/// </summary>

diff --git a/Prebuild/src/Core/Targets/VS2010Target.cs b/Prebuild/src/Core/Targets/VS2010Target.cs
@@ -106,7 +106,9 @@ protected override string GetToolsVersionXml(FrameworkVersion frameworkVersion)
         {
             switch (frameworkVersion)
             {
-            	case FrameworkVersion.v4_0:
+                case FrameworkVersion.v4_5_1:
+                case FrameworkVersion.v4_5:
+                case FrameworkVersion.v4_0:
                 case FrameworkVersion.v3_5:
             		return "ToolsVersion=\"4.0\"";
                 case FrameworkVersion.v3_0:

diff --git a/Prebuild/src/Properties/AssemblyInfo.cs b/Prebuild/src/Properties/AssemblyInfo.cs
@@ -61,7 +61,7 @@
 [assembly: AssemblyConfiguration(".NET CLR")]
 [assembly: AssemblyCompany("The Prebuild Project")]
 [assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("Copyright 2004-2010 " +
+[assembly: AssemblyCopyright("Copyright 2004-2013 " +
                              "Matthew Holmes, " +
                              "Dan Moorehead, " +
                              "C.J. Adams-Collier, " +
@@ -71,7 +71,7 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
-[assembly: AssemblyVersion("2.0.5.*")]
+[assembly: AssemblyVersion("2.0.6.*")]
 
 //
 // Version information for an assembly consists of the following four values: