Skip to content

Commit be772ae

Browse files
azure-powershell-botazure-powershell-bot
authored
Move App to main (#21968)
1 parent 6278a3e commit be772ae

File tree

143 files changed

+486
-363
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+486
-363
lines changed

‎src/App/App.sln

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +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", "{2525238E-CD02-43EF-94BD-CB117D4570C2}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{09D30F2A-33CB-472E-AF25-683A65BB8489}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{C7AB3753-6093-4836-8084-A7E1BFE4A8E3}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{44E0AC09-895F-473F-8C24-82182A9C63F1}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{1C91DD2D-EA46-463D-ACD8-22DA3FE8847F}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{5955954B-41AA-4E5A-9601-9184A7EBA89E}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{9F393E0D-1617-4489-B6AB-4E91E3AEE397}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{3193ACA3-0896-4A62-9B6A-3185F6BD0D73}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{C7153CD1-8A3E-45A9-A55B-6CFEA65F792B}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{59A64784-DA5E-4320-BD03-8CB801CB9A81}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.App", "Az.App.csproj", "{2C332323-0AC8-4391-9DC4-38A5C77B985D}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{9B506B0D-F892-4DC1-A344-1BC26927F5A6}"
17+
EndProject
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.App", "Az.App.csproj", "{E654A128-A7F6-41B9-B1BF-319DD749EDFC}"
1719
EndProject
1820
Global
1921
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,29 +26,33 @@ Global
2426
HideSolutionNode = FALSE
2527
EndGlobalSection
2628
GlobalSection(ProjectConfigurationPlatforms) = postSolution
27-
{2525238E-CD02-43EF-94BD-CB117D4570C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28-
{2525238E-CD02-43EF-94BD-CB117D4570C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
29-
{2525238E-CD02-43EF-94BD-CB117D4570C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
30-
{2525238E-CD02-43EF-94BD-CB117D4570C2}.Release|Any CPU.Build.0 = Release|Any CPU
31-
{C7AB3753-6093-4836-8084-A7E1BFE4A8E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32-
{C7AB3753-6093-4836-8084-A7E1BFE4A8E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
33-
{C7AB3753-6093-4836-8084-A7E1BFE4A8E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
34-
{C7AB3753-6093-4836-8084-A7E1BFE4A8E3}.Release|Any CPU.Build.0 = Release|Any CPU
35-
{1C91DD2D-EA46-463D-ACD8-22DA3FE8847F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
36-
{1C91DD2D-EA46-463D-ACD8-22DA3FE8847F}.Debug|Any CPU.Build.0 = Debug|Any CPU
37-
{1C91DD2D-EA46-463D-ACD8-22DA3FE8847F}.Release|Any CPU.ActiveCfg = Release|Any CPU
38-
{1C91DD2D-EA46-463D-ACD8-22DA3FE8847F}.Release|Any CPU.Build.0 = Release|Any CPU
39-
{9F393E0D-1617-4489-B6AB-4E91E3AEE397}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{9F393E0D-1617-4489-B6AB-4E91E3AEE397}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{9F393E0D-1617-4489-B6AB-4E91E3AEE397}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{9F393E0D-1617-4489-B6AB-4E91E3AEE397}.Release|Any CPU.Build.0 = Release|Any CPU
43-
{C7153CD1-8A3E-45A9-A55B-6CFEA65F792B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44-
{C7153CD1-8A3E-45A9-A55B-6CFEA65F792B}.Debug|Any CPU.Build.0 = Debug|Any CPU
45-
{C7153CD1-8A3E-45A9-A55B-6CFEA65F792B}.Release|Any CPU.ActiveCfg = Release|Any CPU
46-
{C7153CD1-8A3E-45A9-A55B-6CFEA65F792B}.Release|Any CPU.Build.0 = Release|Any CPU
47-
{2C332323-0AC8-4391-9DC4-38A5C77B985D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
48-
{2C332323-0AC8-4391-9DC4-38A5C77B985D}.Debug|Any CPU.Build.0 = Debug|Any CPU
49-
{2C332323-0AC8-4391-9DC4-38A5C77B985D}.Release|Any CPU.ActiveCfg = Release|Any CPU
50-
{2C332323-0AC8-4391-9DC4-38A5C77B985D}.Release|Any CPU.Build.0 = Release|Any CPU
29+
{09D30F2A-33CB-472E-AF25-683A65BB8489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30+
{09D30F2A-33CB-472E-AF25-683A65BB8489}.Debug|Any CPU.Build.0 = Debug|Any CPU
31+
{09D30F2A-33CB-472E-AF25-683A65BB8489}.Release|Any CPU.ActiveCfg = Release|Any CPU
32+
{09D30F2A-33CB-472E-AF25-683A65BB8489}.Release|Any CPU.Build.0 = Release|Any CPU
33+
{44E0AC09-895F-473F-8C24-82182A9C63F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34+
{44E0AC09-895F-473F-8C24-82182A9C63F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
35+
{44E0AC09-895F-473F-8C24-82182A9C63F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
36+
{44E0AC09-895F-473F-8C24-82182A9C63F1}.Release|Any CPU.Build.0 = Release|Any CPU
37+
{5955954B-41AA-4E5A-9601-9184A7EBA89E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38+
{5955954B-41AA-4E5A-9601-9184A7EBA89E}.Debug|Any CPU.Build.0 = Debug|Any CPU
39+
{5955954B-41AA-4E5A-9601-9184A7EBA89E}.Release|Any CPU.ActiveCfg = Release|Any CPU
40+
{5955954B-41AA-4E5A-9601-9184A7EBA89E}.Release|Any CPU.Build.0 = Release|Any CPU
41+
{3193ACA3-0896-4A62-9B6A-3185F6BD0D73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42+
{3193ACA3-0896-4A62-9B6A-3185F6BD0D73}.Debug|Any CPU.Build.0 = Debug|Any CPU
43+
{3193ACA3-0896-4A62-9B6A-3185F6BD0D73}.Release|Any CPU.ActiveCfg = Release|Any CPU
44+
{3193ACA3-0896-4A62-9B6A-3185F6BD0D73}.Release|Any CPU.Build.0 = Release|Any CPU
45+
{59A64784-DA5E-4320-BD03-8CB801CB9A81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46+
{59A64784-DA5E-4320-BD03-8CB801CB9A81}.Debug|Any CPU.Build.0 = Debug|Any CPU
47+
{59A64784-DA5E-4320-BD03-8CB801CB9A81}.Release|Any CPU.ActiveCfg = Release|Any CPU
48+
{59A64784-DA5E-4320-BD03-8CB801CB9A81}.Release|Any CPU.Build.0 = Release|Any CPU
49+
{9B506B0D-F892-4DC1-A344-1BC26927F5A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50+
{9B506B0D-F892-4DC1-A344-1BC26927F5A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
51+
{9B506B0D-F892-4DC1-A344-1BC26927F5A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
52+
{9B506B0D-F892-4DC1-A344-1BC26927F5A6}.Release|Any CPU.Build.0 = Release|Any CPU
53+
{E654A128-A7F6-41B9-B1BF-319DD749EDFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54+
{E654A128-A7F6-41B9-B1BF-319DD749EDFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
55+
{E654A128-A7F6-41B9-B1BF-319DD749EDFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
56+
{E654A128-A7F6-41B9-B1BF-319DD749EDFC}.Release|Any CPU.Build.0 = Release|Any CPU
5157
EndGlobalSection
5258
EndGlobal

‎src/App/Az.App.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: 1/6/2023
6+
# Generated on: 6/1/2023
77
#
88

99
@{
@@ -138,7 +138,7 @@ PrivateData = @{
138138
# IconUri = ''
139139

140140
# ReleaseNotes of this module
141-
ReleaseNotes = '* Added enrich example for the cmdlet ''New-AzContainerAppScaleRuleObject''.[#20334]'
141+
# ReleaseNotes = ''
142142

143143
# Prerelease string of this module
144144
# Prerelease = ''

‎src/App/build-module.ps1

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@ $null = New-Item -ItemType Directory -Force -Path $examplesFolder
123123

124124
Write-Host -ForegroundColor Green 'Creating cmdlets for specified models...'
125125
$modelCmdlets = @()
126+
$modelCmdletFolder = Join-Path (Join-Path $PSScriptRoot './custom') 'autogen-model-cmdlets'
127+
if (Test-Path $modelCmdletFolder) {
128+
$null = Remove-Item -Force -Recurse -Path $modelCmdletFolder
129+
}
126130
if ($modelCmdlets.Count -gt 0) {
127131
. (Join-Path $PSScriptRoot 'create-model-cmdlets.ps1')
128132
CreateModelCmdlet($modelCmdlets)

‎src/App/create-model-cmdlets.ps1

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,13 @@ function CreateModelCmdlet {
2323
}
2424

2525
$ModelCsPath = Join-Path (Join-Path $PSScriptRoot 'generated\api') 'Models'
26-
$ModuleName = ''
2726
$OutputDir = Join-Path $PSScriptRoot 'custom\autogen-model-cmdlets'
2827
$null = New-Item -ItemType Directory -Force -Path $OutputDir
28+
if (''.length -gt 0) {
29+
$ModuleName = ''
30+
} else {
31+
$ModuleName = 'Az.App'
32+
}
2933

3034
$CsFiles = Get-ChildItem -Path $ModelCsPath -Recurse -Filter *.cs
3135
$Content = ''
@@ -64,10 +68,10 @@ function CreateModelCmdlet {
6468
$ObjectType = $Model
6569
$ObjectTypeWithNamespace = "${Namespace}.${ObjectType}"
6670
# remove duplicated module name
67-
if ($ObjectType.StartsWith($ModuleName)) {
71+
if ($ObjectType.StartsWith('')) {
6872
$ModulePrefix = ''
6973
} else {
70-
$ModulePrefix = $ModuleName
74+
$ModulePrefix = ''
7175
}
7276
$OutputPath = Join-Path -ChildPath "New-Az${ModulePrefix}${ObjectType}Object.ps1" -Path $OutputDir
7377

@@ -158,7 +162,7 @@ Create an in-memory object for ${ObjectType}.
158162
.Outputs
159163
${ObjectTypeWithNamespace}
160164
.Link
161-
https://learn.microsoft.com/powershell/module/az.${ModuleName}/new-Az${ModulePrefix}${ObjectType}Object
165+
https://learn.microsoft.com/powershell/module/${ModuleName}/new-Az${ModulePrefix}${ObjectType}Object
162166
#>
163167
function New-Az${ModulePrefix}${ObjectType}Object {
164168
[OutputType('${ObjectTypeWithNamespace}')]

‎src/App/custom/New-AzContainerAppCustomDomainObject.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Create an in-memory object for CustomDomain.
2222
2323
.Outputs
2424
Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.CustomDomain
25-
.Link
26-
https://learn.microsoft.com/powershell/module/az./new-azcontainerappcustomdomainobject
2725
#>
2826
function New-AzContainerAppCustomDomainObject {
2927
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.CustomDomain')]

‎src/App/custom/New-AzContainerAppDaprMetadataObject.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Create an in-memory object for DaprMetadata.
2222
2323
.Outputs
2424
Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.DaprMetadata
25-
.Link
26-
https://learn.microsoft.com/powershell/module/az./new-azcontainerappdaprmetadataobject
2725
#>
2826
function New-AzContainerAppDaprMetadataObject {
2927
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.DaprMetadata')]

‎src/App/custom/New-AzContainerAppEnvironmentVarObject.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Create an in-memory object for EnvironmentVar.
2222
2323
.Outputs
2424
Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.EnvironmentVar
25-
.Link
26-
https://learn.microsoft.com/powershell/module/az./new-azcontainerappenvironmentvarobject
2725
#>
2826
function New-AzContainerAppEnvironmentVarObject {
2927
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.EnvironmentVar')]

‎src/App/custom/New-AzContainerAppIdentityProviderObject.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Create an in-memory object for IdentityProviders.
2222
2323
.Outputs
2424
Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.IdentityProviders
25-
.Link
26-
https://learn.microsoft.com/powershell/module/az./new-azcontainerappidentityproviderobject
2725
#>
2826
function New-AzContainerAppIdentityProviderObject {
2927
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.IdentityProviders')]

‎src/App/custom/New-AzContainerAppProbeHeaderObject.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Create an in-memory object for ContainerAppProbeHttpGetHttpHeadersItem.
2222
2323
.Outputs
2424
Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.ContainerAppProbeHttpGetHttpHeadersItem
25-
.Link
26-
https://learn.microsoft.com/powershell/module/az./new-azcontainerappprobeheaderobject
2725
#>
2826
function New-AzContainerAppProbeHeaderObject {
2927
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.ContainerAppProbeHttpGetHttpHeadersItem')]

‎src/App/custom/New-AzContainerAppProbeObject.ps1

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ Create an in-memory object for ContainerAppProbe.
2222
2323
.Outputs
2424
Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.ContainerAppProbe
25-
.Link
26-
https://learn.microsoft.com/powershell/module/az./new-azcontainerappprobeobject
2725
#>
2826
function New-AzContainerAppProbeObject {
2927
[OutputType('Microsoft.Azure.PowerShell.Cmdlets.App.Models.Api20220301.ContainerAppProbe')]

0 commit comments

Comments
 (0)