diff --git a/.gitignore b/.gitignore
index 5e24e29c..ce9cce5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,7 @@ Test
*.zip
*.nupkg
*.msi
-*.chm
\ No newline at end of file
+*.chm
+/Tools/ilmerge/
+/Tools/MSBuildTasks/
+/Tools/NUnit.Runners/
diff --git a/Master-helper.proj b/Master-helper.proj
deleted file mode 100644
index ae995395..00000000
--- a/Master-helper.proj
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
- $(MSBuildProjectDirectory)\Build
- $(MSBuildProjectDirectory)\Tools
- $(MSBuildProjectDirectory)\Source
-
-
-
- 1
- 4
- 0
-
- 4
- 0
- 0
-
- $(APPVEYOR_BUILD_NUMBER)
- $(BUILD_NUMBER)
- 0
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Master.proj b/Master.proj
index 790e22de..525a320e 100644
--- a/Master.proj
+++ b/Master.proj
@@ -1,62 +1,142 @@
+
+
+ $(MSBuildProjectDirectory)\Build
+ $(MSBuildProjectDirectory)\Tools
+ $(MSBuildProjectDirectory)\Source
+
+ $(ToolFolder)\MSBuildTasks\tools
+
+
+
+
+
+ $(APPVEYOR_BUILD_NUMBER)
+ $(BUILD_NUMBER)
+ 0
+
+ Release
+
+ 1
+ 4
+ 0
+
+ $(Major).$(Minor).0.0
+ $(Major).$(Minor).$(Patch).$(BuildNumber)
+ $(Major).$(Minor).$(Patch).$(BuildNumber)
+ $(Major).$(Minor).$(Patch).$(BuildNumber)
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
+
+
+
+
+
+
-
-
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
diff --git a/Source/GlobalAssemblyInfo.cs b/Source/GlobalAssemblyInfo.cs
index 93747d00..8a06b1b4 100644
--- a/Source/GlobalAssemblyInfo.cs
+++ b/Source/GlobalAssemblyInfo.cs
@@ -8,27 +8,27 @@
//
//------------------------------------------------------------------------------
-[assembly: System.Reflection.AssemblyCompany("https://github.com/loresoft/msbuildtasks/")]
[assembly: System.Reflection.AssemblyProduct("MSBuild.Community.Tasks")]
+[assembly: System.Reflection.AssemblyCompany("https://github.com/loresoft/msbuildtasks/")]
[assembly: System.Reflection.AssemblyCopyright("Copyright © 2014 MSBuild Community Tasks Project")]
-[assembly: System.Reflection.AssemblyConfiguration("Commit 1375350")]
-[assembly: System.Runtime.InteropServices.ComVisible(false)]
-[assembly: System.CLSCompliant(false)]
+[assembly: System.Reflection.AssemblyConfiguration("Release")]
[assembly: System.Reflection.AssemblyVersion("1.4.0.0")]
[assembly: System.Reflection.AssemblyFileVersion("1.4.0.0")]
[assembly: System.Reflection.AssemblyInformationalVersion("1.4.0.0")]
+[assembly: System.Runtime.InteropServices.ComVisible(false)]
+[assembly: System.CLSCompliant(false)]
internal sealed partial class ThisAssembly {
- internal const string AssemblyCompany = "https://github.com/loresoft/msbuildtasks/";
-
internal const string AssemblyProduct = "MSBuild.Community.Tasks";
+ internal const string AssemblyCompany = "https://github.com/loresoft/msbuildtasks/";
+
internal const string AssemblyCopyright = "Copyright © 2014 MSBuild Community Tasks Project";
- internal const string AssemblyConfiguration = "Commit 1375350";
+ internal const string AssemblyConfiguration = "Release";
internal const string AssemblyVersion = "1.4.0.0";
diff --git a/Source/MSBuild.Community.Tasks.Tests/AssemblyInfoTest.cs b/Source/MSBuild.Community.Tasks.Tests/AssemblyInfoTest.cs
index e1ac86a0..0bc6ffaf 100644
--- a/Source/MSBuild.Community.Tasks.Tests/AssemblyInfoTest.cs
+++ b/Source/MSBuild.Community.Tasks.Tests/AssemblyInfoTest.cs
@@ -59,6 +59,7 @@ public void AssemblyInfoVB() {
}
[Test(Description = "Create VersionInfo in CPP/CLI")]
+ [Explicit]
public void AssemblyInfoCPP()
{
AssemblyInfo task = new AssemblyInfo();
@@ -142,7 +143,7 @@ public void IncludeNeutralResourceLanguage()
content = stream.ReadToEnd();
}
Assert.IsNotNull(content);
- Assert.That(content.Contains("NeutralResourcesLanguage(\"en-US\","));
+ Assert.That(content.Contains("assembly: System.Resources.NeutralResourcesLanguage(\"en-US\")"));
}
[Test(Description="Creates an assembly info which has InternalsVisibleTo attribute")]
@@ -161,7 +162,7 @@ public void IncludeInternalsVisibleTo()
content = stream.ReadToEnd();
}
Assert.IsNotNull(content);
- Assert.That(content.Contains("assembly: InternalsVisibleTo(\"UnitTests\")"));
+ Assert.That(content.Contains("assembly: System.Runtime.CompilerServices.InternalsVisibleTo(\"UnitTests\")"));
}
[Test(Description = "Creates an assembly info which has AllowPartiallyTrustedCallers attribute")]
@@ -180,7 +181,7 @@ public void IncludeAllowPartiallyTrustedCallers()
content = stream.ReadToEnd();
}
Assert.IsNotNull(content);
- Assert.That(content.Contains("assembly: AllowPartiallyTrustedCallers"));
+ Assert.That(content.Contains("assembly: System.Security.AllowPartiallyTrustedCallers()"));
}
private AssemblyInfo CreateCSAssemblyInfo(string outputFile)
diff --git a/Source/MSBuild.Community.Tasks.Tests/Beep/BeepTest.cs b/Source/MSBuild.Community.Tasks.Tests/Beep/BeepTest.cs
index 4c5fdda9..d2929f82 100644
--- a/Source/MSBuild.Community.Tasks.Tests/Beep/BeepTest.cs
+++ b/Source/MSBuild.Community.Tasks.Tests/Beep/BeepTest.cs
@@ -7,69 +7,73 @@
namespace MSBuild.Community.Tasks.Tests
{
- using global::NUnit.Framework;
+ using global::NUnit.Framework;
- ///
- /// NUnit tests for the MSBuild
- /// .
- ///
- [TestFixture]
- public class BeepTest
- {
- ///
- /// Tests the default beeps.
- ///
- [Test(Description = "Execute the Beep task with default values")]
- public void BeepDefault()
- {
- Beep task = new Beep();
- task.BuildEngine = new MockBuild();
+ ///
+ /// NUnit tests for the MSBuild
+ /// .
+ ///
+ [TestFixture]
+ public class BeepTest
+ {
+ ///
+ /// Tests the default beeps.
+ ///
+ [Explicit]
+ [Test(Description = "Execute the Beep task with default values")]
+ public void BeepDefault()
+ {
+ Beep task = new Beep();
+ task.BuildEngine = new MockBuild();
- // assert default values
- Assert.AreEqual(800, task.Frequency, @"Wrong default frequency");
- Assert.AreEqual(200, task.Duration, @"Wrong default duration");
+ // assert default values
+ Assert.AreEqual(800, task.Frequency, @"Wrong default frequency");
+ Assert.AreEqual(200, task.Duration, @"Wrong default duration");
- Assert.IsTrue(task.Execute(), @"Beep task failed");
- }
+ Assert.IsTrue(task.Execute(), @"Beep task failed");
+ }
- ///
- /// Tests a custom beep.
- ///
- [Test(Description = "Execute the Beep task with custom values")]
- public void BeepCustom()
- {
- Beep task = new Beep();
- task.BuildEngine = new MockBuild();
- task.Frequency = 440;
- task.Duration = 400;
+ ///
+ /// Tests a custom beep.
+ ///
+ [Explicit]
+ [Test(Description = "Execute the Beep task with custom values")]
+ public void BeepCustom()
+ {
+ Beep task = new Beep();
+ task.BuildEngine = new MockBuild();
+ task.Frequency = 440;
+ task.Duration = 400;
- Assert.IsTrue(task.Execute(), @"Beep task failed");
- }
+ Assert.IsTrue(task.Execute(), @"Beep task failed");
+ }
- ///
- /// Tests a beep with a bad frequency.
- ///
- [Test(Description = "Execute the Beep task with frequency out of range")]
- public void BeepBadFrequency()
- {
- Beep task = new Beep();
- task.BuildEngine = new MockBuild();
- task.Frequency = 0;
+ ///
+ /// Tests a beep with a bad frequency.
+ ///
+ [Explicit]
+ [Test(Description = "Execute the Beep task with frequency out of range")]
+ public void BeepBadFrequency()
+ {
+ Beep task = new Beep();
+ task.BuildEngine = new MockBuild();
+ task.Frequency = 0;
- Assert.IsTrue(task.Execute(), @"Beep task failed");
- }
+ Assert.IsTrue(task.Execute(), @"Beep task failed");
+ }
- ///
- /// Tests a beep with a bad duration value.
- ///
- [Test(Description = "Execute the Beep task with duration out of range")]
- public void BeepBadDuration()
- {
- Beep task = new Beep();
- task.BuildEngine = new MockBuild();
- task.Duration = 0;
+ ///
+ /// Tests a beep with a bad duration value.
+ ///
+ [Explicit]
+ [Test(Description = "Execute the Beep task with duration out of range")]
+ public void BeepBadDuration()
+ {
+ Beep task = new Beep();
+ task.BuildEngine = new MockBuild();
+ task.Duration = 0;
- Assert.IsTrue(task.Execute(), @"Beep task failed");
- }
- }
+ Assert.IsTrue(task.Execute(), @"Beep task failed");
+ }
+ }
}
\ No newline at end of file
diff --git a/Source/MSBuild.Community.Tasks.Tests/DeleteTreeTest.cs b/Source/MSBuild.Community.Tasks.Tests/DeleteTreeTest.cs
index 1b55d9f2..cacfaf7a 100644
--- a/Source/MSBuild.Community.Tasks.Tests/DeleteTreeTest.cs
+++ b/Source/MSBuild.Community.Tasks.Tests/DeleteTreeTest.cs
@@ -17,6 +17,7 @@ public void GetDirectories()
}
[Test]
+ [Explicit]
public void ExecuteInnerAndTrailingRecursive()
{
DeleteTree task = new DeleteTree();
@@ -28,6 +29,7 @@ public void ExecuteInnerAndTrailingRecursive()
}
[Test]
+ [Explicit]
public void ExecuteInnerRecursive()
{
DeleteTree task = new DeleteTree();
@@ -39,6 +41,7 @@ public void ExecuteInnerRecursive()
}
[Test]
+ [Explicit]
public void ExecuteItemWithTrailingSeparator()
{
DeleteTree task = new DeleteTree();
@@ -50,6 +53,7 @@ public void ExecuteItemWithTrailingSeparator()
}
[Test]
+ [Explicit]
public void ExecuteMultipleItems()
{
DeleteTree task = new DeleteTree();
@@ -66,6 +70,7 @@ public void ExecuteMultipleItems()
}
[Test]
+ [Explicit]
public void ExecuteWildCard()
{
DeleteTree task = new DeleteTree();
diff --git a/Source/MSBuild.Community.Tasks.Tests/packages.config b/Source/MSBuild.Community.Tasks.Tests/packages.config
index b670d39d..589ef756 100644
--- a/Source/MSBuild.Community.Tasks.Tests/packages.config
+++ b/Source/MSBuild.Community.Tasks.Tests/packages.config
@@ -1,7 +1,6 @@
-
\ No newline at end of file
diff --git a/Source/MSBuild.Community.Tasks.sln b/Source/MSBuild.Community.Tasks.sln
index 4aa227e9..c63d39fa 100644
--- a/Source/MSBuild.Community.Tasks.sln
+++ b/Source/MSBuild.Community.Tasks.sln
@@ -51,7 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{8840F549
..\Tools\Build.proj = ..\Tools\Build.proj
..\Tools\Install.Project.ps1 = ..\Tools\Install.Project.ps1
..\Tools\Install.Solution.ps1 = ..\Tools\Install.Solution.ps1
- ..\Master-helper.proj = ..\Master-helper.proj
..\Master.proj = ..\Master.proj
..\Tools\MSBuild.psm1 = ..\Tools\MSBuild.psm1
..\MSBuildTasks.nuspec = ..\MSBuildTasks.nuspec
@@ -72,12 +71,15 @@ Global
{5AC1D006-CA56-4BE1-8250-DBEABBEA0725}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5AC1D006-CA56-4BE1-8250-DBEABBEA0725}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5AC1D006-CA56-4BE1-8250-DBEABBEA0725}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {5AC1D006-CA56-4BE1-8250-DBEABBEA0725}.Release|Any CPU.Build.0 = Release|Any CPU
{1291B270-5E1F-425B-ACA1-5253A0067D26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1291B270-5E1F-425B-ACA1-5253A0067D26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1291B270-5E1F-425B-ACA1-5253A0067D26}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1291B270-5E1F-425B-ACA1-5253A0067D26}.Release|Any CPU.Build.0 = Release|Any CPU
{885FC778-671A-4934-B76B-BE28334AD9CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{885FC778-671A-4934-B76B-BE28334AD9CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{885FC778-671A-4934-B76B-BE28334AD9CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {885FC778-671A-4934-B76B-BE28334AD9CB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Source/MSBuild.Community.Tasks/packages.config b/Source/MSBuild.Community.Tasks/packages.config
index 84e3b425..e8f3bfd2 100644
--- a/Source/MSBuild.Community.Tasks/packages.config
+++ b/Source/MSBuild.Community.Tasks/packages.config
@@ -1,5 +1,4 @@
-
\ No newline at end of file
diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 00000000..01490693
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+version: 1.4.0.{build}
+environment:
+ Major: 1
+ Minor: 4
+ Patch: 0
+configuration: Release
+before_build:
+- .\bootstrap.cmd
+build:
+ project: master.proj
+ verbosity: minimal
+test: off
+artifacts:
+- path: '*.nupkg'
+- path: '*.zip'
+- path: '*.msi'
+deploy:
+- provider: Environment
+ name: MyGet
\ No newline at end of file
diff --git a/bootstrap.cmd b/bootstrap.cmd
new file mode 100644
index 00000000..8f6f72e8
--- /dev/null
+++ b/bootstrap.cmd
@@ -0,0 +1,4 @@
+@echo off
+NuGet.exe install MSBuildTasks -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive
+NuGet.exe install NUnit.Runners -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive
+NuGet.exe install ilmerge -OutputDirectory .\Tools\ -ExcludeVersion -NonInteractive