Merge branch 'main' of https://github.com/Azure/azure-functions-core-tools

Author: aishwaryabh

.editorconfig

@@ -8,6 +8,7 @@ root = true
 # All files | Don't use tabs for indentation.
 [*]
 indent_style = space
+charset = utf-8
 
 # Code files
 [*.{cs,csx,vb,vbx}]
@@ -16,7 +17,6 @@ xml_header = false
 indent_size = 4
 insert_final_newline = true
 trim_trailing_whitespace = true
-charset = utf-8-bom
 
 #############################
 # Script Coding Conventions #

.gitattributes

@@ -13,7 +13,7 @@
 *.png 	binary
 *.gif 	binary
 
-*.cs text=auto diff=csharp 
+*.cs text=auto diff=csharp
 *.vb text=auto
 *.c text=auto
 *.cpp text=auto
@@ -48,4 +48,8 @@
 *.vbproj text=auto
 *.fsproj text=auto
 *.dbproj text=auto
-*.sln text=auto eol=crlf
+*.sln text=auto eol=crlf
+
+# Use union on release notes to keep both local and remote changes
+# and avoid merge conflicts.
+release_notes.md merge=union

docs/debug-with-host.md

@@ -38,7 +38,7 @@ This will build the CLI and start the host with the provided command and test ap
 3. Set the `Working directory` to the path of your test app
 4. Press `F5`
 
-![Visual Studio Debug Settings](../images/vs-debug-settings.png)
+![Visual Studio Debug Settings](./images/vs-debug-settings.png)
 
 #### Other
 
@@ -57,4 +57,4 @@ export FUNC_CLI=<path-to-published-cli>
 
 # Start the host inside the test app directory
 $FUNC_CLI start
-```
+```

eng/build/Packages.props

@@ -1,19 +1,16 @@
 <Project>
-
   <!-- common -->
   <ItemGroup>
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageVersion Include="Colors.Net" Version="1.1.0" />
     <PackageVersion Include="WindowsAzure.Storage" Version="9.3.1" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
   </ItemGroup>
-
   <!-- abstractions-->
   <ItemGroup>
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.2" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta5.25306.101" />
   </ItemGroup>
-
   <!-- func -->
   <ItemGroup>
     <PackageVersion Include="Autofac" Version="4.6.2" />
@@ -23,7 +20,7 @@
     <PackageVersion Include="Microsoft.ApplicationInsights" Version="2.22.0" />
     <PackageVersion Include="Microsoft.AspNetCore.DataProtection" Version="2.2.0" />
     <PackageVersion Include="Microsoft.Azure.DurableTask.AzureStorage.Internal" Version="1.4.0" />
-    <PackageVersion Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="4.1040.300" />
+    <PackageVersion Include="Microsoft.Azure.WebJobs.Script.WebHost" Version="4.1041.200" />
     <PackageVersion Include="Microsoft.Build" Version="17.0.0" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.61.3" />
     <PackageVersion Include="NuGet.Packaging" Version="5.11.6" />
@@ -32,22 +29,19 @@
     <!-- Transitive dependency -->
     <PackageVersion Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
-
   <!-- workers -->
   <ItemGroup>
-    <PackageVersion Include="Microsoft.Azure.Functions.JavaWorker" Version="2.19.1" />
+    <PackageVersion Include="Microsoft.Azure.Functions.JavaWorker" Version="2.19.2" />
     <PackageVersion Include="Microsoft.Azure.Functions.NodeJsWorker" Version="3.10.1" />
     <PackageVersion Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.0" Version="4.0.3148" />
     <PackageVersion Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.2" Version="4.0.4025" />
     <PackageVersion Include="Microsoft.Azure.Functions.PowerShellWorker.PS7.4" Version="4.0.4206" />
-    <PackageVersion Include="Microsoft.Azure.Functions.PythonWorker" Version="4.37.0" />
+    <PackageVersion Include="Microsoft.Azure.Functions.PythonWorker" Version="4.38.0" />
   </ItemGroup>
-
   <!-- host -->
   <ItemGroup>
     <PackageVersion Include="Microsoft.NETCore.DotNetAppHost" Version="8.0.8" />
   </ItemGroup>
