Skip to content
This repository was archived by the owner on Jul 22, 2024. It is now read-only.

Commit e935880

Browse files
idwilliams-2joelst
idwilliams-2
authored and
joelst
committed
Consolidated the projects to address an issue with Azure Automation. (#46)
* Consolidated the projects to address an issue with Azure Automation. * Corrected an issue with the module manifest and updated the version information.
1 parent 7898a3a commit e935880

103 files changed

Lines changed: 427 additions & 603 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Partner-Center-PowerShell.sln‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShell", "src\PowerShel
2121
EndProject
2222
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShell.Tests", "test\PowerShell.Tests\PowerShell.Tests.csproj", "{3407AFBC-72DA-491C-816F-2176D2E06DB4}"
2323
EndProject
24-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "src\Core\Core.csproj", "{2ADBC432-0006-491C-B043-96D50AD80F3A}"
25-
EndProject
26-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Models", "src\Core.Models\Core.Models.csproj", "{82CEA00B-DD46-402E-899B-A0F21B6E5E73}"
27-
EndProject
2824
Global
2925
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3026
Debug|Any CPU = Debug|Any CPU
@@ -39,23 +35,13 @@ Global
3935
{3407AFBC-72DA-491C-816F-2176D2E06DB4}.Debug|Any CPU.Build.0 = Debug|Any CPU
4036
{3407AFBC-72DA-491C-816F-2176D2E06DB4}.Release|Any CPU.ActiveCfg = Release|Any CPU
4137
{3407AFBC-72DA-491C-816F-2176D2E06DB4}.Release|Any CPU.Build.0 = Release|Any CPU
42-
{2ADBC432-0006-491C-B043-96D50AD80F3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43-
{2ADBC432-0006-491C-B043-96D50AD80F3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
44-
{2ADBC432-0006-491C-B043-96D50AD80F3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
45-
{2ADBC432-0006-491C-B043-96D50AD80F3A}.Release|Any CPU.Build.0 = Release|Any CPU
46-
{82CEA00B-DD46-402E-899B-A0F21B6E5E73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47-
{82CEA00B-DD46-402E-899B-A0F21B6E5E73}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{82CEA00B-DD46-402E-899B-A0F21B6E5E73}.Release|Any CPU.ActiveCfg = Release|Any CPU
49-
{82CEA00B-DD46-402E-899B-A0F21B6E5E73}.Release|Any CPU.Build.0 = Release|Any CPU
5038
EndGlobalSection
5139
GlobalSection(SolutionProperties) = preSolution
5240
HideSolutionNode = FALSE
5341
EndGlobalSection
5442
GlobalSection(NestedProjects) = preSolution
5543
{6714CA29-04A6-4D4E-919C-28AF294E6BA6} = {AD52517F-3B47-437C-B374-8302533DECBC}
5644
{3407AFBC-72DA-491C-816F-2176D2E06DB4} = {91C9A85A-2792-4EA1-9815-6DEEEFC2C932}
57-
{2ADBC432-0006-491C-B043-96D50AD80F3A} = {AD52517F-3B47-437C-B374-8302533DECBC}
58-
{82CEA00B-DD46-402E-899B-A0F21B6E5E73} = {AD52517F-3B47-437C-B374-8302533DECBC}
5945
EndGlobalSection
6046
GlobalSection(ExtensibilityGlobals) = postSolution
6147
SolutionGuid = {598D99A1-EECC-4613-AA82-FA1E915D0195}

‎src/Core.Models/Core.Models.csproj‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎src/Core/Core.csproj‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎src/Core/Properties/Resources.Designer.cs‎

Lines changed: 0 additions & 81 deletions
This file was deleted.

‎src/Core/Properties/Resources.resx‎

Lines changed: 0 additions & 126 deletions
This file was deleted.

src/Core/AuthenticationToken.cs renamed to src/PowerShell/AuthenticationToken.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// </copyright>
55
// -----------------------------------------------------------------------
66

7-
namespace Microsoft.Store.PartnerCenter.Core
7+
namespace Microsoft.Store.PartnerCenter.PowerShell
88
{
99
using System;
1010

src/Core/BasePartnerComponent.cs renamed to src/PowerShell/BasePartnerComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// </copyright>
55
// -----------------------------------------------------------------------
66

7-
namespace Microsoft.Store.PartnerCenter.Core
7+
namespace Microsoft.Store.PartnerCenter.PowerShell
88
{
99
using System;
1010

src/Core/BasePartnerComponentString.cs renamed to src/PowerShell/BasePartnerComponentString.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
// </copyright>
55
// -----------------------------------------------------------------------
66

7-
namespace Microsoft.Store.PartnerCenter.Core
7+
namespace Microsoft.Store.PartnerCenter.PowerShell
88
{
99
/// <summary>
1010
/// Holds common partner component properties and behavior. The context is string type by default.

‎src/PowerShell/Commands/GetPartnerCustomer.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ public class GetPartnerCustomer : PartnerPSCmdlet
4646
/// </summary>
4747
public override void ExecuteCmdlet()
4848
{
49-
IResourceCollectionEnumerator<SeekBasedResourceCollection<Customer>> customersEnumerator;
50-
List<Customer> customers;
51-
SeekBasedResourceCollection<Customer> seekCustomers;
49+
IResourceCollectionEnumerator<SeekBasedResourceCollection<PartnerCenter.Models.Customers.Customer>> customersEnumerator;
50+
List<PartnerCenter.Models.Customers.Customer> customers;
51+
SeekBasedResourceCollection<PartnerCenter.Models.Customers.Customer> seekCustomers;
5252

5353
if (string.IsNullOrEmpty(CustomerId))
5454
{
55-
customers = new List<Customer>();
55+
customers = new List<PartnerCenter.Models.Customers.Customer>();
5656

5757
if (string.IsNullOrEmpty(Domain))
5858
{

‎src/PowerShell/Commands/GetPartnerProduct.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace Microsoft.Store.PartnerCenter.PowerShell.Commands
1111
using Common;
1212
using Exceptions;
1313
using Models.Products;
14-
using PartnerCenter.Exceptions;
1514
using PartnerCenter.Models;
1615
using PartnerCenter.Models.Products;
1716
using Profile;
@@ -100,7 +99,7 @@ private void GetProduct(string countryCode, string productId)
10099
if (product != null)
101100
WriteObject(new PSProduct(product));
102101
}
103-
catch (PartnerException ex)
102+
catch (PartnerCenter.Exceptions.PartnerException ex)
104103
{
105104
throw new PSPartnerException("Error getting product id: " + productId, ex);
106105
}
@@ -129,7 +128,7 @@ private void GetProductsByCatalog(string countryCode, string targetView)
129128
if (products.TotalCount > 0)
130129
WriteObject(products.Items.Select(p => new PSProduct(p)), true);
131130
}
132-
catch (PartnerException ex)
131+
catch (PartnerCenter.Exceptions.PartnerException ex)
133132
{
134133
throw new PSPartnerException("Error getting products for catalog: " + targetView, ex);
135134
}
@@ -162,7 +161,7 @@ private void GetProductsBySegment(string countryCode, string targetView, string
162161
if (products.TotalCount > 0)
163162
WriteObject(products.Items.Select(p => new PSProduct(p)), true);
164163
}
165-
catch (PartnerException ex)
164+
catch (PartnerCenter.Exceptions.PartnerException ex)
166165
{
167166
throw new PSPartnerException("Error getting products for segment: " + targetSegment, ex);
168167
}

0 commit comments

Comments
 (0)