Skip to content

Commit bcd7885

Browse files
isra-felisra-fel
committed
Revert "Migrate Functions from generation to main (#21844)"
This reverts commit d3d16de.
1 parent c0c42b6 commit bcd7885

File tree

283 files changed

+22187
-10898
lines changed

Some content is hidden

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

283 files changed

+22187
-10898
lines changed

‎src/Functions/Az.Functions.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: 5/17/2023
6+
# Generated on: 10/28/2022
77
#
88

99
@{
@@ -115,7 +115,7 @@ PrivateData = @{
115115
# IconUri = ''
116116

117117
# ReleaseNotes of this module
118-
# ReleaseNotes = ''
118+
ReleaseNotes = '* Added warning logs to detect Az context switching in Get-AzFunctionApp'
119119

120120
# Prerelease string of this module
121121
# Prerelease = ''

‎src/Functions/ChangeLog.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,6 @@
1818
- Additional information about change #1
1919
-->
2020
## Upcoming Release
21-
* Removed support to create v3 function apps (Functions v3 reached EOL on December, 2022) [#20838]
22-
* Enabled using ARM API to get stacks information for function app creation [#14682][#20009]
23-
* Added support to create dotnet-isolated function apps [#16349]
24-
* Added support for custom handler function apps [#12542]
2521

2622
## Version 4.0.6
2723
* Added warning logs to detect Az context switching in Get-AzFunctionApp

‎src/Functions/Functions.sln

Lines changed: 84 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,104 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 17
4-
VisualStudioVersion = 17.0.31903.59
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.6.30114.105
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{A5AA567E-CE21-4758-AF76-D9FA378F8110}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{FBED43AF-D7CF-4139-9EB6-5C9869DC8B28}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{2B2E6519-5A82-4058-A891-2C567697C083}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{0E2DDF3A-97AC-4FC4-B1EC-6E035B7ECE95}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{C7859E3B-6479-4E0A-A588-1194A24335B5}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{8277CD9A-16DF-466E-B55A-C1E3C22C5B6D}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{37483603-B5DD-4D40-A406-5CC85C7F0812}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{14403EEF-A753-4203-8C57-B704B3FC3029}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{B85FC5E2-062F-4703-B451-7CB663DA05FB}"
17-
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Functions", "Az.Functions.csproj", "{7DC5EC0E-C2F5-4A12-9204-1EC0D6A609DB}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Functions", "Az.Functions.csproj", "{A34F7CD2-9D9D-440E-B307-363F329DD2AD}"
1917
EndProject
2018
Global
2119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2220
Debug|Any CPU = Debug|Any CPU
21+
Debug|x64 = Debug|x64
22+
Debug|x86 = Debug|x86
2323
Release|Any CPU = Release|Any CPU
24+
Release|x64 = Release|x64
25+
Release|x86 = Release|x86
2426
EndGlobalSection
2527
GlobalSection(SolutionProperties) = preSolution
2628
HideSolutionNode = FALSE
2729
EndGlobalSection
2830
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{A5AA567E-CE21-4758-AF76-D9FA378F8110}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{A5AA567E-CE21-4758-AF76-D9FA378F8110}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{A5AA567E-CE21-4758-AF76-D9FA378F8110}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{A5AA567E-CE21-4758-AF76-D9FA378F8110}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{FBED43AF-D7CF-4139-9EB6-5C9869DC8B28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{FBED43AF-D7CF-4139-9EB6-5C9869DC8B28}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{FBED43AF-D7CF-4139-9EB6-5C9869DC8B28}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{FBED43AF-D7CF-4139-9EB6-5C9869DC8B28}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{0E2DDF3A-97AC-4FC4-B1EC-6E035B7ECE95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{0E2DDF3A-97AC-4FC4-B1EC-6E035B7ECE95}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{0E2DDF3A-97AC-4FC4-B1EC-6E035B7ECE95}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{0E2DDF3A-97AC-4FC4-B1EC-6E035B7ECE95}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{8277CD9A-16DF-466E-B55A-C1E3C22C5B6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{8277CD9A-16DF-466E-B55A-C1E3C22C5B6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{8277CD9A-16DF-466E-B55A-C1E3C22C5B6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{8277CD9A-16DF-466E-B55A-C1E3C22C5B6D}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{14403EEF-A753-4203-8C57-B704B3FC3029}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{14403EEF-A753-4203-8C57-B704B3FC3029}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{14403EEF-A753-4203-8C57-B704B3FC3029}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{14403EEF-A753-4203-8C57-B704B3FC3029}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{B85FC5E2-062F-4703-B451-7CB663DA05FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{B85FC5E2-062F-4703-B451-7CB663DA05FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{B85FC5E2-062F-4703-B451-7CB663DA05FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{B85FC5E2-062F-4703-B451-7CB663DA05FB}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{7DC5EC0E-C2F5-4A12-9204-1EC0D6A609DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{7DC5EC0E-C2F5-4A12-9204-1EC0D6A609DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{7DC5EC0E-C2F5-4A12-9204-1EC0D6A609DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{7DC5EC0E-C2F5-4A12-9204-1EC0D6A609DB}.Release|Any CPU.Build.0 = Release|Any CPU
31+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
32+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Debug|Any CPU.Build.0 = Debug|Any CPU
33+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Debug|x64.ActiveCfg = Debug|Any CPU
34+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Debug|x64.Build.0 = Debug|Any CPU
35+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Debug|x86.ActiveCfg = Debug|Any CPU
36+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Debug|x86.Build.0 = Debug|Any CPU
37+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Release|Any CPU.ActiveCfg = Release|Any CPU
38+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Release|Any CPU.Build.0 = Release|Any CPU
39+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Release|x64.ActiveCfg = Release|Any CPU
40+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Release|x64.Build.0 = Release|Any CPU
41+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Release|x86.ActiveCfg = Release|Any CPU
42+
{3EEC7E1C-1F17-4F22-B5DA-E2071E569D34}.Release|x86.Build.0 = Release|Any CPU
43+
{2B2E6519-5A82-4058-A891-2C567697C083}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
44+
{2B2E6519-5A82-4058-A891-2C567697C083}.Debug|Any CPU.Build.0 = Debug|Any CPU
45+
{2B2E6519-5A82-4058-A891-2C567697C083}.Debug|x64.ActiveCfg = Debug|Any CPU
46+
{2B2E6519-5A82-4058-A891-2C567697C083}.Debug|x64.Build.0 = Debug|Any CPU
47+
{2B2E6519-5A82-4058-A891-2C567697C083}.Debug|x86.ActiveCfg = Debug|Any CPU
48+
{2B2E6519-5A82-4058-A891-2C567697C083}.Debug|x86.Build.0 = Debug|Any CPU
49+
{2B2E6519-5A82-4058-A891-2C567697C083}.Release|Any CPU.ActiveCfg = Release|Any CPU
50+
{2B2E6519-5A82-4058-A891-2C567697C083}.Release|Any CPU.Build.0 = Release|Any CPU
51+
{2B2E6519-5A82-4058-A891-2C567697C083}.Release|x64.ActiveCfg = Release|Any CPU
52+
{2B2E6519-5A82-4058-A891-2C567697C083}.Release|x64.Build.0 = Release|Any CPU
53+
{2B2E6519-5A82-4058-A891-2C567697C083}.Release|x86.ActiveCfg = Release|Any CPU
54+
{2B2E6519-5A82-4058-A891-2C567697C083}.Release|x86.Build.0 = Release|Any CPU
55+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
56+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
57+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Debug|x64.ActiveCfg = Debug|Any CPU
58+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Debug|x64.Build.0 = Debug|Any CPU
59+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Debug|x86.ActiveCfg = Debug|Any CPU
60+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Debug|x86.Build.0 = Debug|Any CPU
61+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
62+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Release|Any CPU.Build.0 = Release|Any CPU
63+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Release|x64.ActiveCfg = Release|Any CPU
64+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Release|x64.Build.0 = Release|Any CPU
65+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Release|x86.ActiveCfg = Release|Any CPU
66+
{C7859E3B-6479-4E0A-A588-1194A24335B5}.Release|x86.Build.0 = Release|Any CPU
67+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
68+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Debug|Any CPU.Build.0 = Debug|Any CPU
69+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Debug|x64.ActiveCfg = Debug|Any CPU
70+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Debug|x64.Build.0 = Debug|Any CPU
71+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Debug|x86.ActiveCfg = Debug|Any CPU
72+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Debug|x86.Build.0 = Debug|Any CPU
73+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Release|Any CPU.ActiveCfg = Release|Any CPU
74+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Release|Any CPU.Build.0 = Release|Any CPU
75+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Release|x64.ActiveCfg = Release|Any CPU
76+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Release|x64.Build.0 = Release|Any CPU
77+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Release|x86.ActiveCfg = Release|Any CPU
78+
{37483603-B5DD-4D40-A406-5CC85C7F0812}.Release|x86.Build.0 = Release|Any CPU
79+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Debug|Any CPU.Build.0 = Debug|Any CPU
81+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Debug|x64.ActiveCfg = Debug|Any CPU
82+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Debug|x64.Build.0 = Debug|Any CPU
83+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Debug|x86.ActiveCfg = Debug|Any CPU
84+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Debug|x86.Build.0 = Debug|Any CPU
85+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Release|Any CPU.ActiveCfg = Release|Any CPU
86+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Release|Any CPU.Build.0 = Release|Any CPU
87+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Release|x64.ActiveCfg = Release|Any CPU
88+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Release|x64.Build.0 = Release|Any CPU
89+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Release|x86.ActiveCfg = Release|Any CPU
90+
{71D5F13A-E6FF-4B1B-8EEF-385123552FC9}.Release|x86.Build.0 = Release|Any CPU
91+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
93+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Debug|x64.ActiveCfg = Debug|Any CPU
94+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Debug|x64.Build.0 = Debug|Any CPU
95+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Debug|x86.ActiveCfg = Debug|Any CPU
96+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Debug|x86.Build.0 = Debug|Any CPU
97+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
98+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Release|Any CPU.Build.0 = Release|Any CPU
99+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Release|x64.ActiveCfg = Release|Any CPU
100+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Release|x64.Build.0 = Release|Any CPU
101+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Release|x86.ActiveCfg = Release|Any CPU
102+
{A34F7CD2-9D9D-440E-B307-363F329DD2AD}.Release|x86.Build.0 = Release|Any CPU
57103
EndGlobalSection
58104
EndGlobal

‎src/Functions/build-module.ps1

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@ $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-
}
130126
if ($modelCmdlets.Count -gt 0) {
131127
. (Join-Path $PSScriptRoot 'create-model-cmdlets.ps1')
132128
CreateModelCmdlet($modelCmdlets)

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

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

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

3430
$CsFiles = Get-ChildItem -Path $ModelCsPath -Recurse -Filter *.cs
3531
$Content = ''
@@ -68,10 +64,10 @@ function CreateModelCmdlet {
6864
$ObjectType = $Model
6965
$ObjectTypeWithNamespace = "${Namespace}.${ObjectType}"
7066
# remove duplicated module name
71-
if ($ObjectType.StartsWith('')) {
67+
if ($ObjectType.StartsWith($ModuleName)) {
7268
$ModulePrefix = ''
7369
} else {
74-
$ModulePrefix = ''
70+
$ModulePrefix = $ModuleName
7571
}
7672
$OutputPath = Join-Path -ChildPath "New-Az${ModulePrefix}${ObjectType}Object.ps1" -Path $OutputDir
7773

@@ -162,7 +158,7 @@ Create an in-memory object for ${ObjectType}.
162158
.Outputs
163159
${ObjectTypeWithNamespace}
164160
.Link
165-
https://learn.microsoft.com/powershell/module/${ModuleName}/new-Az${ModulePrefix}${ObjectType}Object
161+
https://learn.microsoft.com/powershell/module/az.${ModuleName}/new-Az${ModulePrefix}${ObjectType}Object
166162
#>
167163
function New-Az${ModulePrefix}${ObjectType}Object {
168164
[OutputType('${ObjectTypeWithNamespace}')]

0 commit comments

Comments
 (0)