From 096ba8a5d2790eaf807d903395bd225105248154 Mon Sep 17 00:00:00 2001
From: pdthummar <101662222+pdthummar@users.noreply.github.com>
Date: Wed, 28 Sep 2022 14:40:02 -0500
Subject: [PATCH 1/7] add support for py 3.11

---
 azure-pipelines.yml                                | 14 +++++++++++++-
 ...icrosoft.Azure.Functions.V4.PythonWorker.nuspec |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index e8653936..a1a68f59 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -29,6 +29,9 @@ jobs:
       Python310V4:
         pythonVersion: '3.10'
         workerPath: $(PROD_V4_WORKER_PY)
+      Python311V4:
+        pythonVersion: '3.11'
+        workerPath: $(PROD_V4_WORKER_PY)
   steps:
   - template: pack/templates/win_env_gen.yml
     parameters:
@@ -55,6 +58,9 @@ jobs:
       Python310V4:
         pythonVersion: '3.10'
         workerPath: $(PROD_V4_WORKER_PY)
+      Python311V4:
+        pythonVersion: '3.11'
+        workerPath: $(PROD_V4_WORKER_PY)
   steps:
   - template: pack/templates/win_env_gen.yml
     parameters:
@@ -81,6 +87,9 @@ jobs:
       Python310V4:
         pythonVersion: '3.10'
         workerPath: $(PROD_V4_WORKER_PY)
+      Python311V4:
+        pythonVersion: '3.11'
+        workerPath: $(PROD_V4_WORKER_PY)
   steps:
   - template: pack/templates/nix_env_gen.yml
     parameters:
@@ -104,6 +113,9 @@ jobs:
       Python310V4:
         pythonVersion: '3.10'
         workerPath: $(PROD_V4_WORKER_PY)
+      Python311V4:
+        pythonVersion: '3.11'
+        workerPath: $(PROD_V4_WORKER_PY)
   steps:
   - template: pack/templates/nix_env_gen.yml
     parameters:
