Skip to content

Commit 814c724

Browse files
Resolved bug #36. Thanks @wnbittle
1 parent f3e62bc commit 814c724

File tree

6 files changed

+18
-12
lines changed

6 files changed

+18
-12
lines changed

Maverick.PCF.Builder/Helper/CDSHelper.cs renamed to Maverick.PCF.Builder/Helper/DataverseHelper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Maverick.PCF.Builder.Helper
1515
{
16-
public class CDSHelper
16+
public class DataverseHelper
1717
{
1818
/// <summary>
1919
/// Retrieve list of unmanaged and visible solutions
@@ -32,7 +32,7 @@ public static EntityCollection RetrieveSolutions(IOrganizationService orgService
3232
querySolution.Criteria.AddCondition("ismanaged", ConditionOperator.Equal, false);
3333
querySolution.Criteria.AddCondition("isvisible", ConditionOperator.Equal, true);
3434
LinkEntity linkPublisher = querySolution.AddLink("publisher", "publisherid", "publisherid");
35-
linkPublisher.Columns = new ColumnSet("customizationprefix");
35+
linkPublisher.Columns = new ColumnSet("customizationprefix", "uniquename", "friendlyname");
3636
linkPublisher.EntityAlias = "pub";
3737

3838
return orgService.RetrieveMultiple(querySolution);

Maverick.PCF.Builder/MainPluginControl.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,9 @@ private void Routine_ExistingSolution()
378378
{
379379
if (chkUseExistingSolution.Checked)
380380
{
381-
txtSolutionName.Visible = false;
381+
txtSolutionFriendlyName.Visible = false;
382+
//txtSolutionName.Visible = false;
383+
txtPublisherFriendlyName.Enabled = false;
382384
txtPublisherUniqueName.Enabled = false;
383385
txtPublisherPrefix.Enabled = false;
384386
cboxSolutions.Visible = true;
@@ -387,7 +389,9 @@ private void Routine_ExistingSolution()
387389
}
388390
else
389391
{
390-
txtSolutionName.Visible = true;
392+
txtSolutionFriendlyName.Visible = true;
393+
//txtSolutionName.Visible = true;
394+
txtPublisherFriendlyName.Enabled = true;
391395
txtPublisherUniqueName.Enabled = true;
392396
txtPublisherPrefix.Enabled = true;
393397
cboxSolutions.Visible = false;
@@ -1422,7 +1426,7 @@ private void LoadSolutions()
14221426
{
14231427
var start = DateTime.Now;
14241428

1425-
args.Result = CDSHelper.RetrieveSolutions(Service);
1429+
args.Result = DataverseHelper.RetrieveSolutions(Service);
14261430

14271431
var end = DateTime.Now;
14281432
var duration = end - start;
@@ -1472,7 +1476,7 @@ private void ExportAndUnpackSolutions(string solutionName, string exportToPath)
14721476
{
14731477
var start = DateTime.Now;
14741478

1475-
args.Result = CDSHelper.ExportSolution(Service, solutionName);
1479+
args.Result = DataverseHelper.ExportSolution(Service, solutionName);
14761480

14771481
var end = DateTime.Now;
14781482
var duration = end - start;
@@ -2313,10 +2317,12 @@ private void cboxSolutions_SelectedIndexChanged(object sender, EventArgs e)
23132317
{
23142318
SealedClasses.SolutionDetails selectedSolution = (SealedClasses.SolutionDetails)cboxSolutions.SelectedItem;
23152319

2320+
txtSolutionName.Text = selectedSolution.MetaData.GetAttributeValue<string>("uniquename");
2321+
txtSolutionFriendlyName.Text = selectedSolution.MetaData.GetAttributeValue<string>("friendlyname");
2322+
txtPublisherUniqueName.Text = (selectedSolution.MetaData.GetAttributeValue<AliasedValue>("pub.uniquename")).Value.ToString();
2323+
txtPublisherFriendlyName.Text = (selectedSolution.MetaData.GetAttributeValue<AliasedValue>("pub.friendlyname")).Value.ToString();
23162324
txtPublisherPrefix.Text = (selectedSolution.MetaData.GetAttributeValue<AliasedValue>("pub.customizationprefix")).Value.ToString();
2317-
txtPublisherUniqueName.Text = selectedSolution.MetaData.GetAttributeValue<EntityReference>("publisherid").Name;
23182325
txtSolutionVersion.Text = selectedSolution.MetaData.GetAttributeValue<string>("version");
2319-
txtSolutionName.Text = selectedSolution.MetaData.GetAttributeValue<string>("uniquename");
23202326
}
23212327

23222328
private void MainPluginControl_OnCloseTool(object sender, EventArgs e)

Maverick.PCF.Builder/MainPluginControl.designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Maverick.PCF.Builder/Maverick.PCF.Builder.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@
239239
<Compile Include="Helper\Commands.cs" />
240240
<Compile Include="Helper\Enum.cs" />
241241
<Compile Include="Helper\JsonHelper.cs" />
242-
<Compile Include="Helper\CDSHelper.cs" />
242+
<Compile Include="Helper\DataverseHelper.cs" />
243243
<Compile Include="Helper\Telemetry.cs" />
244244
<Compile Include="Helper\XmlHelper.cs" />
245245
<Compile Include="MainPlugin.cs" />

Maverick.PCF.Builder/ReleaseNotes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
1. Publisher prefix only accepts lowercase to align it with Dataverse (#35)
77

88
---- BUG FIXES ----
9-
No bug fixes in this release
9+
1. Bug fixed with use of "Existing Solution"

PCF-CustomControlBuilder.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
1. Publisher prefix only accepts lowercase to align it with Dataverse (#35)
2424

2525
---- BUG FIXES ----
26-
No bug fixes in this release
26+
1. Bug fixed with use of "Existing Solution"
2727
</releaseNotes>
2828
<copyright>Copyright © Danish Naglekar</copyright>
2929
<tags>XrmToolBox, PCF, Power Apps, Power Apps Component Framework, PCF Builder</tags>

0 commit comments

Comments
 (0)