Skip to content

Commit 2bb87f7

Browse files
Migrate StackHCI from generation to main (#21048)
* Move StackHCI to main * Update ChangeLog.md --------- Co-authored-by: Beisi Zhou <[email protected]>
1 parent f862a15 commit 2bb87f7

File tree

5 files changed

+44
-49
lines changed

5 files changed

+44
-49
lines changed

src/StackHCI/Az.StackHCI.psd1

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 2023/2/3
6+
# Generated on: 2/27/2023
77
#
88

99
@{
@@ -120,13 +120,7 @@ PrivateData = @{
120120
# IconUri = ''
121121

122122
# ReleaseNotes of this module
123-
ReleaseNotes = '* Added Remote Support terms and conditions for HCI device types.
124-
* Unified Resource Group support for both Azure Stack HCI and Arc for server resources.
125-
* Enhanced error feedback and logging in the Register-AzStackHCI cmdlet.
126-
* Bug fixes and improvements in Azure Arc for servers enablement in Register-AzStackHCI cmdlet.
127-
* Improved parameter validations in the Register-AzStackHCI cmdlet.
128-
* Enabled Managed System Identity (MSI) for Registration in Fairfax Cloud.
129-
* Minor bug fixes and improvements.'
123+
# ReleaseNotes = ''
130124

131125
# Prerelease string of this module
132126
# Prerelease = ''

src/StackHCI/ChangeLog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21+
* Removed verbose while importing modules.
2122

2223
## Version 1.4.2
2324
* Added Remote Support terms and conditions for HCI device types.

src/StackHCI/StackHCI.sln

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 17
44
VisualStudioVersion = 17.0.31903.59
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{6F0C64B4-5CB8-4CA6-8575-98BF34AB759B}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{39174213-6C80-4987-AB0C-43CAA3669F3F}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{6815DB85-CC27-49EF-8109-78F7019733C9}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{F095DE48-C362-43CA-BDDD-A119920A9E7D}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{3C1BA518-E0AC-47C1-AE7D-27B16F5C14EE}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{F52158AF-C78E-4765-8721-2C9E6778B323}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{AEFE312E-4EC1-4A3E-B676-9B74E6FF8BBC}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{01D7BE19-D97F-4730-B5D2-4B410BBD3CD2}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{725668DE-C9C2-4CBD-BA7C-D895D39CE442}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{81A759B1-754A-4C82-97A2-439646980C02}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{6925CA77-4203-4DBF-BD49-1E443480BFC2}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{435F721E-3CCE-493A-8430-BC1AEA382139}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.StackHCI", "Az.StackHCI.csproj", "{1CD10118-7C26-4ED2-9858-8D0908EB86E1}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.StackHCI", "Az.StackHCI.csproj", "{DAC22DDC-D376-4A68-B6E7-2101556F08ED}"
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,33 +26,33 @@ Global
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
2828
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{6F0C64B4-5CB8-4CA6-8575-98BF34AB759B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{6F0C64B4-5CB8-4CA6-8575-98BF34AB759B}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{6F0C64B4-5CB8-4CA6-8575-98BF34AB759B}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{6F0C64B4-5CB8-4CA6-8575-98BF34AB759B}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{6815DB85-CC27-49EF-8109-78F7019733C9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{6815DB85-CC27-49EF-8109-78F7019733C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{6815DB85-CC27-49EF-8109-78F7019733C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{6815DB85-CC27-49EF-8109-78F7019733C9}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{3C1BA518-E0AC-47C1-AE7D-27B16F5C14EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{3C1BA518-E0AC-47C1-AE7D-27B16F5C14EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{3C1BA518-E0AC-47C1-AE7D-27B16F5C14EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{3C1BA518-E0AC-47C1-AE7D-27B16F5C14EE}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{AEFE312E-4EC1-4A3E-B676-9B74E6FF8BBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{AEFE312E-4EC1-4A3E-B676-9B74E6FF8BBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{AEFE312E-4EC1-4A3E-B676-9B74E6FF8BBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{AEFE312E-4EC1-4A3E-B676-9B74E6FF8BBC}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{725668DE-C9C2-4CBD-BA7C-D895D39CE442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{725668DE-C9C2-4CBD-BA7C-D895D39CE442}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{725668DE-C9C2-4CBD-BA7C-D895D39CE442}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{725668DE-C9C2-4CBD-BA7C-D895D39CE442}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{6925CA77-4203-4DBF-BD49-1E443480BFC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{6925CA77-4203-4DBF-BD49-1E443480BFC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{6925CA77-4203-4DBF-BD49-1E443480BFC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{6925CA77-4203-4DBF-BD49-1E443480BFC2}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{1CD10118-7C26-4ED2-9858-8D0908EB86E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{1CD10118-7C26-4ED2-9858-8D0908EB86E1}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{1CD10118-7C26-4ED2-9858-8D0908EB86E1}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{1CD10118-7C26-4ED2-9858-8D0908EB86E1}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{39174213-6C80-4987-AB0C-43CAA3669F3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{39174213-6C80-4987-AB0C-43CAA3669F3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{39174213-6C80-4987-AB0C-43CAA3669F3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{39174213-6C80-4987-AB0C-43CAA3669F3F}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{F095DE48-C362-43CA-BDDD-A119920A9E7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{F095DE48-C362-43CA-BDDD-A119920A9E7D}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{F095DE48-C362-43CA-BDDD-A119920A9E7D}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{F095DE48-C362-43CA-BDDD-A119920A9E7D}.Release|Any CPU.Build.0 = Release|Any CPU
37+
{F52158AF-C78E-4765-8721-2C9E6778B323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{F52158AF-C78E-4765-8721-2C9E6778B323}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{F52158AF-C78E-4765-8721-2C9E6778B323}.Release|Any CPU.ActiveCfg = Release|Any CPU
40+
{F52158AF-C78E-4765-8721-2C9E6778B323}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{01D7BE19-D97F-4730-B5D2-4B410BBD3CD2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{01D7BE19-D97F-4730-B5D2-4B410BBD3CD2}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{01D7BE19-D97F-4730-B5D2-4B410BBD3CD2}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{01D7BE19-D97F-4730-B5D2-4B410BBD3CD2}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{81A759B1-754A-4C82-97A2-439646980C02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{81A759B1-754A-4C82-97A2-439646980C02}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{81A759B1-754A-4C82-97A2-439646980C02}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{81A759B1-754A-4C82-97A2-439646980C02}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{435F721E-3CCE-493A-8430-BC1AEA382139}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{435F721E-3CCE-493A-8430-BC1AEA382139}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{435F721E-3CCE-493A-8430-BC1AEA382139}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{435F721E-3CCE-493A-8430-BC1AEA382139}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{DAC22DDC-D376-4A68-B6E7-2101556F08ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{DAC22DDC-D376-4A68-B6E7-2101556F08ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{DAC22DDC-D376-4A68-B6E7-2101556F08ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{DAC22DDC-D376-4A68-B6E7-2101556F08ED}.Release|Any CPU.Build.0 = Release|Any CPU
5757
EndGlobalSection
5858
EndGlobal

src/StackHCI/custom/stackhci.ps1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5839,7 +5839,7 @@ function Enable-AzStackHCIRemoteSupport{
58395839
}
58405840

58415841
if(Assert-IsObservabilityStackPresent){
5842-
Import-Module DiagnosticsInitializer -Verbose -Force
5842+
Import-Module DiagnosticsInitializer -Force
58435843
Enable-RemoteSupport -AccessLevel $AccessLevel -ExpireInMinutes $ExpireInMinutes -SasCredential $SasCredential -AgreeToRemoteSupportConsent:$AgreeToRemoteSupportConsent
58445844
}
58455845
else{
@@ -5867,7 +5867,7 @@ function Disable-AzStackHCIRemoteSupport{
58675867
[OutputType([Boolean])]
58685868
param()
58695869
if(Assert-IsObservabilityStackPresent){
5870-
Import-Module DiagnosticsInitializer -Verbose -Force
5870+
Import-Module DiagnosticsInitializer -Force
58715871
Disable-RemoteSupport
58725872
}
58735873
else{
@@ -5909,7 +5909,7 @@ function Get-AzStackHCIRemoteSupportAccess{
59095909
)
59105910

59115911
if(Assert-IsObservabilityStackPresent){
5912-
Import-Module DiagnosticsInitializer -Verbose -Force
5912+
Import-Module DiagnosticsInitializer -Force
59135913
Get-RemoteSupportAccess -IncludeExpired:$IncludeExpired
59145914
}
59155915
else{
@@ -5999,7 +5999,7 @@ function Get-AzStackHCIRemoteSupportSessionHistory{
59995999
)
60006000

60016001
if(Assert-IsObservabilityStackPresent){
6002-
Import-Module DiagnosticsInitializer -Verbose -Force
6002+
Import-Module DiagnosticsInitializer -Force
60036003
Get-RemoteSupportSessionHistory -SessionId $SessionId -FromDate $FromDate -IncludeSessionTranscript:$IncludeSessionTranscript
60046004
}
60056005
else{

src/StackHCI/generate-info.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"swagger_commit": "18e83e24c36eed85a240103b476de0220ace7f84",
2+
"swagger_commit": "82823cde278037970d19e112dc159996313366bc",
33
"node": "v14.15.5",
44
"autorest": "`-- (empty)",
55
"autorest_core": "3.9.4",
66
"autorest_modelerfour": "4.15.414",
7-
"autorest_powershell": "3.0.498"
7+
"autorest_powershell": "3.0.499"
88
}

0 commit comments

Comments
 (0)