Skip to content

Commit 762dc38

Browse files
ogailogail
committed
Regenerate MSI and fix UsageAggregates folder name
1 parent a5fd1be commit 762dc38

File tree

19 files changed

+185
-165
lines changed

19 files changed

+185
-165
lines changed

‎setup/azurecmdfiles.wxi

Lines changed: 180 additions & 74 deletions
Large diffs are not rendered by default.

‎src/ResourceManager.sln

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AzureBackup", "Res
2929
EndProject
3030
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Batch", "ResourceManager\AzureBatch\Commands.Batch\Commands.Batch.csproj", "{D470E50A-9607-48D6-A924-4F9F86502704}"
3131
EndProject
32-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates", "ResourceManager\Commerce\Commands.UsageAggregates\Commands.UsageAggregates.csproj", "{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}"
32+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates", "ResourceManager\UsageAggregates\Commands.UsageAggregates\Commands.UsageAggregates.csproj", "{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}"
3333
EndProject
3434
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Compute", "ResourceManager\Compute\Commands.Compute\Commands.Compute.csproj", "{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}"
3535
EndProject
@@ -111,7 +111,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "Common\
111111
EndProject
112112
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile.Test", "Common\Commands.ResourceManager.Profile.Test\Commands.Profile.Test.csproj", "{152D78F0-A642-4D0E-B3A8-2FC64FFA9714}"
113113
EndProject
114-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\Commerce\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
114+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "ResourceManager\UsageAggregates\Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}"
115115
EndProject
116116
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "ResourceManager\Websites\Commands.Websites.Test\Commands.Websites.Test.csproj", "{13E031E4-8A43-4B87-9D72-D70180C31C11}"
117117
EndProject

‎src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ CLRVersion='4.0'
4545
ProcessorArchitecture = 'None'
4646

4747
# Modules that must be imported into the global environment prior to importing this module
48-
RequiredModules = @( @{ ModuleName = 'Azure.Profile'; ModuleVersion = '0.9.8' })
48+
RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '0.9.8' })
4949

5050
# Assemblies that must be loaded prior to importing this module
5151
RequiredAssemblies = @()
@@ -61,8 +61,8 @@ FormatsToProcess = @()
6161

6262
# Modules to import as nested modules of the module specified in ModuleToProcess
6363
NestedModules = @(
64-
'.\ApiManagement\Microsoft.Azure.Commands.ApiManagement.dll',
65-
'.\ApiManagement\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll'
64+
'.\Microsoft.Azure.Commands.ApiManagement.dll',
65+
'.\Microsoft.Azure.Commands.ApiManagement.ServiceManagement.dll'
6666
)
6767

6868
# Functions to export from this module

‎src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1

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

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/Properties/AssemblyInfo.cs renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Properties/AssemblyInfo.cs

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.cs renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.cs

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.ps1 renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/ScenarioTests/UsageAggregatesTests.ps1

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/SessionRecords/Microsoft.Azure.Commands.UsageAggregates.Test.ScenarioTests.UsageAggregatesTests/TestGetUsageAggregatesWithDefaultParameters.json renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/SessionRecords/Microsoft.Azure.Commands.UsageAggregates.Test.ScenarioTests.UsageAggregatesTests/TestGetUsageAggregatesWithDefaultParameters.json

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates.Test/packages.config renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/packages.config

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates/GetUsageAggregatesCommand.cs renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates/GetUsageAggregatesCommand.cs

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates/MSSharedLibKey.snk renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates/MSSharedLibKey.snk

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.Format.ps1xml

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Microsoft.Azure.Commands.UsageAggregates.dll-help.xml

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates/Properties/AssemblyInfo.cs renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Properties/AssemblyInfo.cs

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates/TestTheCmdLet.ps1 renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates/TestTheCmdLet.ps1

File renamed without changes.

‎src/ResourceManager/Commerce/Commands.UsageAggregates/packages.config renamed to ‎src/ResourceManager/UsageAggregates/Commands.UsageAggregates/packages.config

File renamed without changes.

0 commit comments

Comments
 (0)