@@ -140,7 +152,7 @@ jobs:
         LATEST_TAG=$(curl https://api.github.com/repos/Azure/azure-functions-python-worker/tags -s | jq '.[0].name' | sed 's/\"//g' |  cut -d'.' -f-2)
         NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
         # Only required for Integration Test. Version number contains date (e.g. 3.1.2.20211028-dev)
-        WKVERSION="3.$LATEST_TAG-$(BUILD_BUILDID)-TEST"
+        WKVERSION="4.$LATEST_TAG-$(BUILD_BUILDID)-TEST"
         echo "No Matching Release Tag For $BUILD_SOURCEBRANCH"
       fi
 
diff --git a/pack/Microsoft.Azure.Functions.V4.PythonWorker.nuspec b/pack/Microsoft.Azure.Functions.V4.PythonWorker.nuspec
index cd88a3e9..4ffc38b5 100644
--- a/pack/Microsoft.Azure.Functions.V4.PythonWorker.nuspec
+++ b/pack/Microsoft.Azure.Functions.V4.PythonWorker.nuspec
@@ -26,6 +26,10 @@
     <file src="..\3.10_WINDOWS_X86\**" target="tools\3.10\WINDOWS\X86" />
     <file src="..\3.10_LINUX_X64\**" target="tools\3.10\LINUX\X64" />
     <file src="..\3.10_OSX_X64\**" target="tools\3.10\OSX\X64" />
+    <file src="..\3.11_WINDOWS_X64\**" target="tools\3.11\WINDOWS\X64" />
+    <file src="..\3.11_WINDOWS_X86\**" target="tools\3.11\WINDOWS\X86" />
+    <file src="..\3.11_LINUX_X64\**" target="tools\3.11\LINUX\X64" />
+    <file src="..\3.11_OSX_X64\**" target="tools\3.11\OSX\X64" />
     <file src="..\python\prodV4\worker.config.json" target="tools" />
     <file src="Microsoft.Azure.Functions.PythonWorker.targets" target="build" />
     <file src="..\_manifest\manifest.json" target="SBOM\manifest.json" />

From 9dbbb5fc80521e8b17caa7c3528d65d5e38332ed Mon Sep 17 00:00:00 2001
From: pdthummar <101662222+pdthummar@users.noreply.github.com>
Date: Fri, 13 Jan 2023 09:32:13 -0600
Subject: [PATCH 2/7] Adding Runtime version py3.11 in worker.config.json.

---
 python/prodV4/worker.config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/prodV4/worker.config.json b/python/prodV4/worker.config.json
index 10c01b56..552cecc2 100644
--- a/python/prodV4/worker.config.json
+++ b/python/prodV4/worker.config.json
@@ -3,7 +3,7 @@
         "language":"python",
         "defaultRuntimeVersion":"3.9",
         "supportedOperatingSystems":["LINUX", "OSX", "WINDOWS"],
-        "supportedRuntimeVersions":["3.7", "3.8", "3.9", "3.10"],
+        "supportedRuntimeVersions":["3.7", "3.8", "3.9", "3.10", "3.11"],
         "supportedArchitectures":["X64", "X86"],
         "extensions":[".py"],
         "defaultExecutablePath":"python",

From 275c290d8ef6cdb05229d0015aa79caf45c9abfb Mon Sep 17 00:00:00 2001
From: pdthummar <101662222+pdthummar@users.noreply.github.com>
Date: Fri, 13 Jan 2023 09:42:53 -0600
Subject: [PATCH 3/7] updating file to support py3.11

---
 python/prodV4/worker.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/prodV4/worker.py b/python/prodV4/worker.py
index 0aef4729..4fe1436e 100644
--- a/python/prodV4/worker.py
+++ b/python/prodV4/worker.py
@@ -40,7 +40,7 @@ def determine_user_pkg_paths():
     pkgs_path = os.path.join(home, PKGS_PATH)
     usr_packages_path = []
 
-    if minor_version in (7, 8, 9, 10):
+    if minor_version in (7, 8, 9, 10, 11):
         usr_packages_path.append(os.path.join(pkgs_path, PKGS))
     else:
         raise RuntimeError(f'Unsupported Python version: 3.{minor_version}')

From 39ab900149d69948b33b89e7c341dbca504347f2 Mon Sep 17 00:00:00 2001
From: pdthummar <101662222+pdthummar@users.noreply.github.com>
Date: Fri, 20 Jan 2023 11:19:46 -0600
Subject: [PATCH 4/7] Removed condition for generating nuget package file

---
 azure-pipelines.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a1a68f59..c9a22955 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -125,7 +125,7 @@ jobs:
 
 - job: PackageWorkers
   dependsOn: ['Build_WINDOWS_X64', 'Build_WINDOWS_X86', 'Build_LINUX_X64', 'Build_OSX_X64']
-  condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
+#  condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
   pool:
       name: '1ES-Hosted-AzFunc'
       demands:
@@ -146,15 +146,6 @@ jobs:
         VERSION=$(cat azure_functions_worker/version.py | tail -1 | cut -d' ' -f3 | sed  "s/'//g")
         NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
         WKVERSION="$VERSION-$(patchBuildNumberForDev)"
-      else
-        # this is only to test nuget related workflow because we are setting nuspec here
-        echo "Generating Integration Test Package for $BUILD_SOURCEBRANCHNAME for testing purpose"
-        LATEST_TAG=$(curl https://api.github.com/repos/Azure/azure-functions-python-worker/tags -s | jq '.[0].name' | sed 's/\"//g' |  cut -d'.' -f-2)
-        NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
-        # Only required for Integration Test. Version number contains date (e.g. 3.1.2.20211028-dev)
-        WKVERSION="4.$LATEST_TAG-$(BUILD_BUILDID)-TEST"
-        echo "No Matching Release Tag For $BUILD_SOURCEBRANCH"
-      fi
 
       echo "##vso[task.setvariable variable=nuspec_path]$NUSPEC"
       echo "##vso[task.setvariable variable=worker_version]$WKVERSION"

From e36c9b037c46bd0522c8b469c7abcf2cb0c079ac Mon Sep 17 00:00:00 2001
From: pdthummar <101662222+pdthummar@users.noreply.github.com>
Date: Fri, 20 Jan 2023 11:35:24 -0600
Subject: [PATCH 5/7] Update

---
 azure-pipelines.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index c9a22955..71f008c7 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -146,6 +146,15 @@ jobs:
         VERSION=$(cat azure_functions_worker/version.py | tail -1 | cut -d' ' -f3 | sed  "s/'//g")
         NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
         WKVERSION="$VERSION-$(patchBuildNumberForDev)"
+      else
+        # this is only to test nuget related workflow because we are setting nuspec here
+        echo "Generating Integration Test Package for $BUILD_SOURCEBRANCHNAME for testing purpose"
+        LATEST_TAG=$(curl https://api.github.com/repos/Azure/azure-functions-python-worker/tags -s | jq '.[0].name' | sed 's/\"//g' |  cut -d'.' -f-2)
+        NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
+        # Only required for Integration Test. Version number contains date (e.g. 3.1.2.20211028-dev)
+        WKVERSION="4.$LATEST_TAG-$(BUILD_BUILDID)-TEST"
+        echo "No Matching Release Tag For $BUILD_SOURCEBRANCH"
+      fi
 
       echo "##vso[task.setvariable variable=nuspec_path]$NUSPEC"
       echo "##vso[task.setvariable variable=worker_version]$WKVERSION"

From 01c340b6269cff904cbf18ba16b919e1dc72525a Mon Sep 17 00:00:00 2001
From: pdthummar <101662222+pdthummar@users.noreply.github.com>
Date: Fri, 20 Jan 2023 12:04:16 -0600
Subject: [PATCH 6/7] reverting the changes.

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 71f008c7..a1a68f59 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -125,7 +125,7 @@ jobs:
 
 - job: PackageWorkers
   dependsOn: ['Build_WINDOWS_X64', 'Build_WINDOWS_X86', 'Build_LINUX_X64', 'Build_OSX_X64']
-#  condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
+  condition: or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/dev'))
   pool:
       name: '1ES-Hosted-AzFunc'
       demands:

From 5efdf0102e3517c3d0a266b4122c93947e7a16e3 Mon Sep 17 00:00:00 2001
From: pdthummar <101662222+pdthummar@users.noreply.github.com>
Date: Fri, 20 Jan 2023 17:10:18 -0600
Subject: [PATCH 7/7] reverting the changes.

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index a1a68f59..a56edcbd 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -152,7 +152,7 @@ jobs:
         LATEST_TAG=$(curl https://api.github.com/repos/Azure/azure-functions-python-worker/tags -s | jq '.[0].name' | sed 's/\"//g' |  cut -d'.' -f-2)
         NUSPEC="pack\Microsoft.Azure.Functions.V4.PythonWorker.nuspec"
         # Only required for Integration Test. Version number contains date (e.g. 3.1.2.20211028-dev)
-        WKVERSION="4.$LATEST_TAG-$(BUILD_BUILDID)-TEST"
+        WKVERSION="3.$LATEST_TAG-$(BUILD_BUILDID)-TEST"
         echo "No Matching Release Tag For $BUILD_SOURCEBRANCH"
       fi