Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
  • 4 commits
  • 7 files changed
  • 0 commit comments
  • 2 contributors
View
24 NAntContrib.build
@@ -604,18 +604,6 @@
</if>
<call target="set-${framework::get-target-framework()}-framework-configuration" />
</target>
- <target name="set-net-1.0-framework-configuration">
- <property name="nant.settings.currentframework" value="net-1.0" />
- <property name="current.build.defines" value="${build.defines}NET,NET_1_0" dynamic="true" />
- <property name="link.sdkdoc.version" value="SDK_v1_0" />
- <property name="link.sdkdoc.web" value="true" />
- </target>
- <target name="set-net-1.1-framework-configuration">
- <property name="nant.settings.currentframework" value="net-1.1" />
- <property name="current.build.defines" value="${build.defines}NET,NET_1_0,NET_1_1,ONLY_NET_1_1" dynamic="true" />
- <property name="link.sdkdoc.version" value="SDK_v1_1" />
- <property name="link.sdkdoc.web" value="true" />
- </target>
<target name="set-net-2.0-framework-configuration">
<property name="nant.settings.currentframework" value="net-2.0" />
<property name="current.build.defines" value="${build.defines}NET,NET_1_0,NET_1_1,NET_2_0,ONLY_NET_2_0" dynamic="true" />
@@ -628,9 +616,9 @@
<property name="link.sdkdoc.version" value="SDK_v1_1" />
<property name="link.sdkdoc.web" value="true" />
</target>
- <target name="set-mono-1.0-framework-configuration">
- <property name="nant.settings.currentframework" value="mono-1.0" />
- <property name="current.build.defines" value="${build.defines}MONO,NET_1_0,NET_1_1,ONLY_NET_1_1" dynamic="true" />
+ <target name="set-net-4.0-framework-configuration">
+ <property name="nant.settings.currentframework" value="net-4.0" />
+ <property name="current.build.defines" value="${build.defines}NET,NET_1_0,NET_1_1,NET_2_0,NET_3_5,NET_4_0,ONLY_4_0" dynamic="true" />
<property name="link.sdkdoc.version" value="SDK_v1_1" />
<property name="link.sdkdoc.web" value="true" />
</target>
@@ -646,4 +634,10 @@
<property name="link.sdkdoc.version" value="SDK_v1_1" />
<property name="link.sdkdoc.web" value="true" />
</target>
+ <target name="set-mono-4.0-framework-configuration">
+ <property name="nant.settings.currentframework" value="mono-4.0" />
+ <property name="current.build.defines" value="${build.defines}MONO,NET_1_0,NET_1_1,NET_2_0,NET_3_5,NET_4_0,ONLY_4_0" dynamic="true" />
+ <property name="link.sdkdoc.version" value="SDK_v1_1" />
+ <property name="link.sdkdoc.web" value="true" />
+ </target>
</project>
View
2  src/Functions/ServiceFunctions.cs
@@ -237,7 +237,7 @@ public class ServiceFunctions : FunctionSetBase {
#region Private Static Methods
private static ServiceController GetServiceController(string service, string machineName) {
- if (StringUtils.IsNullOrEmpty(machineName)) {
+ if (String.IsNullOrEmpty(machineName)) {
machineName = ".";
}
View
5 src/Tasks/COMRegisterTask.cs
@@ -25,14 +25,9 @@
using System.Reflection;
using System.Reflection.Emit;
using System.Runtime.InteropServices;
-#if NET_2_0
using SYSKIND = System.Runtime.InteropServices.ComTypes.SYSKIND;
using TYPELIBATTR = System.Runtime.InteropServices.ComTypes.TYPELIBATTR;
using System.Runtime.InteropServices.ComTypes;
-#else
-using SYSKIND = System.Runtime.InteropServices.SYSKIND;
-using TYPELIBATTR = System.Runtime.InteropServices.TYPELIBATTR;
-#endif
using System.Text;
using NAnt.Core;
View
15 src/Tasks/FxCopTask.cs
@@ -18,6 +18,7 @@
//
// Author: James Geurts (jgeurts@users.sourceforge.net)
+using System;
using System.Diagnostics;
using System.IO;
using System.Text;
@@ -298,7 +299,7 @@ protected override void ExecuteTask()
_programArguments.Append("/c ");
}
- if (!StringUtils.IsNullOrEmpty(ConsoleXslFilename)) {
+ if (!String.IsNullOrEmpty(ConsoleXslFilename)) {
_programArguments.AppendFormat("/cXsl:\"{0}\" ", ConsoleXslFilename);
}
@@ -314,22 +315,22 @@ protected override void ExecuteTask()
_programArguments.AppendFormat("/i:\"{0}\" ", filename);
}
- if (!StringUtils.IsNullOrEmpty(AnalysisReportFilename) || FailOnAnalysisError) {
- if (StringUtils.IsNullOrEmpty(AnalysisReportFilename)) {
+ if (!String.IsNullOrEmpty(AnalysisReportFilename) || FailOnAnalysisError) {
+ if (String.IsNullOrEmpty(AnalysisReportFilename)) {
AnalysisReportFilename = Path.GetTempFileName();
}
_programArguments.AppendFormat("/o:\"{0}\" ", AnalysisReportFilename);
}
- if (!StringUtils.IsNullOrEmpty(OutputXslFilename)) {
+ if (!String.IsNullOrEmpty(OutputXslFilename)) {
_programArguments.AppendFormat("/oXsl:\"{0}\" ", OutputXslFilename);
}
- if (!StringUtils.IsNullOrEmpty(PlatformDirectory)) {
+ if (!String.IsNullOrEmpty(PlatformDirectory)) {
_programArguments.AppendFormat("/plat:\"{0}\" ", PlatformDirectory);
}
- if (!StringUtils.IsNullOrEmpty(ProjectFile)) {
+ if (!String.IsNullOrEmpty(ProjectFile)) {
_programArguments.AppendFormat("/p:\"{0}\" ", ProjectFile);
}
@@ -341,7 +342,7 @@ protected override void ExecuteTask()
_programArguments.Append("/s ");
}
- if (!StringUtils.IsNullOrEmpty(TypeList)) {
+ if (!String.IsNullOrEmpty(TypeList)) {
_programArguments.AppendFormat("/t:{0} ", TypeList);
}
View
2  src/Tasks/LoadPropertiesTask.cs
@@ -127,7 +127,7 @@ public class LoadPropertiesTask : Task {
current_line++;
// skip empty lines and comments
- if (StringUtils.IsNullOrEmpty(line) || line.StartsWith ("#")) {
+ if (String.IsNullOrEmpty(line) || line.StartsWith ("#")) {
line = sr.ReadLine ();
continue;
}
View
14 src/Tasks/Msi/InstallerCreationCommand.cs
@@ -2153,22 +2153,22 @@ public abstract class InstallerCreationCommand {
}
SummaryInfo summaryInfo = database.GetSummaryInformation();
- if (!StringUtils.IsNullOrEmpty(title)) {
+ if (!String.IsNullOrEmpty(title)) {
summaryInfo.set_Property(2, title);
}
- if (!StringUtils.IsNullOrEmpty(subject)) {
+ if (!String.IsNullOrEmpty(subject)) {
summaryInfo.set_Property(3, subject);
}
- if (!StringUtils.IsNullOrEmpty(author)) {
+ if (!String.IsNullOrEmpty(author)) {
summaryInfo.set_Property(4, author);
}
- if (!StringUtils.IsNullOrEmpty(keywords)) {
+ if (!String.IsNullOrEmpty(keywords)) {
summaryInfo.set_Property(5, keywords);
}
- if (!StringUtils.IsNullOrEmpty(comments)) {
+ if (!String.IsNullOrEmpty(comments)) {
summaryInfo.set_Property(6, comments);
}
- if (!StringUtils.IsNullOrEmpty(template)) {
+ if (!String.IsNullOrEmpty(template)) {
summaryInfo.set_Property(7, template);
}
@@ -2177,7 +2177,7 @@ public abstract class InstallerCreationCommand {
summaryInfo.set_Property(14, 200);
summaryInfo.set_Property(15, 2);
- if (!StringUtils.IsNullOrEmpty(creatingApplication)) {
+ if (!String.IsNullOrEmpty(creatingApplication)) {
summaryInfo.set_Property(18, creatingApplication);
}
View
2  src/Tasks/SqlTask.cs
@@ -306,7 +306,7 @@ public class SqlTask : Task {
/// </summary>
protected override void Initialize() {
_embeddedSqlStatements = ((XmlElement) XmlNode).InnerText;
- if (Source == null && StringUtils.IsNullOrEmpty(_embeddedSqlStatements)) {
+ if (Source == null && String.IsNullOrEmpty(_embeddedSqlStatements)) {
throw new BuildException("No source file or statements have been specified.",
Location);
}

No commit comments for this range

Something went wrong with that request. Please try again.