Skip to content

Commit b063ed8

Browse files
committed
Moved the Tags project and files into Resources. Added psd1 info from Tags into Resources psd1. Added Tags to Resources solution.
1 parent 94e9292 commit b063ed8

24 files changed

+14
-312
lines changed

src/ResourceManager/Resources/Commands.Resources/Az.Resources.psd1

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,14 @@ TypesToProcess = '.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.Types.ps1xm
7272

7373
# Format files (.ps1xml) to be loaded when importing this module
7474
FormatsToProcess = '.\Microsoft.Azure.Commands.Resources.format.ps1xml',
75-
'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.format.ps1xml'
75+
'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.format.ps1xml',
76+
'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.generated.format.ps1xml',
77+
'.\Microsoft.Azure.Commands.Tags.format.ps1xml'
7678

7779
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
7880
NestedModules = @('.\Microsoft.Azure.Commands.Resources.dll',
79-
'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll')
81+
'.\Microsoft.Azure.Commands.ResourceManager.Cmdlets.dll',
82+
'.\Microsoft.Azure.Commands.Tags.dll')
8083

8184
# 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.
8285
FunctionsToExport = @()
@@ -136,7 +139,8 @@ CmdletsToExport = 'Get-AzProviderOperation', 'Remove-AzRoleAssignment',
136139
'New-AzDeployment', 'Get-AzDeployment', 'Test-AzDeployment',
137140
'Remove-AzDeployment', 'Stop-AzDeployment',
138141
'Save-AzDeploymentTemplate',
139-
'Get-AzDeploymentOperation', 'Get-AzPolicyAlias'
142+
'Get-AzDeploymentOperation', 'Get-AzPolicyAlias',
143+
'Remove-AzTag', 'Get-AzTag', 'New-AzTag'
140144

141145
# Variables to export from this module
142146
# VariablesToExport = @()
@@ -166,7 +170,7 @@ PrivateData = @{
166170
# Tags applied to this module. These help with module discovery in online galleries.
167171
Tags = 'Azure', 'ResourceManager', 'ARM', 'Provider', 'ResourceGroup',
168172
'Deployment', 'ActiveDirectory', 'Authorization', 'Management',
169-
'ManagementGroups'
173+
'ManagementGroups', 'Tags'
170174

171175
# A URL to the license for this module.
172176
LicenseUri = 'https://aka.ms/azps-license'

src/ResourceManager/Tags/Commands.Tags/Commands.Tags.Netcore.csproj renamed to src/ResourceManager/Resources/Commands.Tags/Commands.Tags.Netcore.csproj

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,6 @@
2727
<DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
2828
</PropertyGroup>
2929

30-
<ItemGroup>
31-
<None Include="Az.Tags.psd1">
32-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
33-
</None>
34-
</ItemGroup>
35-
3630
<ItemGroup>
3731
<Compile Update="Properties\Resources.Designer.cs">
3832
<DesignTime>true</DesignTime>

src/ResourceManager/Resources/Resources.sln

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Insights.Netcore",
1414
EndProject
1515
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Profile.Netcore", "..\Profile\Commands.Profile\Commands.Profile.Netcore.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}"
1616
EndProject
17+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Tags.Netcore", "Commands.Tags\Commands.Tags.Netcore.csproj", "{6BD4D521-DAFB-472B-A803-81F053AB1396}"
18+
EndProject
1719
Global
1820
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1921
Debug|Any CPU = Debug|Any CPU
@@ -40,6 +42,10 @@ Global
4042
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU
4143
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU
4244
{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{6BD4D521-DAFB-472B-A803-81F053AB1396}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{6BD4D521-DAFB-472B-A803-81F053AB1396}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{6BD4D521-DAFB-472B-A803-81F053AB1396}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{6BD4D521-DAFB-472B-A803-81F053AB1396}.Release|Any CPU.Build.0 = Release|Any CPU
4349
EndGlobalSection
4450
GlobalSection(SolutionProperties) = preSolution
4551
HideSolutionNode = FALSE

src/ResourceManager/Tags/Commands.Tags/Az.Tags.psd1

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

src/ResourceManager/Tags/Commands.Tags/ChangeLog.md

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

src/ResourceManager/Tags/Tags.sln

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

src/ResourceManager/Tags/documentation/current-breaking-changes.md

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

src/ResourceManager/Tags/documentation/upcoming-breaking-changes.md

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

0 commit comments

Comments
 (0)