Merge remote-tracking branch 'upstream/dev' into jviau/health-checks-2

Author: jviau

.editorconfig

@@ -1,4 +1,7 @@
-[*.cs]
+[*]
+indent_style = space
+charset = utf-8
 
+[*.cs]
 # SA1008: Opening parenthesis should not be preceded by a space.
 dotnet_diagnostic.SA1008.severity = silent

.gitattributes

@@ -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

NuGet.config

@@ -8,5 +8,6 @@
     <add key="AzureFunctionsRelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsRelease/nuget/v3/index.json" />
     <add key="AzureFunctionsPreRelease" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsPreRelease/nuget/v3/index.json" />
     <add key="AzureFunctionsTempStaging" value="https://azfunc.pkgs.visualstudio.com/e6a70c92-4128-439f-8012-382fe78d6396/_packaging/AzureFunctionsTempStaging/nuget/v3/index.json" />
+    <add key="AzureFunctionsInfra" value="https://pkgs.dev.azure.com/azfunc/public/_packaging/infra/nuget/v3/index.json" />
   </packageSources>
 </configuration>

README.md

@@ -1,7 +1,7 @@
 <Project>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="3.10.1" />
+    <PackageReference Include="Microsoft.Azure.Functions.NodeJsWorker" Version="3.11.0" />
   </ItemGroup>
 
 </Project>

WebJobs.Script.sln

@@ -37,7 +37,6 @@ jobs:
       artifact: $(artifactName)
 
   steps:
-  - checkout: none
   - pwsh: |
         $sampleSize = $env:SAMPLE_SIZE
         $values = @()
@@ -98,15 +97,8 @@ jobs:
       scriptType: 'pscore'
       scriptLocation: 'inlineScript'
       inlineScript: |
-        $json = Get-Content -Path $(resultsJsonPath) -Raw
-        $dateTimeUtc = [datetimeoffset]::UtcNow
-
-        $query = @"
-        INSERT INTO ColdStart (DateTimeUtc, OS, Description, Document)
-        VALUES ('$dateTimeUtc', '${{ parameters.os }}', '${{ parameters.description }}', '$json')
-        "@
-
-        Invoke-Sqlcmd -ConnectionString "$(ColdStartResultsSqlConnectionString)" -Query $query
-
+        $env:PATH = [System.IO.Path]::Combine($env:USERPROFILE, ".dotnet", "tools") + ";$env:PATH"
+        dotnet tool install -g Microsoft.Azure.Functions.ColdStartDataWriter --prerelease
+        func-cold-start-data-writer --os '${{ parameters.os }}' --description '${{ parameters.description }}' --sql-connection '$(ColdStartResultsSqlConnectionString)' --document-file-path '$(resultsJsonPath)'
     displayName: Persist results
     condition: eq(variables['Build.Reason'], 'Schedule')

eng/build/Workers.Node.props

@@ -117,7 +117,7 @@ jobs:
     - task: CopyFiles@2
       displayName: Copy node js app content to script root dir
       inputs:
-        SourceFolder: '$(Build.SourcesDirectory)/test/Performance/Apps/HelloHttpNode'
+        SourceFolder: '$(Build.SourcesDirectory)/perf/Apps/HelloHttpNode'
         Contents: '**/*'
         TargetFolder: '$(functionAppOutputPath)'
         CleanTargetFolder: true
@@ -135,7 +135,7 @@ jobs:
     - task: CopyFiles@2
       displayName: Copy benchmark apps to temp location
       inputs:
-        SourceFolder: '$(Build.SourcesDirectory)/test/Performance/Apps'
+        SourceFolder: '$(Build.SourcesDirectory)/perf/Apps'
         Contents: '**/*'
         TargetFolder: '$(Build.ArtifactStagingDirectory)/PerformanceTestApps'
         CleanTargetFolder: true

eng/ci/templates/official/jobs/process-coldstart.yml

@@ -46,7 +46,7 @@ jobs:
   - task: CopyFiles@2
     displayName: Copy benchmark apps to temp location
     inputs:
-      SourceFolder: '$(Build.SourcesDirectory)/test/Performance/Apps'
+      SourceFolder: '$(Build.SourcesDirectory)/perf/Apps'
       Contents: '**/*'
       TargetFolder: '$(Build.ArtifactStagingDirectory)/PerformanceTestApps'
       CleanTargetFolder: true

eng/ci/templates/official/jobs/run-coldstart.yml

@@ -48,7 +48,7 @@ jobs:
   - task: CopyFiles@2
     displayName: Copy benchmark apps to temp location
     inputs:
-      SourceFolder: '$(Build.SourcesDirectory)/test/Performance/Apps'
+      SourceFolder: '$(Build.SourcesDirectory)/perf/Apps'
       Contents: '**/*'
       TargetFolder: '$(Build.ArtifactStagingDirectory)/PerformanceTestApps'
       CleanTargetFolder: true