Skip to content

Commit c0c42b6

Browse files
isra-felisra-fel
committed
Revert "Move Functions to release-2023-05-23 (#21868)"
This reverts commit f07f56b.
1 parent de212e4 commit c0c42b6

File tree

4 files changed

+48
-48
lines changed

4 files changed

+48
-48
lines changed

‎src/Functions/Az.Functions.psd1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#
44
# Generated by: Microsoft Corporation
55
#
6-
# Generated on: 5/19/2023
6+
# Generated on: 5/17/2023
77
#
88

99
@{

‎src/Functions/Functions.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", "{A1033146-7A7B-4B81-9609-ED5BCF9CFE5C}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Accounts", "..\Accounts\Accounts\Accounts.csproj", "{A5AA567E-CE21-4758-AF76-D9FA378F8110}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{B144BB2A-3EAE-4E03-8EBA-72105A969FE7}"
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoading", "..\Accounts\AssemblyLoading\AssemblyLoading.csproj", "{FBED43AF-D7CF-4139-9EB6-5C9869DC8B28}"
99
EndProject
10-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{88EC7014-6D76-499B-BB6A-31287FB25B75}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication", "..\Accounts\Authentication\Authentication.csproj", "{0E2DDF3A-97AC-4FC4-B1EC-6E035B7ECE95}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{2A9F78C3-F0DB-4954-9220-C4F9D92DCEBF}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authentication.ResourceManager", "..\Accounts\Authentication.ResourceManager\Authentication.ResourceManager.csproj", "{8277CD9A-16DF-466E-B55A-C1E3C22C5B6D}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{98A80554-67C5-4A54-B18F-67524C712FD1}"
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AuthenticationAssemblyLoadContext", "..\Accounts\AuthenticationAssemblyLoadContext\AuthenticationAssemblyLoadContext.csproj", "{14403EEF-A753-4203-8C57-B704B3FC3029}"
1515
EndProject
16-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{EEA20F1E-055C-40BD-B1A9-1FCDD8C46909}"
16+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Authenticators", "..\Accounts\Authenticators\Authenticators.csproj", "{B85FC5E2-062F-4703-B451-7CB663DA05FB}"
1717
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Functions", "Az.Functions.csproj", "{542854E8-98CB-4321-97F3-8AF243ABE0C2}"
18+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Az.Functions", "Az.Functions.csproj", "{7DC5EC0E-C2F5-4A12-9204-1EC0D6A609DB}"
1919
EndProject
2020
Global
2121
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -26,33 +26,33 @@ Global
2626
HideSolutionNode = FALSE
2727
EndGlobalSection
2828
GlobalSection(ProjectConfigurationPlatforms) = postSolution
29-
{A1033146-7A7B-4B81-9609-ED5BCF9CFE5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{A1033146-7A7B-4B81-9609-ED5BCF9CFE5C}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{A1033146-7A7B-4B81-9609-ED5BCF9CFE5C}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{A1033146-7A7B-4B81-9609-ED5BCF9CFE5C}.Release|Any CPU.Build.0 = Release|Any CPU
33-
{B144BB2A-3EAE-4E03-8EBA-72105A969FE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
34-
{B144BB2A-3EAE-4E03-8EBA-72105A969FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
35-
{B144BB2A-3EAE-4E03-8EBA-72105A969FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
36-
{B144BB2A-3EAE-4E03-8EBA-72105A969FE7}.Release|Any CPU.Build.0 = Release|Any CPU
37-
{88EC7014-6D76-499B-BB6A-31287FB25B75}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
38-
{88EC7014-6D76-499B-BB6A-31287FB25B75}.Debug|Any CPU.Build.0 = Debug|Any CPU
39-
{88EC7014-6D76-499B-BB6A-31287FB25B75}.Release|Any CPU.ActiveCfg = Release|Any CPU
40-
{88EC7014-6D76-499B-BB6A-31287FB25B75}.Release|Any CPU.Build.0 = Release|Any CPU
41-
{2A9F78C3-F0DB-4954-9220-C4F9D92DCEBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
42-
{2A9F78C3-F0DB-4954-9220-C4F9D92DCEBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
43-
{2A9F78C3-F0DB-4954-9220-C4F9D92DCEBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
44-
{2A9F78C3-F0DB-4954-9220-C4F9D92DCEBF}.Release|Any CPU.Build.0 = Release|Any CPU
45-
{98A80554-67C5-4A54-B18F-67524C712FD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
46-
{98A80554-67C5-4A54-B18F-67524C712FD1}.Debug|Any CPU.Build.0 = Debug|Any CPU
47-
{98A80554-67C5-4A54-B18F-67524C712FD1}.Release|Any CPU.ActiveCfg = Release|Any CPU
48-
{98A80554-67C5-4A54-B18F-67524C712FD1}.Release|Any CPU.Build.0 = Release|Any CPU
49-
{EEA20F1E-055C-40BD-B1A9-1FCDD8C46909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
50-
{EEA20F1E-055C-40BD-B1A9-1FCDD8C46909}.Debug|Any CPU.Build.0 = Debug|Any CPU
51-
{EEA20F1E-055C-40BD-B1A9-1FCDD8C46909}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{EEA20F1E-055C-40BD-B1A9-1FCDD8C46909}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{542854E8-98CB-4321-97F3-8AF243ABE0C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
54-
{542854E8-98CB-4321-97F3-8AF243ABE0C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
55-
{542854E8-98CB-4321-97F3-8AF243ABE0C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
56-
{542854E8-98CB-4321-97F3-8AF243ABE0C2}.Release|Any CPU.Build.0 = Release|Any CPU
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
5757
EndGlobalSection
5858
EndGlobal

‎src/Functions/custom/HelperFunctions.ps1

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -958,8 +958,8 @@ function GetStackDefinitionForRuntime
958958
{
959959
# Try to get the default version
960960
$defaultVersionFound = $false
961-
$RuntimeVersion = $supportedRuntimes[$Runtime] |
962-
ForEach-Object { if ($_.IsDefault -and ($_.SupportedFunctionsExtensionVersions -contains $functionsExtensionVersion)) { $_.Version } }
961+
$RuntimeVersion = $supportedRuntimes[$Runtime]
962+
| ForEach-Object { if ($_.IsDefault -and ($_.SupportedFunctionsExtensionVersions -contains $functionsExtensionVersion)) { $_.Version } }
963963

964964
if ($RuntimeVersion)
965965
{
@@ -971,10 +971,10 @@ function GetStackDefinitionForRuntime
971971
Write-Debug "$DEBUG_PREFIX Runtime '$Runtime' does not have a default version. Finding the latest version."
972972

973973
# Iterate through the list to find the latest non preview version
974-
$latestVersion = $supportedRuntimes[$Runtime] |
975-
Sort-Object -Property Version -Descending |
976-
Where-Object { $_.SupportedFunctionsExtensionVersions -contains $functionsExtensionVersion -and (-not $_.IsPreview) } |
977-
Select-Object -First 1 -ExpandProperty Version
974+
$latestVersion = $supportedRuntimes[$Runtime]
975+
| Sort-Object -Property Version -Descending
976+
| Where-Object { $_.SupportedFunctionsExtensionVersions -contains $functionsExtensionVersion -and (-not $_.IsPreview) }
977+
| Select-Object -First 1 -ExpandProperty Version
978978

979979
if ($latestVersion)
980980
{
@@ -1007,10 +1007,10 @@ function GetStackDefinitionForRuntime
10071007
{
10081008
$errorMessage = "Runtime '$Runtime' version '$RuntimeVersion' in Functions version '$FunctionsVersion' on '$OSType' is not supported."
10091009

1010-
$supporedVersions = @($supportedRuntimes[$Runtime] |
1011-
Sort-Object -Property Version -Descending |
1012-
Where-Object { $_.SupportedFunctionsExtensionVersions -contains $functionsExtensionVersion } |
1013-
Select-Object -ExpandProperty Version)
1010+
$supporedVersions = @($supportedRuntimes[$Runtime]
1011+
| Sort-Object -Property Version -Descending
1012+
| Where-Object { $_.SupportedFunctionsExtensionVersions -contains $functionsExtensionVersion }
1013+
| Select-Object -ExpandProperty Version)
10141014

10151015
if ($supporedVersions.Count -gt 0)
10161016
{
@@ -1665,7 +1665,7 @@ function GetFunctionAppStackDefinition
16651665
[Microsoft.Azure.PowerShell.Cmdlets.Functions.DoNotExportAttribute()]
16661666
param ()
16671667

1668-
if ($env:FunctionsTestMode -or ($null -ne $env:SYSTEM_DEFINITIONID -or $null -ne $env:Release_DefinitionId -or $null -ne $env:AZUREPS_HOST_ENVIRONMENT))
1668+
if ($null -ne $env:SYSTEM_DEFINITIONID -or $null -ne $env:Release_DefinitionId -or $null -ne $env:AZUREPS_HOST_ENVIRONMENT)
16691669
{
16701670
Write-Debug "$DEBUG_PREFIX Running on test mode. Using built in json file definition."
16711671
$json = GetBuiltInFunctionAppStacksDefinition -DoNotShowWarning

‎src/Functions/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": "b8f04b910227c73d52c1042552690509f7c820ce",
2+
"swagger_commit": "34f27b39590ba3e41465f82bf7b60a32eb8d89dd",
33
"node": "v14.15.5",
44
"autorest": "`-- (empty)",
55
"autorest_core": "3.9.5",

0 commit comments

Comments
 (0)