Skip to content

Commit 11a2bc8

Browse files
azure-powershell-botVeryEarly
azure-powershell-bot
and
VeryEarly
authored
Migrate StackHCI from generation to main (#22928)
* Move StackHCI to main * Update ChangeLog.md --------- Co-authored-by: Yabo Hu <[email protected]>
1 parent 5fd4794 commit 11a2bc8

File tree

5 files changed

+52
-38
lines changed

5 files changed

+52
-38
lines changed

‎src/StackHCI/Az.StackHCI.psd1

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

99
@{
@@ -121,7 +121,7 @@ PrivateData = @{
121121
# IconUri = ''
122122

123123
# ReleaseNotes of this module
124-
ReleaseNotes = '* Added changes to selectively enable ARC.'
124+
# ReleaseNotes = ''
125125

126126
# Prerelease string of this module
127127
# 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+
* Reverted remove CustomIMDSHost
2122

2223
## Version 2.2.1
2324
* Added changes to selectively enable ARC.

‎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", "{DFA30E08-791B-45B9-88D2-F2986C1E1A37}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{EABA0B26-59B9-4A25-A8D1-7CB074ED7F23}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{B9300A78-1A07-42E9-8BB8-C95416180488}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{8A70E9EB-03A2-4766-AACB-31EA350CA306}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{8D0FB6AC-A2E2-4894-91B0-CCAA084536D4}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{4353B46E-5C67-48BA-AAFC-74014B5394DC}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{C96D4836-921A-4EF5-A5E7-436ADC6948FA}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{DF8A54B1-700D-4C26-BDD8-387BFC26073F}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{1396523A-0B95-406D-A7AD-B33D8D1A2F3E}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{3045D53C-0026-4550-B640-B5ACA8A26A47}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{67486F7C-0D64-4BC3-BD48-C4BE68B1BE56}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{22C4217C-2EB1-4D0B-9B37-7FC38CEF17B7}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.StackHCI", "Az.StackHCI.csproj", "{52EE6034-7FA3-4359-9595-C2C6E2096326}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.StackHCI", "Az.StackHCI.csproj", "{83B437F3-8838-4A4C-98EC-B4EFBC134C26}"
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,33 +26,33 @@ Global
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
2828
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{DFA30E08-791B-45B9-88D2-F2986C1E1A37}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{DFA30E08-791B-45B9-88D2-F2986C1E1A37}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{DFA30E08-791B-45B9-88D2-F2986C1E1A37}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{DFA30E08-791B-45B9-88D2-F2986C1E1A37}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{B9300A78-1A07-42E9-8BB8-C95416180488}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{B9300A78-1A07-42E9-8BB8-C95416180488}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{B9300A78-1A07-42E9-8BB8-C95416180488}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{B9300A78-1A07-42E9-8BB8-C95416180488}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{8D0FB6AC-A2E2-4894-91B0-CCAA084536D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{8D0FB6AC-A2E2-4894-91B0-CCAA084536D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{8D0FB6AC-A2E2-4894-91B0-CCAA084536D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{8D0FB6AC-A2E2-4894-91B0-CCAA084536D4}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{C96D4836-921A-4EF5-A5E7-436ADC6948FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{C96D4836-921A-4EF5-A5E7-436ADC6948FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{C96D4836-921A-4EF5-A5E7-436ADC6948FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{C96D4836-921A-4EF5-A5E7-436ADC6948FA}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{1396523A-0B95-406D-A7AD-B33D8D1A2F3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{1396523A-0B95-406D-A7AD-B33D8D1A2F3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{1396523A-0B95-406D-A7AD-B33D8D1A2F3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{1396523A-0B95-406D-A7AD-B33D8D1A2F3E}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{67486F7C-0D64-4BC3-BD48-C4BE68B1BE56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{67486F7C-0D64-4BC3-BD48-C4BE68B1BE56}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{67486F7C-0D64-4BC3-BD48-C4BE68B1BE56}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{67486F7C-0D64-4BC3-BD48-C4BE68B1BE56}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{52EE6034-7FA3-4359-9595-C2C6E2096326}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{52EE6034-7FA3-4359-9595-C2C6E2096326}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{52EE6034-7FA3-4359-9595-C2C6E2096326}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{52EE6034-7FA3-4359-9595-C2C6E2096326}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{EABA0B26-59B9-4A25-A8D1-7CB074ED7F23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{EABA0B26-59B9-4A25-A8D1-7CB074ED7F23}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{EABA0B26-59B9-4A25-A8D1-7CB074ED7F23}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{EABA0B26-59B9-4A25-A8D1-7CB074ED7F23}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{8A70E9EB-03A2-4766-AACB-31EA350CA306}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{8A70E9EB-03A2-4766-AACB-31EA350CA306}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{8A70E9EB-03A2-4766-AACB-31EA350CA306}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{8A70E9EB-03A2-4766-AACB-31EA350CA306}.Release|Any CPU.Build.0 = Release|Any CPU
37+
{4353B46E-5C67-48BA-AAFC-74014B5394DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{4353B46E-5C67-48BA-AAFC-74014B5394DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{4353B46E-5C67-48BA-AAFC-74014B5394DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
40+
{4353B46E-5C67-48BA-AAFC-74014B5394DC}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{DF8A54B1-700D-4C26-BDD8-387BFC26073F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{DF8A54B1-700D-4C26-BDD8-387BFC26073F}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{DF8A54B1-700D-4C26-BDD8-387BFC26073F}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{DF8A54B1-700D-4C26-BDD8-387BFC26073F}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{3045D53C-0026-4550-B640-B5ACA8A26A47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{3045D53C-0026-4550-B640-B5ACA8A26A47}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{3045D53C-0026-4550-B640-B5ACA8A26A47}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{3045D53C-0026-4550-B640-B5ACA8A26A47}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{22C4217C-2EB1-4D0B-9B37-7FC38CEF17B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{22C4217C-2EB1-4D0B-9B37-7FC38CEF17B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{22C4217C-2EB1-4D0B-9B37-7FC38CEF17B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{22C4217C-2EB1-4D0B-9B37-7FC38CEF17B7}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{83B437F3-8838-4A4C-98EC-B4EFBC134C26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{83B437F3-8838-4A4C-98EC-B4EFBC134C26}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{83B437F3-8838-4A4C-98EC-B4EFBC134C26}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{83B437F3-8838-4A4C-98EC-B4EFBC134C26}.Release|Any CPU.Build.0 = Release|Any CPU
5757
EndGlobalSection
5858
EndGlobal

‎src/StackHCI/custom/stackhci.ps1

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -607,6 +607,19 @@ $registerArcScript = {
607607
}
608608
finally
609609
{
610+
$customImdsScript = { try{ $customImdsRegKey = Get-Item 'HKLM:\Software\Microsoft\Windows Azure\CurrentVersion\IMDS' -ErrorAction Stop } catch{ $customImdsRegKey = New-Item 'HKLM:\Software\Microsoft\Windows Azure\CurrentVersion\IMDS' -Force -ErrorAction Stop } $customImdsRegKey | New-ItemProperty -Name 'CustomIMDSHostAddress' -Value 'http://127.0.0.1:42542' -Force -ErrorAction Stop | Out-Null }
611+
try
612+
{
613+
Write-Verbose ('Configuring CustomIMDSHostAddress')
614+
Invoke-Command -ScriptBlock $customImdsScript
615+
}
616+
catch
617+
{
618+
Write-Verbose ('Exception occurred while setting custom IMDS host. ErrorMessage : ' + $_.Exception.Message)
619+
Write-Verbose ($_ | Out-String)
620+
Write-Warning ('Could not configure CustomIMDSHostAddress for node.')
621+
}
622+
610623
try{ Stop-Transcript } catch {}
611624
}
612625
}

‎src/StackHCI/generate-info.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"swagger_commit": "06479e897f635086bd40e6ee879e94f4a803ddd9",
2+
"swagger_commit": "e1017d9ab49f41296177b4f4c9ac741fb7de044d",
33
"node": "v14.15.5",
44
"autorest": "`-- (empty)",
55
"autorest_core": "3.9.7",

0 commit comments

Comments
 (0)