Skip to content

Commit ca29c2c

Browse files
committed
Created the netcore projects for DeviceProvisioningServices and PolicyInsights. Fixed tests for DeviceProvisioningServices. Added netcore test projects for both modules.
1 parent b2c0815 commit ca29c2c

18 files changed

+673
-171
lines changed

Azure.PowerShell.Netcore.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Storage.Netcore",
137137
EndProject
138138
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.UsageAggregates.Netcore", "src\ResourceManager\UsageAggregates\Commands.UsageAggregates\Commands.UsageAggregates.Netcore.csproj", "{AC30CFA4-0EC7-4303-ABC1-A60DFCA44B74}"
139139
EndProject
140+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DeviceProvisioningServices.Netcore", "src\ResourceManager\DeviceProvisioningServices\Commands.DeviceProvisioningServices\Commands.DeviceProvisioningServices.Netcore.csproj", "{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}"
141+
EndProject
142+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.PolicyInsights.Netcore", "src\ResourceManager\PolicyInsights\Commands.PolicyInsights\Commands.PolicyInsights.Netcore.csproj", "{A0574194-976A-486A-B589-07B2E50CA6EF}"
143+
EndProject
140144
Global
141145
GlobalSection(SolutionConfigurationPlatforms) = preSolution
142146
Debug|Any CPU = Debug|Any CPU
@@ -951,6 +955,30 @@ Global
951955
{AC30CFA4-0EC7-4303-ABC1-A60DFCA44B74}.Release|x64.Build.0 = Release|Any CPU
952956
{AC30CFA4-0EC7-4303-ABC1-A60DFCA44B74}.Release|x86.ActiveCfg = Release|Any CPU
953957
{AC30CFA4-0EC7-4303-ABC1-A60DFCA44B74}.Release|x86.Build.0 = Release|Any CPU
958+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
959+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Debug|Any CPU.Build.0 = Debug|Any CPU
960+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Debug|x64.ActiveCfg = Debug|Any CPU
961+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Debug|x64.Build.0 = Debug|Any CPU
962+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Debug|x86.ActiveCfg = Debug|Any CPU
963+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Debug|x86.Build.0 = Debug|Any CPU
964+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Release|Any CPU.ActiveCfg = Release|Any CPU
965+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Release|Any CPU.Build.0 = Release|Any CPU
966+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Release|x64.ActiveCfg = Release|Any CPU
967+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Release|x64.Build.0 = Release|Any CPU
968+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Release|x86.ActiveCfg = Release|Any CPU
969+
{804B11B7-D7B5-4E0F-ADFB-4BCD61B23D55}.Release|x86.Build.0 = Release|Any CPU
970+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
971+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
972+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Debug|x64.ActiveCfg = Debug|Any CPU
973+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Debug|x64.Build.0 = Debug|Any CPU
974+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Debug|x86.ActiveCfg = Debug|Any CPU
975+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Debug|x86.Build.0 = Debug|Any CPU
976+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
977+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|Any CPU.Build.0 = Release|Any CPU
978+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|x64.ActiveCfg = Release|Any CPU
979+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|x64.Build.0 = Release|Any CPU
980+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|x86.ActiveCfg = Release|Any CPU
981+
{A0574194-976A-486A-B589-07B2E50CA6EF}.Release|x86.Build.0 = Release|Any CPU
954982
EndGlobalSection
955983
GlobalSection(SolutionProperties) = preSolution
956984
HideSolutionNode = FALSE

