Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support CoApp native nugets content folder & native framework #10

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>2105ebfb</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
Expand Down
8 changes: 7 additions & 1 deletion MSBuild.NugetContentRestore.Tasks/NugetContentRestoreTask.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class NugetContentRestoreTask : Task

#region Private Members

private readonly string[] _folders = new[] { "Scripts", "Images", "fonts", "content" };
private readonly string[] _folders = new[] { "Scripts", "Images", "fonts", "content","native" };
private readonly string[] _ignoreFilePatterns = new[] { "*.transform", "*.install.xdt", "*.pp" };

private string _configFileFullPath;
Expand Down Expand Up @@ -87,7 +87,13 @@ public override bool Execute()
if (!sourceFolderInfo.Exists) continue;

Log.LogMessage(MessageImportance.High, "NugetContentRestore :: {0} :: {1} :: Restoring content files", package.FolderName, folder);
if (folder.ToLower()=="native")
{
sourceFolderInfo.CopyTo(ProjectDir, true, filePatterns.ToArray());
}
else {
sourceFolderInfo.CopyTo(Path.Combine(ProjectDir, folder), true, filePatterns.ToArray());
}
}

// Restore Package Content for additional folders (AdditionalFolder)
Expand Down
6 changes: 4 additions & 2 deletions MSBuild.NugetContentRestore.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package>
<metadata>
<id>MSBuild.NugetContentRestore</id>
<version>0.1.6</version>
<version>0.1.10</version>
<authors>Francisco Lopez</authors>
<owners>Francisco Lopez</owners>
<projectUrl>https://github.com/panchilo/MSBuild.NugetContentRestore</projectUrl>
Expand All @@ -21,9 +21,11 @@
<tags>nuget content restore msbuild task</tags>
</metadata>
<files>
<file src="Output\MSBuild.NugetContentRestore.dll" target="build\native" />
<file src="MSBuild.NugetContentRestore.targets" target="build\native" />
<file src="Output\MSBuild.NugetContentRestore.dll" target="build\net40" />
<file src="MSBuild.NugetContentRestore.targets" target="build\net40" />
<file src="tools\" target="tools" />
<file src="tools\" target="tools" />
<file src="readme.txt" target="" />
</files>
</package>