Refactoring (#22)

jfevia · Aug 4, 2024 · dceb29e · dceb29e
1 parent a99ce33
commit dceb29e
Show file tree

Hide file tree

Showing 39 changed files with 4 additions and 197 deletions.
diff --git a/PowerAutomate.Desktop.sln b/PowerAutomate.Desktop.sln
@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.HTML.Actions", "mod
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Modules.PetStore.Actions", "samples\Modules.PetStore.Actions\Modules.PetStore.Actions.csproj", "{3D0BC3F2-AB03-44A3-8FAF-599FB80DB717}"
 EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Modules.Actions.Shared", "src\Modules.Actions.Shared\Modules.Actions.Shared.shproj", "{7E19E2F1-6DE7-4A0E-AED8-7CEA38B166AF}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{64A2FE14-920C-4A2F-8F4A-28B77CC84BA4}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OpenAPI", "OpenAPI", "{6709150F-B5E8-4377-BAEA-5394C5340806}"
@@ -150,7 +148,6 @@ Global
 		{79D5DFFD-323B-4DC4-950D-13DA2C1F31E0} = {3B78C634-DFD6-43DA-A30E-33AC42224BD4}
 		{D622D84B-9853-4E6E-AE09-1988FBFE6392} = {79D5DFFD-323B-4DC4-950D-13DA2C1F31E0}
 		{435C2B05-E667-4AAD-9BE5-3863345B98A4} = {3B78C634-DFD6-43DA-A30E-33AC42224BD4}
-		{7E19E2F1-6DE7-4A0E-AED8-7CEA38B166AF} = {3B78C634-DFD6-43DA-A30E-33AC42224BD4}
 		{3D0BC3F2-AB03-44A3-8FAF-599FB80DB717} = {6709150F-B5E8-4377-BAEA-5394C5340806}
 		{A9858CCE-DDB1-4942-84BE-08991E46A818} = {6709150F-B5E8-4377-BAEA-5394C5340806}
 		{E7F31F2C-1091-4B82-A685-C7A74FC80A1D} = {3B78C634-DFD6-43DA-A30E-33AC42224BD4}

diff --git a/modules/Modules.AzureKeyVault.Actions/Modules.AzureKeyVault.Actions.csproj b/modules/Modules.AzureKeyVault.Actions/Modules.AzureKeyVault.Actions.csproj
@@ -29,6 +29,4 @@
         </EmbeddedResource>
     </ItemGroup>
 
-    <Import Project="..\..\src\Modules.Actions.Shared\Modules.Actions.Shared.projitems" Label="Shared" />
-
 </Project>
diff --git a/modules/Modules.CloudFlows.Actions/Modules.CloudFlows.Actions.csproj b/modules/Modules.CloudFlows.Actions/Modules.CloudFlows.Actions.csproj
@@ -19,34 +19,13 @@
             <AutoGen>True</AutoGen>
             <DependentUpon>Resources.resx</DependentUpon>
         </Compile>
-        <Compile Update="Properties\Resources.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-        <Compile Update="Properties\Resources.Designer.cs">
-          <DesignTime>True</DesignTime>
-          <AutoGen>True</AutoGen>
-          <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-        <Compile Update="Properties\Resources.Designer.cs">
-          <DesignTime>True</DesignTime>
-          <AutoGen>True</AutoGen>
-          <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
     </ItemGroup>
 
     <ItemGroup>
         <EmbeddedResource Update="Properties\Resources.resx">
             <Generator>PublicResXFileCodeGenerator</Generator>
             <LastGenOutput>Resources.Designer.cs</LastGenOutput>
         </EmbeddedResource>
-        <EmbeddedResource Update="Properties\Resources.resx">
-          <Generator>PublicResXFileCodeGenerator</Generator>
-          <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-        </EmbeddedResource>
     </ItemGroup>
 
-    <Import Project="..\..\src\Modules.Actions.Shared\Modules.Actions.Shared.projitems" Label="Shared" />
-
 </Project>
diff --git a/modules/Modules.CloudFlows.Actions/RunFlowAction.cs b/modules/Modules.CloudFlows.Actions/RunFlowAction.cs
@@ -8,7 +8,6 @@
 using System.Text;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.CloudFlows.Actions;
 
@@ -35,8 +34,6 @@ public class RunFlowAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var client = new HttpClient();

diff --git a/modules/Modules.HTML.Actions/ConvertDataTableToHtmlTableAction.cs b/modules/Modules.HTML.Actions/ConvertDataTableToHtmlTableAction.cs
@@ -8,7 +8,6 @@
 using System.Text;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.HTML.Actions;
 
@@ -29,8 +28,6 @@ public class ConvertDataTableToHtmlTableAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             var html = new StringBuilder();

diff --git a/modules/Modules.HTML.Actions/ConvertListToHtmlListAction.cs b/modules/Modules.HTML.Actions/ConvertListToHtmlListAction.cs
@@ -9,7 +9,6 @@
 using System.Text;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.HTML.Actions;
 
@@ -34,8 +33,6 @@ public class ConvertListToHtmlListAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             var rootTag = IsOrdered ? "ol" : "ul";

diff --git a/modules/Modules.HTML.Actions/Modules.HTML.Actions.csproj b/modules/Modules.HTML.Actions/Modules.HTML.Actions.csproj
@@ -18,11 +18,6 @@
             <AutoGen>True</AutoGen>
             <DependentUpon>Resources.resx</DependentUpon>
         </Compile>
-        <Compile Update="Properties\Resources.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
     </ItemGroup>
 
     <ItemGroup>
@@ -32,6 +27,4 @@
         </EmbeddedResource>
     </ItemGroup>
 
-    <Import Project="..\..\src\Modules.Actions.Shared\Modules.Actions.Shared.projitems" Label="Shared" />
-
 </Project>
diff --git a/modules/Modules.Windows.Notifications.Actions/Modules.Windows.Notifications.Actions.csproj b/modules/Modules.Windows.Notifications.Actions/Modules.Windows.Notifications.Actions.csproj
@@ -9,8 +9,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK"/>
-        <PackageReference Include="Microsoft.Windows.SDK.Contracts"/>
+        <PackageReference Include="Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK" />
+        <PackageReference Include="Microsoft.Windows.SDK.Contracts" />
     </ItemGroup>
 
     <ItemGroup>
@@ -19,34 +19,13 @@
             <AutoGen>True</AutoGen>
             <DependentUpon>Resources.resx</DependentUpon>
         </Compile>
-        <Compile Update="Properties\Resources.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-        <Compile Update="Properties\Resources.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
-        <Compile Update="Properties\Resources.Designer.cs">
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-            <DependentUpon>Resources.resx</DependentUpon>
-        </Compile>
     </ItemGroup>
 
     <ItemGroup>
         <EmbeddedResource Update="Properties\Resources.resx">
             <Generator>PublicResXFileCodeGenerator</Generator>
             <LastGenOutput>Resources.Designer.cs</LastGenOutput>
         </EmbeddedResource>
-        <EmbeddedResource Update="Properties\Resources.resx">
-            <Generator>PublicResXFileCodeGenerator</Generator>
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-        </EmbeddedResource>
     </ItemGroup>
 
-    <Import Project="..\..\src\Modules.Actions.Shared\Modules.Actions.Shared.projitems" Label="Shared"/>
-
 </Project>
diff --git a/modules/Modules.Windows.Notifications.Actions/ShowNotificationAction.cs b/modules/Modules.Windows.Notifications.Actions/ShowNotificationAction.cs
@@ -8,7 +8,6 @@
 using Windows.UI.Notifications;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.Notifications.Actions;
 
@@ -26,8 +25,6 @@ public class ShowNotificationAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             var toastXml = ToastNotificationManager.GetTemplateContent(ToastTemplateType.ToastText01);

diff --git a/modules/Modules.Windows.Registry.Actions/CreateRegistryKeyAction.cs b/modules/Modules.Windows.Registry.Actions/CreateRegistryKeyAction.cs
@@ -6,7 +6,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.Registry.Actions;
 
@@ -27,8 +26,6 @@ public class CreateRegistryKeyAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var registryKey = RegistryExtensions.ParseKey(Path, true);

diff --git a/modules/Modules.Windows.Registry.Actions/DeleteRegistryKeyAction.cs b/modules/Modules.Windows.Registry.Actions/DeleteRegistryKeyAction.cs
@@ -7,7 +7,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.Registry.Actions;
 
@@ -32,8 +31,6 @@ public class DeleteRegistryKeyAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var registryKey = RegistryExtensions.ParseKey(Path, true);

diff --git a/modules/Modules.Windows.Registry.Actions/DeleteRegistryValueAction.cs b/modules/Modules.Windows.Registry.Actions/DeleteRegistryValueAction.cs
@@ -7,7 +7,6 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.Registry.Actions;
 
@@ -32,8 +31,6 @@ public class DeleteRegistryValueAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var registryKey = RegistryExtensions.ParseKey(Path, true);

diff --git a/modules/Modules.Windows.Registry.Actions/GetRegistryValueAction.cs b/modules/Modules.Windows.Registry.Actions/GetRegistryValueAction.cs
@@ -8,7 +8,6 @@
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
 using Microsoft.Win32;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.Registry.Actions;
 
@@ -39,8 +38,6 @@ public class GetRegistryValueAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var registryKey = RegistryExtensions.ParseKey(Path, true);

diff --git a/modules/Modules.Windows.Registry.Actions/GetSubKeysInRegistryKeyAction.cs b/modules/Modules.Windows.Registry.Actions/GetSubKeysInRegistryKeyAction.cs
@@ -8,7 +8,6 @@
 using System.Linq;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.Registry.Actions;
 
@@ -29,8 +28,6 @@ public class GetSubKeysInRegistryKeyAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var registryKey = RegistryExtensions.ParseKey(Path, true);

diff --git a/modules/Modules.Windows.Registry.Actions/GetValuesInRegistryKeyAction.cs b/modules/Modules.Windows.Registry.Actions/GetValuesInRegistryKeyAction.cs
@@ -8,7 +8,6 @@
 using System.Linq;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.Registry.Actions;
 
@@ -29,8 +28,6 @@ public class GetValuesInRegistryKeyAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var registryKey = RegistryExtensions.ParseKey(Path, true);

diff --git a/modules/Modules.Windows.Registry.Actions/Modules.Windows.Registry.Actions.csproj b/modules/Modules.Windows.Registry.Actions/Modules.Windows.Registry.Actions.csproj
@@ -27,6 +27,4 @@
         </Compile>
     </ItemGroup>
 
-    <Import Project="..\..\src\Modules.Actions.Shared\Modules.Actions.Shared.projitems" Label="Shared" />
-
 </Project>
diff --git a/modules/Modules.Windows.Registry.Actions/SetRegistryValueAction.cs b/modules/Modules.Windows.Registry.Actions/SetRegistryValueAction.cs
@@ -9,7 +9,6 @@
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.ActionSelectors;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.Registry.Actions;
 
@@ -52,8 +51,6 @@ public class SetRegistryValueAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var registryKey = RegistryExtensions.ParseKey(Path, true);

diff --git a/modules/Modules.Windows.TaskScheduler.Actions/Actions/CreateTaskAction.cs b/modules/Modules.Windows.TaskScheduler.Actions/Actions/CreateTaskAction.cs
@@ -7,7 +7,6 @@
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
 using Microsoft.Win32.TaskScheduler;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 
 namespace PowerAutomate.Desktop.Modules.Windows.TaskScheduler.Actions.Actions;
 
@@ -39,8 +38,6 @@ public class CreateTaskAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var taskService = new TaskService(TargetServer, UserName, AccountDomain, Password);

diff --git a/modules/Modules.Windows.TaskScheduler.Actions/Actions/CreateTaskActionAction.cs b/modules/Modules.Windows.TaskScheduler.Actions/Actions/CreateTaskActionAction.cs
@@ -7,7 +7,6 @@
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
 using Microsoft.Win32.TaskScheduler;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 using PowerAutomate.Desktop.Modules.Windows.TaskScheduler.Actions.Exceptions;
 
 namespace PowerAutomate.Desktop.Modules.Windows.TaskScheduler.Actions.Actions;
@@ -50,8 +49,6 @@ public class CreateTaskActionAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var taskService = new TaskService(TargetServer, UserName, AccountDomain, Password);

diff --git a/modules/Modules.Windows.TaskScheduler.Actions/Actions/CreateTaskTriggerAction.cs b/modules/Modules.Windows.TaskScheduler.Actions/Actions/CreateTaskTriggerAction.cs
@@ -10,7 +10,6 @@
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.ActionSelectors;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
 using Microsoft.Win32.TaskScheduler;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 using PowerAutomate.Desktop.Modules.Windows.TaskScheduler.Actions.Enums;
 using PowerAutomate.Desktop.Modules.Windows.TaskScheduler.Actions.Exceptions;
 using PowerAutomate.Desktop.Modules.Windows.TaskScheduler.Actions.Extensions;
@@ -118,8 +117,6 @@ public class CreateTaskTriggerAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var taskService = new TaskService(TargetServer, UserName, AccountDomain, Password);

diff --git a/modules/Modules.Windows.TaskScheduler.Actions/Actions/DeleteTaskAction.cs b/modules/Modules.Windows.TaskScheduler.Actions/Actions/DeleteTaskAction.cs
@@ -8,7 +8,6 @@
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK;
 using Microsoft.PowerPlatform.PowerAutomate.Desktop.Actions.SDK.Attributes;
 using Microsoft.Win32.TaskScheduler;
-using PowerAutomate.Desktop.Modules.Actions.Shared;
 using PowerAutomate.Desktop.Modules.Windows.TaskScheduler.Actions.Exceptions;
 
 namespace PowerAutomate.Desktop.Modules.Windows.TaskScheduler.Actions.Actions;
@@ -42,8 +41,6 @@ public class DeleteTaskAction : ActionBase
 
     public override void Execute(ActionContext context)
     {
-        Debugger.Launch();
-
         try
         {
             using var taskService = new TaskService(TargetServer, UserName, AccountDomain, Password);