From f5ae36d7e25a20199d676e53a066be79f76b580d Mon Sep 17 00:00:00 2001 From: Oren Hurvitz Date: Tue, 3 Dec 2013 08:47:47 +0200 Subject: Updated Prebuild to support .NET 4.5 Resolves http://opensimulator.org/mantis/view.php?id=6951 --- Prebuild/src/Core/Kernel.cs | 2 +- Prebuild/src/Core/Nodes/ProjectNode.cs | 10 +++++++++- Prebuild/src/Core/Targets/VS2010Target.cs | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) (limited to 'Prebuild/src/Core') 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 /// /// This must match the version of the schema that is embeeded /// - 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 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 /// .NET 4.0 /// v4_0, - } + /// + /// .NET 4.5 + /// + v4_5, + /// + /// .NET 4.5.1 + /// + v4_5_1 + } /// /// The Node object representing /Prebuild/Solution/Project elements /// 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 { 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: -- cgit v1.1