aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Prebuild/src/Core
diff options
context:
space:
mode:
authorOren Hurvitz2013-12-03 08:47:47 +0200
committerOren Hurvitz2014-03-24 12:26:54 +0100
commitf5ae36d7e25a20199d676e53a066be79f76b580d (patch)
tree30b6bb359ced6b6ff899b078c921df70ad3a4358 /Prebuild/src/Core
parentEnable runprebuild.bat to run in Cygwin (diff)
downloadopensim-SC_OLD-f5ae36d7e25a20199d676e53a066be79f76b580d.zip
opensim-SC_OLD-f5ae36d7e25a20199d676e53a066be79f76b580d.tar.gz
opensim-SC_OLD-f5ae36d7e25a20199d676e53a066be79f76b580d.tar.bz2
opensim-SC_OLD-f5ae36d7e25a20199d676e53a066be79f76b580d.tar.xz
Updated Prebuild to support .NET 4.5
Resolves http://opensimulator.org/mantis/view.php?id=6951
Diffstat (limited to 'Prebuild/src/Core')
-rw-r--r--Prebuild/src/Core/Kernel.cs2
-rw-r--r--Prebuild/src/Core/Nodes/ProjectNode.cs10
-rw-r--r--Prebuild/src/Core/Targets/VS2010Target.cs4
3 files changed, 13 insertions, 3 deletions
diff --git a/Prebuild/src/Core/Kernel.cs b/Prebuild/src/Core/Kernel.cs
index 67051d5..761962e 100644
--- a/Prebuild/src/Core/Kernel.cs
+++ b/Prebuild/src/Core/Kernel.cs
@@ -73,7 +73,7 @@ namespace Prebuild.Core
73 /// <summary> 73 /// <summary>
74 /// This must match the version of the schema that is embeeded 74 /// This must match the version of the schema that is embeeded
75 /// </summary> 75 /// </summary>
76 private const string m_SchemaVersion = "1.9"; 76 private const string m_SchemaVersion = "1.10";
77 private const string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd"; 77 private const string m_Schema = "prebuild-" + m_SchemaVersion + ".xsd";
78 private const string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema; 78 private const string m_SchemaURI = "http://dnpb.sourceforge.net/schemas/" + m_Schema;
79 bool disposed; 79 bool disposed;
diff --git a/Prebuild/src/Core/Nodes/ProjectNode.cs b/Prebuild/src/Core/Nodes/ProjectNode.cs
index fb92b32..a822704 100644
--- a/Prebuild/src/Core/Nodes/ProjectNode.cs
+++ b/Prebuild/src/Core/Nodes/ProjectNode.cs
@@ -93,7 +93,15 @@ namespace Prebuild.Core.Nodes
93 /// .NET 4.0 93 /// .NET 4.0
94 /// </summary> 94 /// </summary>
95 v4_0, 95 v4_0,
96 } 96 /// <summary>
97 /// .NET 4.5
98 /// </summary>
99 v4_5,
100 /// <summary>
101 /// .NET 4.5.1
102 /// </summary>
103 v4_5_1
104 }
97 /// <summary> 105 /// <summary>
98 /// The Node object representing /Prebuild/Solution/Project elements 106 /// The Node object representing /Prebuild/Solution/Project elements
99 /// </summary> 107 /// </summary>
diff --git a/Prebuild/src/Core/Targets/VS2010Target.cs b/Prebuild/src/Core/Targets/VS2010Target.cs
index ea9f736..f7562b0 100644
--- a/Prebuild/src/Core/Targets/VS2010Target.cs
+++ b/Prebuild/src/Core/Targets/VS2010Target.cs
@@ -106,7 +106,9 @@ namespace Prebuild.Core.Targets
106 { 106 {
107 switch (frameworkVersion) 107 switch (frameworkVersion)
108 { 108 {
109 case FrameworkVersion.v4_0: 109 case FrameworkVersion.v4_5_1:
110 case FrameworkVersion.v4_5:
111 case FrameworkVersion.v4_0:
110 case FrameworkVersion.v3_5: 112 case FrameworkVersion.v3_5:
111 return "ToolsVersion=\"4.0\""; 113 return "ToolsVersion=\"4.0\"";
112 case FrameworkVersion.v3_0: 114 case FrameworkVersion.v3_0: