Skip to content

Add GenerateWebResources and ApplyPublisherPrefixToWebResource flags #68

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.

Sign up for GitHub

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

Open
zekelinAlex wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add GenerateWebResources and ApplyPublisherPrefixToWebResource flags #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/Dataverse/Solution/msbuild/build/TALXIS.DevKit.Build.Dataverse.Solution.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
<PropertyGroup>
<ProjectType Condition="'$(ProjectType)'==''">Solution</ProjectType>
<GeneratePluginAssembly Condition="'$(GeneratePluginAssembly)'==''">true</GeneratePluginAssembly>
<GenerateWebResources Condition="'$(GenerateWebResources)'==''">true</GenerateWebResources>
<ApplyPublisherPrefixToWebResource Condition="'$(ApplyPublisherPrefixToWebResource)'==''">true</ApplyPublisherPrefixToWebResource>
</PropertyGroup>
</Project>
10 changes: 6 additions & 4 deletions ...rse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.ScriptLibraries.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@
<MakeDir Directories="$(WebResourcesDir)" />

<ResolveWebResourceName Files="@(_ScriptLibraryOutputs)"
PublisherPrefix="$(PublisherPrefix)">
PublisherPrefix="$(PublisherPrefix)"
ApplyPrefix="$(ApplyPublisherPrefixToWebResource)">
<Output TaskParameter="ResolvedFiles" ItemName="_ResolvedScriptFiles" />
</ResolveWebResourceName>

Expand All @@ -123,26 +124,27 @@
</_ScriptFilesToCopy>
</ItemGroup>

<ItemGroup>
<ItemGroup Condition="'$(GenerateWebResources)'=='true'">
<_ScriptFilesMissingDataXml Include="@(_ScriptFilesToCopy)"
Condition="!Exists('%(DataXmlFile)')">
</_ScriptFilesMissingDataXml>
</ItemGroup>

<Message Importance="high"
Text="Generate webresource data.xml: @(_ScriptFilesMissingDataXml->'%(DataXmlFile)', ', ')"
Condition="'@(_ScriptFilesMissingDataXml)'!=''" />
Condition="'@(_ScriptFilesMissingDataXml)'!='' and '$(GenerateWebResources)'=='true'" />

<EnsureWebResourceDataXml DataXmlFile="%(_ScriptFilesMissingDataXml.DataXmlFile)"
WebResourceName="%(_ScriptFilesMissingDataXml.WebResourceName)"
DisplayName="%(_ScriptFilesMissingDataXml.DisplayName)"
Condition="'@(_ScriptFilesMissingDataXml)'!=''" />
Condition="'@(_ScriptFilesMissingDataXml)'!='' and '$(GenerateWebResources)'=='true'" />

<AddRootComponentToSolution
SolutionPath="$(ProjectDir)$(SolutionRootPath)\Other\Solution.xml"
Type="61"
SchemaName="%(_ScriptFilesToCopy.WebResourceName)"
Behavior="0"
Condition="'$(GenerateWebResources)'=='true'"
/>
</Target>

Expand Down
2 changes: 2 additions & 0 deletions src/Dataverse/Solution/msbuild/tasks/TALXIS.DevKit.Build.Dataverse.Solution.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,7 @@
<PropertyGroup>
<ProjectType Condition="'$(ProjectType)'==''">Solution</ProjectType>
<GeneratePluginAssembly Condition="'$(GeneratePluginAssembly)'==''">true</GeneratePluginAssembly>
<GenerateWebResources Condition="'$(GenerateWebResources)'==''">true</GenerateWebResources>
<ApplyPublisherPrefixToWebResource Condition="'$(ApplyPublisherPrefixToWebResource)'==''">true</ApplyPublisherPrefixToWebResource>
</PropertyGroup>
</Project>
15 changes: 15 additions & 0 deletions src/Dataverse/Tasks/Tasks/ResolveWebResourceName.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ public class ResolveWebResourceName : Task
[Required]
public string PublisherPrefix { get; set; } = "";

public bool ApplyPrefix { get; set; } = true;

[Output]
public ITaskItem[] ResolvedFiles { get; set; } = Array.Empty<ITaskItem>();

Expand All @@ -29,6 +31,19 @@ public override bool Execute()
string resolvedName;
string displayName;

if (!ApplyPrefix)
{
resolvedName = fileName;
displayName = fileName;

var rawItem = new TaskItem(filePath);
rawItem.SetMetadata("ResolvedName", resolvedName);
rawItem.SetMetadata("DisplayName", displayName);
results.Add(rawItem);

continue;
}

int underscoreIndex = fileName.IndexOf('_');

if (underscoreIndex > 0)
Expand Down