Merge branch 'main' into chgagnon/portFix

Charles-Gagnon · Charles-Gagnon · commit 30d361021c67 · 2023-06-02T13:22:59.000-07:00
diff --git a/builds/azure-pipelines/build-pr.yml b/builds/azure-pipelines/build-pr.yml
@@ -44,6 +44,6 @@ stages:
       parameters:
         solution: '$(solution)'
         configuration: '$(configuration)'
-        nugetVersion: '1.0.0-test'
-        binariesVersion: '1.0.0'
-        supportedVersion: '1.*-*'
+        nugetVersion: '99.99.99-test'
+        binariesVersion: '99.99.99'
+        supportedVersion: '99.99.99'
diff --git a/docs/GeneralSetup.md b/docs/GeneralSetup.md
@@ -184,21 +184,21 @@ These steps can be done in the Terminal/CLI or with PowerShell.
     dotnet add package Microsoft.Azure.WebJobs.Extensions.Sql --prerelease
     ```
 
-    **JavaScript, TypeScript, Python, PowerShell:** Update the `host.json` file to the preview extension bundle.
+    **JavaScript, TypeScript, Python, PowerShell:** Update the `host.json` file to the v4 version of the extension bundle.
 
     ```json
     "extensionBundle": {
-        "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+        "id": "Microsoft.Azure.Functions.ExtensionBundle",
         "version": "[4.*, 5.0.0)"
     }
     ```
 
     **Java:**
-    Update the `host.json` file to the preview extension bundle.
+    Update the `host.json` file to the v4 version of the extension bundle.
 
     ```json
     "extensionBundle": {
-        "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+        "id": "Microsoft.Azure.Functions.ExtensionBundle",
         "version": "[4.*, 5.0.0)"
     }
     ```
diff --git a/docs/SetupGuide_DotnetCSharpScript.md b/docs/SetupGuide_DotnetCSharpScript.md
@@ -52,11 +52,11 @@ These instructions will guide you through creating your Function Project and add
 
 4. Enable SQL bindings on the csx function created above. More information can be found in the [Azure SQL bindings for Azure Functions docs](https://aka.ms/sqlbindings).
 
-    Update the `host.json` file inside **MyApp/MyCSXFunction/** to the preview extension bundle.
+    Update the `host.json` file inside **MyApp/MyCSXFunction/** to the v4 version of the extension bundle.
 
     ```json
     "extensionBundle": {
-        "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+        "id": "Microsoft.Azure.Functions.ExtensionBundle",
         "version": "[4.*, 5.0.0)"
     }
     ```
diff --git a/docs/SetupGuide_Java.md b/docs/SetupGuide_Java.md
@@ -39,11 +39,11 @@ These instructions will guide you through creating your Function Project and add
 
 3. Enable SQL bindings on the function project. More information can be found in the [Azure SQL bindings for Azure Functions docs](https://aka.ms/sqlbindings).
 
-    Update the `host.json` file to the preview extension bundle.
+    Update the `host.json` file to the v4 version of the extension bundle.
 
     ```json
     "extensionBundle": {
-        "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+        "id": "Microsoft.Azure.Functions.ExtensionBundle",
         "version": "[4.*, 5.0.0)"
     }
     ```
diff --git a/docs/SetupGuide_Javascript.md b/docs/SetupGuide_Javascript.md
@@ -40,11 +40,11 @@ These instructions will guide you through creating your Function Project and add
 
 3. Enable SQL bindings on the function project. More information can be found in the [Azure SQL bindings for Azure Functions docs](https://aka.ms/sqlbindings).
 
-    Update the `host.json` file to the preview extension bundle.
+    Update the `host.json` file to the v4 version of the extension bundle.
 
     ```json
     "extensionBundle": {
-        "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+        "id": "Microsoft.Azure.Functions.ExtensionBundle",
         "version": "[4.*, 5.0.0)"
     }
     ```
diff --git a/docs/SetupGuide_PowerShell.md b/docs/SetupGuide_PowerShell.md
@@ -39,11 +39,11 @@ These instructions will guide you through creating your Function Project and add
 
 3. Enable SQL bindings on the function project. More information can be found in the [Azure SQL bindings for Azure Functions docs](https://aka.ms/sqlbindings).
 
-    Update the `host.json` file to the preview extension bundle.
+    Update the `host.json` file to the v4 version of the extension bundle.
 
     ```json
     "extensionBundle": {
-        "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+        "id": "Microsoft.Azure.Functions.ExtensionBundle",
         "version": "[4.*, 5.0.0)"
     }
     ```
diff --git a/docs/SetupGuide_Python.md b/docs/SetupGuide_Python.md
@@ -40,11 +40,11 @@ These instructions will guide you through creating your Function Project and add
 
 3. Enable SQL bindings on the function project. More information can be found in the [Azure SQL bindings for Azure Functions docs](https://aka.ms/sqlbindings).
 
-    Update the `host.json` file to the preview extension bundle.
+    Update the `host.json` file to the v4 version of the extension bundle.
 
     ```json
     "extensionBundle": {
-        "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+        "id": "Microsoft.Azure.Functions.ExtensionBundle",
         "version": "[4.*, 5.0.0)"
     }
     ```
diff --git a/docs/SqlBindingRelatedRepos.md b/docs/SqlBindingRelatedRepos.md
@@ -28,9 +28,9 @@ Contains templates for the various types of bindings and supported languages, ea
 
 ## Extension Bundle
 
-Currently SQL Bindings is part of the 3.x and 4.x Preview bundles.
+Currently SQL Bindings is part of the 4.x bundles.
 
-[Azure/azure-functions-extension-bundles at v3.x-preview (github.com)](https://github.com/Azure/azure-functions-extension-bundles/tree/v3.x-preview)
+[Azure/azure-functions-extension-bundles at v4.x (github.com)](https://github.com/Azure/azure-functions-extension-bundles/tree/v4.x)
 
 [Azure/azure-functions-extension-bundles at v4.x-preview (github.com)](https://github.com/Azure/azure-functions-extension-bundles/tree/v4.x-preview)
 
diff --git a/samples/samples-csx/host.json b/samples/samples-csx/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-   "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+   "id": "Microsoft.Azure.Functions.ExtensionBundle",
       "version": "[4.*, 5.0.0)"
   }
 }
diff --git a/samples/samples-java/host.json b/samples/samples-java/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[4.*, 5.0.0)"
   }
 }
diff --git a/samples/samples-js-v4/host.json b/samples/samples-js-v4/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[4.*, 5.0.0)"
   }
 }
diff --git a/samples/samples-js/host.json b/samples/samples-js/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[4.*, 5.0.0)"
   }
 }
diff --git a/samples/samples-powershell/host.json b/samples/samples-powershell/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[4.*, 5.0.0)"
   }
 }
diff --git a/samples/samples-python-v2/host.json b/samples/samples-python-v2/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[4.*, 5.0.0)"
   }
 }
diff --git a/samples/samples-python/.devcontainer/README.md b/samples/samples-python/.devcontainer/README.md
@@ -1,10 +1,9 @@
-# Python devcontainer for SQL bindings public preview
+# Python devcontainer for SQL bindings
 
-The use of SQL bindings during the early public preview phase requires additional setup for local development due to the requirement of the Azure Functions host 4.5.0 or greater.  With the included files (`devcontainer.json`, `Dockerfile`, and `patch-core-tools.sh`), your environment can be automatically setup to support development for SQL bindings in VS Code remote containers or Codespaces.  Once inside this environment, your VS Code tasks (F5 to run) will perform as expected.
+The use of SQL bindings requires additional setup for local development due to the requirement of the Azure Functions host 4.5.0 or greater.  With the included files (`devcontainer.json`, `Dockerfile`, and `patch-core-tools.sh`), your environment can be automatically setup to support development for SQL bindings in VS Code remote containers or Codespaces.  Once inside this environment, your VS Code tasks (F5 to run) will perform as expected.
 
 For more on remote development in VS Code, please check out their [documentation](https://code.visualstudio.com/docs/remote/containers).
 
-
 ## What does this environment include?
 
 This environment definition takes the standard Python 3.9 and Azure Functions development environment image as its base image, then applies an update to a pre-release version of the [Azure Functions Core Tools](https://github.com/azure/azure-functions-core-tools).
diff --git a/samples/samples-python/host.json b/samples/samples-python/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[4.*, 5.0.0)"
   }
 }
diff --git a/test/Integration/test-csx/host.json b/test/Integration/test-csx/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[4.*, 5.0.0)"
   }
 }
diff --git a/test/Integration/test-java/host.json b/test/Integration/test-java/host.json
@@ -12,7 +12,7 @@
     }
   },
   "extensionBundle": {
-    "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",
+    "id": "Microsoft.Azure.Functions.ExtensionBundle",
     "version": "[4.*, 5.0.0)"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`}`
`13`	`13`	`},`
`14`	`14`	`"extensionBundle": {`
`15`		`- "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview",`
	`15`	`+ "id": "Microsoft.Azure.Functions.ExtensionBundle",`
`16`	`16`	`"version": "[4.*, 5.0.0)"`
`17`	`17`	`}`
`18`	`18`	`}`