diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..f38c8f0
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.targets text eol=crlf
\ No newline at end of file
diff --git a/Buildeploy.csproj b/Buildeploy.csproj
index fd76964..6ae5f60 100644
--- a/Buildeploy.csproj
+++ b/Buildeploy.csproj
@@ -67,6 +67,7 @@
Always
+ Designer
diff --git a/Buildeploy.targets b/Buildeploy.targets
index 1d0333e..196745f 100644
--- a/Buildeploy.targets
+++ b/Buildeploy.targets
@@ -1,408 +1,432 @@
-
-
-
- .\
- $(MSBuildThisFileDirectory)\buildeploy.dll
- Release
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(MSBuildProjectDirectory)\bin\%(Configuration.Identity)\
- $(CompileOutputFolder)
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(MSBuildProjectDirectory)\bin\$(RedistConfiguration)\
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(VersionRedistRoot)\Packages
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(VersionRedistRoot)\Packages
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Temp
- $(TempRedistRoot)\Client
- $(TempRedistRoot)\Server
- $(TempRedistRoot)\Localization
- $(TempRedistRoot)\Compiledsite
-
-
-
-
-
-
-
-
-
- $(OutputRoot)\$(RedistConfiguration)\
- $(CustomRedistRoot)
-
-
-
-
-
-
-
- *.*
- $(VersionPrefix)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $(DefaultVersionRedistRoot)
- $(RedistRoot)\$(BuildDefinition)\$(Version)
-
-
-
-
-
-
-
-
-
- $(VS120COMNTOOLS)..\IDE\MSTest.exe
- $(VS110COMNTOOLS)..\IDE\MSTest.exe
- $(VS100COMNTOOLS)..\IDE\MSTest.exe
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ .\
+ $(MSBuildThisFileDirectory)\buildeploy.dll
+ Release
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(MSBuildProjectDirectory)\bin\%(Configuration.Identity)\
+ $(CompileOutputFolder)
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(MSBuildProjectDirectory)\bin\$(RedistConfiguration)\
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Temp
+ $(TempRedistRoot)\Client
+ $(TempRedistRoot)\Server
+ $(TempRedistRoot)\Localization
+ $(TempRedistRoot)\Compiledsite
+
+
+
+
+
+
+
+ $(OutputRoot)\$(RedistConfiguration)\
+ $(CustomRedistRoot)
+ $(DefaultVersionRedistRoot)
+ $(RedistRoot)\$(BuildDefinition)\$(Version)
+ $(RedistRoot)\$(Version)
+ $(VersionRedistRoot)\Packages
+
+
+
+
+
+
+
+
+
+ *.*
+ $(VersionPrefix)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $(VS120COMNTOOLS)..\IDE\MSTest.exe
+ $(VS110COMNTOOLS)..\IDE\MSTest.exe
+ $(VS100COMNTOOLS)..\IDE\MSTest.exe
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Tasks/NugetPackage.cs b/Tasks/NugetPackage.cs
index a8c8a56..a7f2d2d 100644
--- a/Tasks/NugetPackage.cs
+++ b/Tasks/NugetPackage.cs
@@ -37,14 +37,21 @@ public class NugetPackage : PackageTaskBase
public string PushLocation { get; set; }
+ public bool NoDefaultExcludes { get; set; }
+
protected override IPackageArchive CreatePackageArchive()
{
var archive = new NugetArchive(NugetExePath, Path.GetFullPath(NuspecFile), OutputDirectory, Version, Log);
if (!string.IsNullOrWhiteSpace(PackageId))
+ {
+ archive.AddProperty("Id", PackageId);
archive.AddProperty("PackageId", PackageId);
+ }
archive.ApiKey = ApiKey;
archive.PushLocation = PushLocation;
+ archive.NoDefaultExcludes = this.NoDefaultExcludes;
+
return archive;
}
@@ -84,6 +91,9 @@ private static string CreateTempDirectory()
internal string PushLocation { get; set; }
internal string ApiKey { get; set; }
+
+ internal bool NoDefaultExcludes { get; set; }
+
internal void AddProperty(string name, string value)
{
properties.Add(name, value);
@@ -127,6 +137,10 @@ public bool Finish()
{
commandLine.AppendFormat(CultureInfo.InvariantCulture,
"pack \"{0}\" -NoPackageAnalysis -BasePath \"{1}\" -OutputDirectory \"{2}\" -Version {3}", nuspecFile, tempPath, nupkgTempDirectory, version);
+ if (this.NoDefaultExcludes)
+ {
+ commandLine.Append(" -NoDefaultExcludes");
+ }
foreach (var fileName in Directory.GetFiles(nupkgTempDirectory))
File.Move(fileName, Path.Combine(outputDir, Path.GetFileName(fileName)));
diff --git a/Tasks/ResolveRedistAssemblies.cs b/Tasks/ResolveRedistAssemblies.cs
index f69bd31..c382e70 100644
--- a/Tasks/ResolveRedistAssemblies.cs
+++ b/Tasks/ResolveRedistAssemblies.cs
@@ -34,7 +34,9 @@ public override bool Execute()
{
foreach (var item in Files)
{
- string fileName = Path.GetFullPath(Path.Combine(LookupPath, item.GetMetadata("filename") + item.GetMetadata("extension")));
+ var filePath = Path.Combine(LookupPath, item.GetMetadata("RelativeDir"));
+ string fileName = Path.GetFullPath(Path.Combine(filePath, item.GetMetadata("filename") + item.GetMetadata("extension")));
+
if (!CheckFileExists(fileName)) return false;
resultFileNames.Add(fileName);
if (string.Equals(item.GetMetadata("AddReferences"), "true", StringComparison.OrdinalIgnoreCase))
diff --git a/build.proj b/build.proj
index 6e241bc..6329618 100644
--- a/build.proj
+++ b/build.proj
@@ -1,23 +1,38 @@
-
- bin\debug\buildeploy.dll
-
-
-
- packages\NuGet.CommandLine.2.8.2\tools\NuGet.exe
- Debug
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ bin\debug\buildeploy.dll
+
+
+
+
+
+ packages\NuGet.CommandLine.2.8.2\tools\NuGet.exe
+ Debug
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file