diff --git a/.github/workflows/run-e2e-tests-dotnet3-lcon.yaml b/.github/workflows/run-e2e-tests-dotnet8-lcon.yaml similarity index 83% rename from .github/workflows/run-e2e-tests-dotnet3-lcon.yaml rename to .github/workflows/run-e2e-tests-dotnet8-lcon.yaml index dce0d0fab..1e39b7693 100644 --- a/.github/workflows/run-e2e-tests-dotnet3-lcon.yaml +++ b/.github/workflows/run-e2e-tests-dotnet8-lcon.yaml @@ -1,4 +1,4 @@ -name: RUN_E2E_TESTS_DOTNET3_LCON +name: RUN_E2E_TESTS_DOTNET8_LCON on: push: branches: @@ -15,9 +15,9 @@ permissions: id-token: write env: - AZURE_FUNCTIONAPP_NAME: gae-fa-dotnet3-lcon - AZURE_FUNCTIONAPP_PACKAGE_PATH: './tests/e2e/dotnet3' - DOTNET_VERSION: '3.1.403' + AZURE_FUNCTIONAPP_NAME: gae-fa-dotnet8-lcon + AZURE_FUNCTIONAPP_PACKAGE_PATH: './tests/e2e/dotnet8' + DOTNET_VERSION: '8.0.405' jobs: run: @@ -48,13 +48,12 @@ jobs: run: | pushd '${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}' dotnet build --configuration Release --output ./output - echo "$env:GITHUB_SHA" > ./output/sha.txt popd - name: 'Login via Azure CLI' uses: azure/login@v1 with: - client-id: ${{ secrets.AZURE_CLIENT_ID_FA_DOTNET3_LCON }} + client-id: ${{ secrets.AZURE_CLIENT_ID_FA_DOTNET8_LCON }} tenant-id: ${{ secrets.AZURE_TENANT_ID_FA_E2E_TESTS }} subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID_FA_E2E_TESTS }} @@ -72,7 +71,7 @@ jobs: while ($i -lt 10) { sleep 10 $RESPONSE = $(curl "${{ steps.fa.outputs.app-url }}/api/HttpTrigger") - $RESULT = ($RESPONSE -eq "$env:GITHUB_SHA") + $RESULT = ($RESPONSE -eq "Hello world") if ($RESULT) { exit 0 } diff --git a/.github/workflows/run-e2e-tests-dotnet3-wcon.yaml b/.github/workflows/run-e2e-tests-dotnet8-wcon.yaml similarity index 83% rename from .github/workflows/run-e2e-tests-dotnet3-wcon.yaml rename to .github/workflows/run-e2e-tests-dotnet8-wcon.yaml index 3ce070de8..21f77f729 100644 --- a/.github/workflows/run-e2e-tests-dotnet3-wcon.yaml +++ b/.github/workflows/run-e2e-tests-dotnet8-wcon.yaml @@ -1,4 +1,4 @@ -name: RUN_E2E_TESTS_DOTNET3_WCON +name: RUN_E2E_TESTS_DOTNET8_WCON on: push: branches: @@ -15,9 +15,9 @@ permissions: id-token: write env: - AZURE_FUNCTIONAPP_NAME: gae-fa-dotnet3-wcon - AZURE_FUNCTIONAPP_PACKAGE_PATH: './tests/e2e/dotnet3' - DOTNET_VERSION: '3.1.403' + AZURE_FUNCTIONAPP_NAME: gae-fa-dotnet8-wcon + AZURE_FUNCTIONAPP_PACKAGE_PATH: './tests/e2e/dotnet8' + DOTNET_VERSION: '8.0.405' jobs: run: @@ -48,13 +48,12 @@ jobs: run: | pushd '${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}' dotnet build --configuration Release --output ./output - echo "$env:GITHUB_SHA" > ./output/sha.txt popd - name: 'Login via Azure CLI' uses: azure/login@v1 with: - client-id: ${{ secrets.AZURE_CLIENT_ID_FA_DOTNET3_WCON }} + client-id: ${{ secrets.AZURE_CLIENT_ID_FA_DOTNET8_WCON }} tenant-id: ${{ secrets.AZURE_TENANT_ID_FA_E2E_TESTS }} subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID_FA_E2E_TESTS }} @@ -72,7 +71,7 @@ jobs: while ($i -lt 10) { sleep 10 $RESPONSE = $(curl "${{ steps.fa.outputs.app-url }}/api/HttpTrigger") - $RESULT = ($RESPONSE -eq "$env:GITHUB_SHA") + $RESULT = ($RESPONSE -eq "Hello world") if ($RESULT) { exit 0 } diff --git a/.github/workflows/run-e2e-tests-python37-lcon.yaml b/.github/workflows/run-e2e-tests-python37-lcon.yaml deleted file mode 100644 index 6a73e87d6..000000000 --- a/.github/workflows/run-e2e-tests-python37-lcon.yaml +++ /dev/null @@ -1,82 +0,0 @@ -name: RUN_E2E_TESTS_PYTHON37_LCON -on: - push: - branches: - - master - - dev - - releases/* - paths-ignore: - - '**.md' - pull_request: - paths-ignore: - - '**.md' - -permissions: - id-token: write - -env: - AZURE_FUNCTIONAPP_NAME: gae-fa-python37-lcon - AZURE_FUNCTIONAPP_PACKAGE_PATH: './tests/e2e/python37' - PYTHON_VERSION: '3.7' - -jobs: - run: - name: Run E2E Tests - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v2 - - - name: Set Node.js 20.x for GitHub Action - uses: actions/setup-node@v1 - with: - node-version: 20.x - - - name: Setup Python ${{ env.PYTHON_VERSION }} Environment - uses: actions/setup-python@v1 - with: - python-version: ${{ env.PYTHON_VERSION }} - - - name: Run Npm Install for GitHub Action - run: npm install - - - name: Build GitHub Action - run: npm run build - - - name: E2E Resolve Project Dependencies Using Pip - shell: bash - run: | - pushd '${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }}' - python -m pip install --upgrade pip - pip install -r requirements.txt --target=".python_packages/lib/site-packages" - echo "$GITHUB_SHA" > sha.txt - popd - - - name: 'Login via Azure CLI' - uses: azure/login@v1 - with: - client-id: ${{ secrets.AZURE_CLIENT_ID_FA_PYTHON37_LCON }} - tenant-id: ${{ secrets.AZURE_TENANT_ID_FA_E2E_TESTS }} - subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID_FA_E2E_TESTS }} - - - name: E2E Run Azure Functions Action - uses: ./ - id: fa - with: - app-name: ${{ env.AZURE_FUNCTIONAPP_NAME }} - package: ${{ env.AZURE_FUNCTIONAPP_PACKAGE_PATH }} - - - name: E2E Check HttpTrigger Result - shell: pwsh - run: | - $i = 0 - while ($i -lt 10) { - sleep 10 - $RESPONSE = $(curl "${{ steps.fa.outputs.app-url }}/api/HttpTrigger") - $RESULT = ($RESPONSE -eq "$env:GITHUB_SHA") - if ($RESULT) { - exit 0 - } - $i = $i + 1 - } - exit 1 \ No newline at end of file diff --git a/eng/ci/templates/jobs/build.yml b/eng/ci/templates/jobs/build.yml index 13ee6b4cf..63ada7d57 100644 --- a/eng/ci/templates/jobs/build.yml +++ b/eng/ci/templates/jobs/build.yml @@ -51,10 +51,10 @@ jobs: displayName: 'Use .NET Core sdk' inputs: packageType: sdk - version: 3.1.x + version: 8.0.x - task: DotNetCoreCLI@2 inputs: command: 'build' - projects: 'tests/e2e/dotnet3/*.csproj' + projects: 'tests/e2e/dotnet8/*.csproj' displayName: 'Build project for csharp language' \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 1523e0a9f..4fdc87e03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3125,9 +3125,9 @@ "dev": true }, "node_modules/cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "version": "7.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz", + "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", diff --git a/tests/e2e/dotnet3/HttpTrigger.cs b/tests/e2e/dotnet3/HttpTrigger.cs deleted file mode 100644 index 5848d86ca..000000000 --- a/tests/e2e/dotnet3/HttpTrigger.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Azure.WebJobs; -using Microsoft.Azure.WebJobs.Extensions.Http; -using Microsoft.AspNetCore.Http; -using Microsoft.Extensions.Logging; -using Newtonsoft.Json; - -namespace dotnet3 -{ - public static class HttpTrigger - { - [FunctionName("HttpTrigger")] - public static async Task Run( - [HttpTrigger(AuthorizationLevel.Anonymous, "get", "post", Route = null)] HttpRequest req, - ILogger log, ExecutionContext execution) - { - string filePath = $"{execution.FunctionAppDirectory}/sha.txt"; - string text = await System.IO.File.ReadAllTextAsync(filePath); - return new OkObjectResult(text); - } - } -} diff --git a/tests/e2e/dotnet3/dotnet3.csproj b/tests/e2e/dotnet3/dotnet3.csproj deleted file mode 100644 index 38f400a73..000000000 --- a/tests/e2e/dotnet3/dotnet3.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - netcoreapp3.1 - v3 - - - - - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - Never - - - diff --git a/tests/e2e/dotnet3/host.json b/tests/e2e/dotnet3/host.json deleted file mode 100644 index 2685784d6..000000000 --- a/tests/e2e/dotnet3/host.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "version": "2.0", - "logging": { - "applicationInsights": { - "samplingExcludedTypes": "Request", - "samplingSettings": { - "isEnabled": true - } - } - } -} \ No newline at end of file diff --git a/tests/e2e/dotnet3/sha.txt b/tests/e2e/dotnet3/sha.txt deleted file mode 100644 index ea5815afb..000000000 --- a/tests/e2e/dotnet3/sha.txt +++ /dev/null @@ -1 +0,0 @@ -sha-txt-dotnet3-placeholder \ No newline at end of file diff --git a/tests/e2e/dotnet3/.gitignore b/tests/e2e/dotnet8/.gitignore similarity index 94% rename from tests/e2e/dotnet3/.gitignore rename to tests/e2e/dotnet8/.gitignore index 3c3f4e6a7..ff5b00c50 100644 --- a/tests/e2e/dotnet3/.gitignore +++ b/tests/e2e/dotnet8/.gitignore @@ -1,264 +1,264 @@ -## Ignore Visual Studio temporary files, build results, and -## files generated by popular Visual Studio add-ons. - -# Azure Functions localsettings file -local.settings.json - -# User-specific files -*.suo -*.user -*.userosscache -*.sln.docstates - -# User-specific files (MonoDevelop/Xamarin Studio) -*.userprefs - -# Build results -[Dd]ebug/ -[Dd]ebugPublic/ -[Rr]elease/ -[Rr]eleases/ -x64/ -x86/ -bld/ -[Bb]in/ -[Oo]bj/ -[Ll]og/ - -# Visual Studio 2015 cache/options directory -.vs/ -# Uncomment if you have tasks that create the project's static files in wwwroot -#wwwroot/ - -# MSTest test Results -[Tt]est[Rr]esult*/ -[Bb]uild[Ll]og.* - -# NUNIT -*.VisualState.xml -TestResult.xml - -# Build Results of an ATL Project -[Dd]ebugPS/ -[Rr]eleasePS/ -dlldata.c - -# DNX -project.lock.json -project.fragment.lock.json -artifacts/ - -*_i.c -*_p.c -*_i.h -*.ilk -*.meta -*.obj -*.pch -*.pdb -*.pgc -*.pgd -*.rsp -*.sbr -*.tlb -*.tli -*.tlh -*.tmp -*.tmp_proj -*.log -*.vspscc -*.vssscc -.builds -*.pidb -*.svclog -*.scc - -# Chutzpah Test files -_Chutzpah* - -# Visual C++ cache files -ipch/ -*.aps -*.ncb -*.opendb -*.opensdf -*.sdf -*.cachefile -*.VC.db -*.VC.VC.opendb - -# Visual Studio profiler -*.psess -*.vsp -*.vspx -*.sap - -# TFS 2012 Local Workspace -$tf/ - -# Guidance Automation Toolkit -*.gpState - -# ReSharper is a .NET coding add-in -_ReSharper*/ -*.[Rr]e[Ss]harper -*.DotSettings.user - -# JustCode is a .NET coding add-in -.JustCode - -# TeamCity is a build add-in -_TeamCity* - -# DotCover is a Code Coverage Tool -*.dotCover - -# NCrunch -_NCrunch_* -.*crunch*.local.xml -nCrunchTemp_* - -# MightyMoose -*.mm.* -AutoTest.Net/ - -# Web workbench (sass) -.sass-cache/ - -# Installshield output folder -[Ee]xpress/ - -# DocProject is a documentation generator add-in -DocProject/buildhelp/ -DocProject/Help/*.HxT -DocProject/Help/*.HxC -DocProject/Help/*.hhc -DocProject/Help/*.hhk -DocProject/Help/*.hhp -DocProject/Help/Html2 -DocProject/Help/html - -# Click-Once directory -publish/ - -# Publish Web Output -*.[Pp]ublish.xml -*.azurePubxml -# TODO: Comment the next line if you want to checkin your web deploy settings -# but database connection strings (with potential passwords) will be unencrypted -#*.pubxml -*.publishproj - -# Microsoft Azure Web App publish settings. Comment the next line if you want to -# checkin your Azure Web App publish settings, but sensitive information contained -# in these scripts will be unencrypted -PublishScripts/ - -# NuGet Packages -*.nupkg -# The packages folder can be ignored because of Package Restore -**/packages/* -# except build/, which is used as an MSBuild target. -!**/packages/build/ -# Uncomment if necessary however generally it will be regenerated when needed -#!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files -*.nuget.props -*.nuget.targets - -# Microsoft Azure Build Output -csx/ -*.build.csdef - -# Microsoft Azure Emulator -ecf/ -rcf/ - -# Windows Store app package directories and files -AppPackages/ -BundleArtifacts/ -Package.StoreAssociation.xml -_pkginfo.txt - -# Visual Studio cache files -# files ending in .cache can be ignored -*.[Cc]ache -# but keep track of directories ending in .cache -!*.[Cc]ache/ - -# Others -ClientBin/ -~$* -*~ -*.dbmdl -*.dbproj.schemaview -*.jfm -*.pfx -*.publishsettings -node_modules/ -orleans.codegen.cs - -# Since there are multiple workflows, uncomment next line to ignore bower_components -# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) -#bower_components/ - -# RIA/Silverlight projects -Generated_Code/ - -# Backup & report files from converting an old project file -# to a newer Visual Studio version. Backup files are not needed, -# because we have git ;-) -_UpgradeReport_Files/ -Backup*/ -UpgradeLog*.XML -UpgradeLog*.htm - -# SQL Server files -*.mdf -*.ldf - -# Business Intelligence projects -*.rdl.data -*.bim.layout -*.bim_*.settings - -# Microsoft Fakes -FakesAssemblies/ - -# GhostDoc plugin setting file -*.GhostDoc.xml - -# Node.js Tools for Visual Studio -.ntvs_analysis.dat - -# Visual Studio 6 build log -*.plg - -# Visual Studio 6 workspace options file -*.opt - -# Visual Studio LightSwitch build output -**/*.HTMLClient/GeneratedArtifacts -**/*.DesktopClient/GeneratedArtifacts -**/*.DesktopClient/ModelManifest.xml -**/*.Server/GeneratedArtifacts -**/*.Server/ModelManifest.xml -_Pvt_Extensions - -# Paket dependency manager -.paket/paket.exe -paket-files/ - -# FAKE - F# Make -.fake/ - -# JetBrains Rider -.idea/ -*.sln.iml - -# CodeRush -.cr/ - -# Python Tools for Visual Studio (PTVS) -__pycache__/ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. + +# Azure Functions localsettings file +local.settings.json + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# DNX +project.lock.json +project.fragment.lock.json +artifacts/ + +*_i.c +*_p.c +*_i.h +*.ilk +*.meta +*.obj +*.pch +*.pdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# TODO: Comment the next line if you want to checkin your web deploy settings +# but database connection strings (with potential passwords) will be unencrypted +#*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/packages/* +# except build/, which is used as an MSBuild target. +!**/packages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/packages/repositories.config +# NuGet v3's project.json files produces more ignoreable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +node_modules/ +orleans.codegen.cs + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm + +# SQL Server files +*.mdf +*.ldf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ *.pyc \ No newline at end of file diff --git a/tests/e2e/dotnet3/.vscode/extensions.json b/tests/e2e/dotnet8/.vscode/extensions.json similarity index 95% rename from tests/e2e/dotnet3/.vscode/extensions.json rename to tests/e2e/dotnet8/.vscode/extensions.json index 190f5964b..dde673dcd 100644 --- a/tests/e2e/dotnet3/.vscode/extensions.json +++ b/tests/e2e/dotnet8/.vscode/extensions.json @@ -1,5 +1,5 @@ -{ - "recommendations": [ - "ms-azuretools.vscode-azurefunctions" - ] +{ + "recommendations": [ + "ms-azuretools.vscode-azurefunctions" + ] } \ No newline at end of file diff --git a/tests/e2e/dotnet8/HttpTrigger.cs b/tests/e2e/dotnet8/HttpTrigger.cs new file mode 100644 index 000000000..09c9e1b4a --- /dev/null +++ b/tests/e2e/dotnet8/HttpTrigger.cs @@ -0,0 +1,23 @@ +using Microsoft.Azure.Functions.Worker; +using Microsoft.Extensions.Logging; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; + +namespace dotnet8 +{ + public class HttpTrigger + { + private readonly ILogger _logger; + + public HttpTrigger(ILogger logger) + { + _logger = logger; + } + + [Function("HttpTrigger")] + public IActionResult Run([HttpTrigger(AuthorizationLevel.Anonymous, "get", "post")] HttpRequest req) + { + return new OkObjectResult("Hello world"); + } + } +} diff --git a/tests/e2e/dotnet8/Program.cs b/tests/e2e/dotnet8/Program.cs new file mode 100644 index 000000000..9389455ba --- /dev/null +++ b/tests/e2e/dotnet8/Program.cs @@ -0,0 +1,13 @@ +using Microsoft.Azure.Functions.Worker; +using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.DependencyInjection; + +var host = new HostBuilder() + .ConfigureFunctionsWebApplication() + .ConfigureServices(services => { + services.AddApplicationInsightsTelemetryWorkerService(); + services.ConfigureFunctionsApplicationInsights(); + }) + .Build(); + +host.Run(); diff --git a/tests/e2e/dotnet8/dotnet8.csproj b/tests/e2e/dotnet8/dotnet8.csproj new file mode 100644 index 000000000..4ffe01ba9 --- /dev/null +++ b/tests/e2e/dotnet8/dotnet8.csproj @@ -0,0 +1,30 @@ + + + net8.0 + v4 + Exe + enable + enable + + + + + + + + + + + + + PreserveNewest + + + PreserveNewest + Never + + + + + + \ No newline at end of file diff --git a/tests/e2e/dotnet8/host.json b/tests/e2e/dotnet8/host.json new file mode 100644 index 000000000..ee5cf5f83 --- /dev/null +++ b/tests/e2e/dotnet8/host.json @@ -0,0 +1,12 @@ +{ + "version": "2.0", + "logging": { + "applicationInsights": { + "samplingSettings": { + "isEnabled": true, + "excludedTypes": "Request" + }, + "enableLiveMetricsFilters": true + } + } +} \ No newline at end of file diff --git a/tests/e2e/python37/.dockerignore b/tests/e2e/python37/.dockerignore deleted file mode 100644 index 1927772bc..000000000 --- a/tests/e2e/python37/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -local.settings.json \ No newline at end of file diff --git a/tests/e2e/python37/.funcignore b/tests/e2e/python37/.funcignore deleted file mode 100644 index b694934fb..000000000 --- a/tests/e2e/python37/.funcignore +++ /dev/null @@ -1 +0,0 @@ -.venv \ No newline at end of file diff --git a/tests/e2e/python37/.gitignore b/tests/e2e/python37/.gitignore deleted file mode 100644 index eb39b3677..000000000 --- a/tests/e2e/python37/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -bin -obj -csx -.vs -edge -Publish - -*.user -*.suo -*.cscfg -*.Cache -project.lock.json - -/packages -/TestResults - -/tools/NuGet.exe -/App_Data -/secrets -/data -.secrets -appsettings.json -local.settings.json - -node_modules -dist - -# Local python packages -.python_packages/ - -# Python Environments -.env -.venv -env/ -venv/ -ENV/ -env.bak/ -venv.bak/ - -# Byte-compiled / optimized / DLL files -__pycache__/ -*.py[cod] -*$py.class \ No newline at end of file diff --git a/tests/e2e/python37/HttpTrigger/__init__.py b/tests/e2e/python37/HttpTrigger/__init__.py deleted file mode 100644 index 917787b4d..000000000 --- a/tests/e2e/python37/HttpTrigger/__init__.py +++ /dev/null @@ -1,10 +0,0 @@ -import logging - -import azure.functions as func -import pyodbc - - -def main(req: func.HttpRequest) -> func.HttpResponse: - with open('sha.txt', 'r') as file: - line = file.readline() - return func.HttpResponse(line) diff --git a/tests/e2e/python37/HttpTrigger/function.json b/tests/e2e/python37/HttpTrigger/function.json deleted file mode 100644 index c125ec613..000000000 --- a/tests/e2e/python37/HttpTrigger/function.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "scriptFile": "__init__.py", - "bindings": [ - { - "authLevel": "anonymous", - "type": "httpTrigger", - "direction": "in", - "name": "req", - "methods": [ - "get", - "post" - ] - }, - { - "type": "http", - "direction": "out", - "name": "$return" - } - ] -} \ No newline at end of file diff --git a/tests/e2e/python37/host.json b/tests/e2e/python37/host.json deleted file mode 100644 index 8c98d2eca..000000000 --- a/tests/e2e/python37/host.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": "2.0" -} \ No newline at end of file diff --git a/tests/e2e/python37/requirements.txt b/tests/e2e/python37/requirements.txt deleted file mode 100644 index f0e826c21..000000000 --- a/tests/e2e/python37/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -azure-functions -pyodbc==4.0.30 \ No newline at end of file diff --git a/tests/e2e/python37/sha.txt b/tests/e2e/python37/sha.txt deleted file mode 100644 index b00b2b6ce..000000000 --- a/tests/e2e/python37/sha.txt +++ /dev/null @@ -1 +0,0 @@ -sha-txt-python37-placeholder \ No newline at end of file