src/Azure.PowerShell.Netcore.Test.sln

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.ApiManagement.Test
4949
EndProject
5050
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.UsageAggregates.Test.Netcore", "ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.Netcore.csproj", "{D95226AC-55D6-4152-9214-25F8BEB6E7F5}"
5151
EndProject
52+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.DeviceProvisioningServices.Test.Netcore", "ResourceManager\DeviceProvisioningServices\Commands.DeviceProvisioningServices.Test\Commands.DeviceProvisioningServices.Test.Netcore.csproj", "{95BE92BF-1B1F-407B-91D2-EA348BDB2073}"
53+
EndProject
54+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.PolicyInsights.Test.Netcore", "ResourceManager\PolicyInsights\Commands.PolicyInsights.Test\Commands.PolicyInsights.Test.Netcore.csproj", "{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}"
55+
EndProject
5256
Global
5357
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5458
Debug|Any CPU = Debug|Any CPU
@@ -335,6 +339,30 @@ Global
335339
{D95226AC-55D6-4152-9214-25F8BEB6E7F5}.Release|x64.Build.0 = Release|Any CPU
336340
{D95226AC-55D6-4152-9214-25F8BEB6E7F5}.Release|x86.ActiveCfg = Release|Any CPU
337341
{D95226AC-55D6-4152-9214-25F8BEB6E7F5}.Release|x86.Build.0 = Release|Any CPU
342+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
343+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Debug|Any CPU.Build.0 = Debug|Any CPU
344+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Debug|x64.ActiveCfg = Debug|Any CPU
345+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Debug|x64.Build.0 = Debug|Any CPU
346+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Debug|x86.ActiveCfg = Debug|Any CPU
347+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Debug|x86.Build.0 = Debug|Any CPU
348+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Release|Any CPU.ActiveCfg = Release|Any CPU
349+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Release|Any CPU.Build.0 = Release|Any CPU
350+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Release|x64.ActiveCfg = Release|Any CPU
351+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Release|x64.Build.0 = Release|Any CPU
352+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Release|x86.ActiveCfg = Release|Any CPU
353+
{95BE92BF-1B1F-407B-91D2-EA348BDB2073}.Release|x86.Build.0 = Release|Any CPU
354+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
355+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Debug|Any CPU.Build.0 = Debug|Any CPU
356+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Debug|x64.ActiveCfg = Debug|Any CPU
357+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Debug|x64.Build.0 = Debug|Any CPU
358+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Debug|x86.ActiveCfg = Debug|Any CPU
359+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Debug|x86.Build.0 = Debug|Any CPU
360+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
361+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|Any CPU.Build.0 = Release|Any CPU
362+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|x64.ActiveCfg = Release|Any CPU
363+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|x64.Build.0 = Release|Any CPU
364+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|x86.ActiveCfg = Release|Any CPU
365+
{AFA65D3A-FB7E-4DAB-9867-1CA4CBA41BFB}.Release|x86.Build.0 = Release|Any CPU
338366
EndGlobalSection
339367
GlobalSection(SolutionProperties) = preSolution
340368
HideSolutionNode = FALSE
Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
#
2+
# Module manifest for module 'AzureRM.DeviceProvisioningServices'
3+
#
4+
# Generated by: Microsoft Corporation
5+
#
6+
# Generated on: 5/18/2018
7+
#
8+
9+
@{
10+
11+
# Script module or binary module file associated with this manifest.
12+
# RootModule = ''
13+
14+
# Version number of this module.
15+
ModuleVersion = '0.12.0'
16+
17+
# Supported PSEditions
18+
CompatiblePSEditions = 'Core'
19+
20+
# ID used to uniquely identify this module
21+
GUID = 'b3e49e79-7210-4f76-b02c-4376749fa7a5'
22+
23+
# Author of this module
24+
Author = 'Microsoft Corporation'
25+
26+
# Company or vendor of this module
27+
CompanyName = 'Microsoft Corporation'
28+
29+
# Copyright statement for this module
30+
Copyright = 'Microsoft Corporation. All rights reserved.'
31+
32+
# Description of the functionality provided by this module
33+
Description = '[PowerShell .Net Core] Microsoft Azure PowerShell - Iot Device provisioning service cmdlets for Azure Resource Manager'
34+
35+
# Minimum version of the Windows PowerShell engine required by this module
36+
PowerShellVersion = '5.1'
37+
38+
# Name of the Windows PowerShell host required by this module
39+
# PowerShellHostName = ''
40+
41+
# Minimum version of the Windows PowerShell host required by this module
42+
# PowerShellHostVersion = ''
43+
44+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
45+
# DotNetFrameworkVersion = ''
46+
47+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
48+
# CLRVersion = ''
49+
50+
# Processor architecture (None, X86, Amd64) required by this module
51+
# ProcessorArchitecture = ''
52+
53+
# Modules that must be imported into the global environment prior to importing this module
54+
RequiredModules = @(@{ModuleName = 'AzureRM.Profile.Netcore'; ModuleVersion = '0.12.0'; })
55+
56+
# Assemblies that must be loaded prior to importing this module
57+
RequiredAssemblies = '.\Microsoft.Azure.Management.DeviceProvisioningServices.dll'
58+
59+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
60+
# ScriptsToProcess = @()
61+
62+
# Type files (.ps1xml) to be loaded when importing this module
63+
# TypesToProcess = @()
64+
65+
# Format files (.ps1xml) to be loaded when importing this module
66+
FormatsToProcess = '.\Microsoft.Azure.Commands.DeviceProvisioningServices.format.ps1xml'
67+
68+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
69+
NestedModules = @('.\Microsoft.Azure.Commands.DeviceProvisioningServices.dll')
70+
71+
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
72+
FunctionsToExport = @()
73+
74+
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
75+
CmdletsToExport = 'New-AzureRmIoTDeviceProvisioningService',
76+
'Get-AzureRmIoTDeviceProvisioningService',
77+
'Remove-AzureRmIoTDeviceProvisioningService',
78+
'Update-AzureRmIoTDeviceProvisioningService',
79+
'Get-AzureRmIoTDeviceProvisioningServiceAccessPolicy',
80+
'Add-AzureRmIoTDeviceProvisioningServiceAccessPolicy',
81+
'Remove-AzureRmIoTDeviceProvisioningServiceAccessPolicy',
82+
'Update-AzureRmIoTDeviceProvisioningServiceAccessPolicy',
83+
'Get-AzureRmIoTDeviceProvisioningServiceLinkedHub',
84+
'Add-AzureRmIoTDeviceProvisioningServiceLinkedHub',
85+
'Remove-AzureRmIoTDeviceProvisioningServiceLinkedHub',
86+
'Update-AzureRmIoTDeviceProvisioningServiceLinkedHub',
87+
'Get-AzureRmIoTDeviceProvisioningServiceCertificate',
88+
'Add-AzureRmIoTDeviceProvisioningServiceCertificate',
89+
'Remove-AzureRmIoTDeviceProvisioningServiceCertificate',
90+
'Set-AzureRmIoTDeviceProvisioningServiceCertificate',
91+
'New-AzureRmIoTDeviceProvisioningServiceCertificateVerificationCode'
92+
93+
# Variables to export from this module
94+
# VariablesToExport = @()
95+
96+
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
97+
AliasesToExport = 'New-AzureRmIoTDps', 'Get-AzureRmIoTDps', 'Remove-AzureRmIoTDps',
98+
'Update-AzureRmIoTDps', 'Get-AzureRmIoTDpsAccessPolicy',
99+
'Add-AzureRmIoTDpsAccessPolicy', 'Remove-AzureRmIoTDpsAccessPolicy',
100+
'Update-AzureRmIoTDpsAccessPolicy', 'Get-AzureRmIoTDpsHub',
101+
'Add-AzureRmIoTDpsHub', 'Remove-AzureRmIoTDpsHub',
102+
'Update-AzureRmIoTDpsHub', 'Get-AzureRmIoTDpsCertificate',
103+
'Add-AzureRmIoTDpsCertificate', 'Remove-AzureRmIoTDpsCertificate',
104+
'Set-AzureRmIoTDpsCertificate', 'New-AzureRmIoTDpsCVC'
105+
106+
# DSC resources to export from this module
107+
# DscResourcesToExport = @()
108+
109+
# List of all modules packaged with this module
110+
# ModuleList = @()
111+
112+
# List of all files packaged with this module
113+
# FileList = @()
114+
115+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
116+
PrivateData = @{
117+
118+
PSData = @{
119+
120+
# Tags applied to this module. These help with module discovery in online galleries.
121+
Tags = 'Azure', 'ResourceManager', 'ARM', 'DPS', 'IoTHub', 'DeviceProvisioningService'
122+
123+
# A URL to the license for this module.
124+
LicenseUri = 'https://aka.ms/azps-license'
125+
126+
# A URL to the main website for this project.
127+
ProjectUri = 'https://github.com/Azure/azure-powershell'
128+
129+
# A URL to an icon representing this module.
130+
# IconUri = ''
131+
132+
# ReleaseNotes of this module
133+
# ReleaseNotes = ''
134+
135+
# Prerelease string of this module
136+
Prerelease = 'preview'
137+
138+
# Flag to indicate whether the module requires explicit user acceptance for install/update
139+
# RequireLicenseAcceptance = $false
140+
141+
# External dependent modules of this module
142+
# ExternalModuleDependencies = @()
143+
144+
} # End of PSData hashtable
145+
146+
} # End of PrivateData hashtable
147+
148+
# HelpInfo URI of this module
149+
# HelpInfoURI = ''
150+
151+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
152+
# DefaultCommandPrefix = ''
153+
154+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.Test.targets" />
4+
5+
<PropertyGroup>
6+
<TargetFramework>netcoreapp2.0</TargetFramework>
7+
<AssemblyName>Microsoft.Azure.Commands.DeviceProvisioningServices.Test</AssemblyName>
8+
<RootNamespace>Microsoft.Azure.Commands.DeviceProvisioningServices.Test</RootNamespace>
9+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
10+
</PropertyGroup>
11+
12+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
13+
<DelaySign>false</DelaySign>
14+
<DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
15+
</PropertyGroup>
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
18+
<SignAssembly>true</SignAssembly>
19+
<DelaySign>true</DelaySign>
20+
<AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
21+
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.9.0-preview" />
26+
<PackageReference Include="Microsoft.Azure.Management.IotHub" Version="2.0.0" />
27+
</ItemGroup>
28+
29+
<ItemGroup>
30+
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Common.Authentication.Abstractions.Netcore.csproj" />
31+
<ProjectReference Include="..\..\..\Common\Commands.Common.Authentication\Common.Authentication.Netcore.csproj" />
32+
<ProjectReference Include="..\..\..\Common\Commands.Common\Common.Netcore.csproj" />
33+
<ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Common.ResourceManager.Netcore.csproj" />
34+
<ProjectReference Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\Common.ResourceManager.ScenarioTests.Netcore.csproj" />
35+
</ItemGroup>
36+
37+
<ItemGroup>
38+
<None Update="SessionRecords\**\*.json">
39+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
40+
</None>
41+
<None Update="ScenarioTests\*.ps1">
42+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
43+
</None>
44+
</ItemGroup>
45+
46+
<ItemGroup>
47+
<None Include="..\..\Common\Commands.ScenarioTests.ResourceManager.Common\AzureRM.Resources.ps1">
48+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
49+
</None>
50+
</ItemGroup>
51+
52+
</Project>

0 commit comments

Comments
 (0)