-
   <!-- test projects -->
   <ItemGroup>
     <PackageVersion Include="Azure.Data.Tables" Version="12.9.0" />
@@ -67,5 +61,4 @@
     <PackageVersion Include="Microsoft.NET.Sdk.Functions" Version="4.5.0" />
     <PackageVersion Include="Microsoft.Azure.WebJobs.Extensions.DurableTask" Version="1.8.2" />
   </ItemGroup>
-
-</Project>
+</Project>

eng/build/Templates.targets

@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <PropertyGroup>
-    <TemplatesVersion>4.0.5086</TemplatesVersion>
+    <TemplatesVersion>4.0.5212</TemplatesVersion>
     <TemplatesJsonVersion>3.1.1648</TemplatesJsonVersion>
   </PropertyGroup>
 

eng/ci/public-build.yml

@@ -6,28 +6,21 @@ schedules:
       - main
   always: true
 
+trigger: none
+
 pr:
   branches:
     include:
     - release_4.0
     - main
     - in-proc
   paths:
-    exclude:
-    - docs/*
-    - '**/*.md'
-
-trigger:
-  batch: true
-  branches:
     include:
-    - release_4.0
-    - main
-    - in-proc
-    - feature/*
-  paths:
+    - eng
+    - src
+    - test
     exclude:
-    - docs/*
+    - docs
     - '**/*.md'
 
 resources:

eng/ci/templates/steps/install-tools.yml

@@ -27,6 +27,13 @@ steps:
     packageType: sdk
     version: 8.x
 
+- task: UseDotNet@2
+  displayName: Install .NET 10
+  inputs:
+    packageType: sdk
+    version: 10.x
+    includePreviewVersions: true
+
 - task: UseDotNet@2 # The pinned SDK we use to build
   displayName: Install .NET SDK from global.json
   inputs:

eng/scripts/download-templates.ps1

@@ -1,5 +1,5 @@
 # Run: ./download-templates.ps1 || From root of the repo: ./eng/scripts/download-templates.ps1
-# Optional parameters: -OutputPath "./desired/output/path" -TemplatesVersion "4.0.5086" -TemplateJsonVersion "3.1.1648"
+# Optional parameters: -OutputPath "./desired/output/path" -TemplatesVersion "4.0.5212" -TemplateJsonVersion "3.1.1648"
 
 # You can check NuGet for the latest template versions:
 # https://www.nuget.org/packages/Microsoft.Azure.Functions.Worker.ItemTemplates/
@@ -12,7 +12,7 @@
 # Parse CLI arguments
 param (
   [string]$OutputPath = "./templates-download",
-  [string]$TemplatesVersion = "4.0.5086",
+  [string]$TemplatesVersion = "4.0.5212",
   [string]$TemplateJsonVersion = "3.1.1648"
 )
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "9.0.303",
+    "version": "9.0.304",
     "allowPrerelease": true,
     "rollForward": "latestFeature"
   },

release_notes.md

@@ -1,18 +1,11 @@
-# Azure Functions CLI 4.1.1
+# Azure Functions CLI 4.2.0
 
 #### Host Version
 
-- Host Version: 4.1040.300
-- In-Proc Host Version: 4.40.100
+- Host Version: 4.1041.200
+- In-Proc Host Version: 4.41.100 (4.841.100,  4.641.100)
 
 #### Changes
 
-- Fix dotnet templates installation (#4538)
-- Disable diagnostic events in local development by replacing the `IDiagnosticEventRepository` with a `DiagnosticEventNullRepository` (#4542)
-- Add `func pack` support for in-proc functions (#4529)
-- Update KEDA templates & `kubernetes create` command to correctly use a provided namespace, or use default namespace (#4558)
-- Update `func init` to default to the .NET 8 template for in-proc apps (#4557)
-- Implement (2 second) graceful timeout period for the CLI shutdown (#4540)
-- Overwrite `AZURE_FUNCTIONS_ENVIRONMENT` to `Development` if it is already set (#4563)
-- Warn if there is a `JsonException` when parsing the `local.settings.json` file (#4571)
-- Enabled verbose logs in MSI by default (#4578)
+- Add support for .NET 10 isolated model (#4589)
+- Update log streaming to support both connection string and instrumentation Key (#4586)