Merge branch 'dev' into jviau/eng/site-proj

Azure · Jun 12, 2024 · da5a5a6 · da5a5a6
2 parents 1175ff4 + d1067c5
commit da5a5a6
Show file tree

Hide file tree

Showing 70 changed files with 1,075 additions and 2,037 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -35,4 +35,4 @@
       "processId": "${command:pickProcess}"
     }
   ]
-}
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "azure-pipelines.1ESPipelineTemplatesSchemaFile": true
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,4 +12,4 @@
       "problemMatcher": "$msCompile"
     }
   ]
-}
+}
diff --git a/WebJobs.Script.Tests.E2E.sln b/WebJobs.Script.Tests.E2E.sln
diff --git a/WebJobs.Script.sln b/WebJobs.Script.sln
@@ -56,6 +56,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.WebJobs.Script.Benchmarks", "benchmarks\WebJobs.Script.Benchmarks\Microsoft.Azure.WebJobs.Script.Benchmarks.csproj", "{766DE3D5-4FB1-4602-9BB5-3779EECC232D}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharpPrecompiledTestProjects", "CSharpPrecompiledTestProjects", "{B3ACC1B2-81F4-4035-9B24-169D4C7CB076}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency56", "test\CSharpPrecompiledTestProjects\Dependency56\Dependency56.csproj", "{504B98C7-F27F-4C02-9881-33048D4283CF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeDependencyNoRuntimes", "test\CSharpPrecompiledTestProjects\NativeDependencyNoRuntimes\NativeDependencyNoRuntimes.csproj", "{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobsStartupTests", "test\CSharpPrecompiledTestProjects\WebJobsStartupTests\WebJobsStartupTests.csproj", "{9D7556C5-C828-4C19-8EC9-E10030777E48}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoadContextRace", "test\CSharpPrecompiledTestProjects\AssemblyLoadContextRace\AssemblyLoadContextRace.csproj", "{29167303-5857-4BD5-9DDA-9EEA8C26CACC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency55", "test\CSharpPrecompiledTestProjects\Dependency55\Dependency55.csproj", "{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferenceOlderRuntimeAssembly", "test\CSharpPrecompiledTestProjects\ReferenceOlderRuntimeAssembly\ReferenceOlderRuntimeAssembly.csproj", "{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultipleDependencyVersions", "test\CSharpPrecompiledTestProjects\MultipleDependencyVersions\MultipleDependencyVersions.csproj", "{51E41947-888E-43BE-A1A9-6607AAED7B57}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -130,6 +146,62 @@ Global
 		{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.Release|Any CPU.Build.0 = Release|Any CPU
 		{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.ReleasePlaceholder|Any CPU.ActiveCfg = Release|Any CPU
+		{504B98C7-F27F-4C02-9881-33048D4283CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{504B98C7-F27F-4C02-9881-33048D4283CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{504B98C7-F27F-4C02-9881-33048D4283CF}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{504B98C7-F27F-4C02-9881-33048D4283CF}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{504B98C7-F27F-4C02-9881-33048D4283CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{504B98C7-F27F-4C02-9881-33048D4283CF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{504B98C7-F27F-4C02-9881-33048D4283CF}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{504B98C7-F27F-4C02-9881-33048D4283CF}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{9D7556C5-C828-4C19-8EC9-E10030777E48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D7556C5-C828-4C19-8EC9-E10030777E48}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D7556C5-C828-4C19-8EC9-E10030777E48}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D7556C5-C828-4C19-8EC9-E10030777E48}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{9D7556C5-C828-4C19-8EC9-E10030777E48}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D7556C5-C828-4C19-8EC9-E10030777E48}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D7556C5-C828-4C19-8EC9-E10030777E48}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D7556C5-C828-4C19-8EC9-E10030777E48}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{51E41947-888E-43BE-A1A9-6607AAED7B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51E41947-888E-43BE-A1A9-6607AAED7B57}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51E41947-888E-43BE-A1A9-6607AAED7B57}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{51E41947-888E-43BE-A1A9-6607AAED7B57}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
+		{51E41947-888E-43BE-A1A9-6607AAED7B57}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51E41947-888E-43BE-A1A9-6607AAED7B57}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51E41947-888E-43BE-A1A9-6607AAED7B57}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
+		{51E41947-888E-43BE-A1A9-6607AAED7B57}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -145,6 +217,14 @@ Global
 		{5C308A72-5CF3-45E8-B64F-2C98F567054A} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
 		{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
 		{766DE3D5-4FB1-4602-9BB5-3779EECC232D} = {D5F77934-E468-4EE7-82F8-3B8149591174}
+		{B3ACC1B2-81F4-4035-9B24-169D4C7CB076} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
+		{504B98C7-F27F-4C02-9881-33048D4283CF} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
+		{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
+		{9D7556C5-C828-4C19-8EC9-E10030777E48} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
+		{29167303-5857-4BD5-9DDA-9EEA8C26CACC} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
+		{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
+		{C14B6921-A12B-4203-8E3A-34BA4E5ACC98} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
+		{51E41947-888E-43BE-A1A9-6607AAED7B57} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {85400884-5FFD-4C27-A571-58CB3C8CAAC5}

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -1,12 +1,6 @@
 variables:
   buildNumber: $[ counter('constant', 13000) ]
   isReleaseBranch: $[contains(variables['Build.SourceBranch'], 'release/')]
-  ${{ if contains(variables['Build.SourceBranch'], 'release/inproc6/') }}:
-    minorVersionPrefix: "6"
-  ${{ elseif contains(variables['Build.SourceBranch'], 'release/inproc8/') }}:
-    minorVersionPrefix: "8"
-  ${{ else }}:
-    minorVersionPrefix: ""
   DOTNET_NOLOGO: 1
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
   DOTNET_CLI_TELEMETRY_OPTOUT: 1
@@ -17,17 +11,15 @@ pr:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 trigger:
   branches:
     include:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 jobs:
 - job: InitializePipeline
@@ -46,7 +38,6 @@ jobs:
     name: Initialize
     inputs:
       filePath: '$(Build.Repository.LocalPath)\build\initialize-pipeline.ps1'
-      arguments: -minorVersionPrefix "$(minorVersionPrefix)"
       showWarnings: true
       pwsh: true
 
@@ -289,9 +280,16 @@ jobs:
       testRunTitle: 'Unit Tests'
       arguments: '-v n'
       projects: |
-        **\ExtensionsMetadataGeneratorTests.csproj
         **\WebJobs.Script.Scaling.Tests.csproj
         **\WebJobs.Script.Tests.csproj
+  - task: DotNetCoreCLI@2
+    displayName: 'ExtensionsMetadataGenerator Unit Tests'
+    inputs:
+      command: 'test'
+      testRunTitle: 'EGM Unit Tests'
+      arguments: '-v n'
+      projects: |
+        **\ExtensionsMetadataGeneratorTests.csproj
 
 - job: RunNonE2EIntegrationTests
   pool:

diff --git a/eng/ci/code-mirror.yml b/eng/ci/code-mirror.yml
@@ -4,8 +4,7 @@ trigger:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 resources:
   repositories:

diff --git a/eng/ci/integration-tests.yml b/eng/ci/integration-tests.yml
@@ -1,36 +1,39 @@
-variables:
-  DOTNET_NOLOGO: 1
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+trigger: none # ensure this is not ran as a CI build
 
 pr:
   branches:
     include:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 resources:
   repositories:
   - repository: 1es
     type: git
     name: 1ESPipelineTemplates/1ESPipelineTemplates
     ref: refs/tags/release
+  - repository: eng
+    type: git
+    name: engineering
+    ref: refs/tags/release
+
+variables:
+  - template: /eng/ci/templates/variables/build.yml@self
+  - template: /ci/variables/cfs.yml@eng
 
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
   parameters:
     pool:
       name: 1es-pool-azfunc
-      image: 1es-windows-2022 
+      image: 1es-windows-2022
       os: windows
 
     stages:
     - stage: Test
       jobs:
-
       - template: /eng/ci/templates/jobs/initialize-pipeline.yml@self
       - template: /eng/ci/templates/official/jobs/run-non-e2e-tests.yml@self
       - template: /eng/ci/templates/official/jobs/run-integration-tests.yml@self
diff --git a/eng/ci/official-build.yml b/eng/ci/official-build.yml
@@ -1,14 +1,11 @@
-
-
 trigger:
   batch: true
   branches:
     include:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 # CI only, does not trigger on PRs.
 pr: none
@@ -25,17 +22,10 @@ resources:
     ref: refs/tags/release
 
 variables:
-  - template: ci/variables/build.yml@eng
-  - template: ci/variables/cfs.yml@eng
+  - template: /eng/ci/templates/variables/build.yml@self
+  - template: /ci/variables/cfs.yml@eng
   - name: buildNumber
     value: $[ counter('build', 23000) ] # 23000 selected to be ahead of current host build
-  - name: minorVersionPrefix
-    ${{ if contains(variables['Build.SourceBranch'], 'release/inproc6/') }}:
-      value: "6"
-    ${{ elseif contains(variables['Build.SourceBranch'], 'release/inproc8/') }}:
-      value: "8"
-    ${{ else }}:
-      value: ""
 
 extends:
   template: v1/1ES.Official.PipelineTemplate.yml@1es

diff --git a/eng/ci/public-build.yml b/eng/ci/public-build.yml
@@ -1,35 +1,21 @@
 # This build is used for public PR and CI builds.
 
-variables:
-  buildNumber: $[ counter('build', 23000) ] # 23000 selected to be ahead of current host build
-  ${{ if contains(variables['Build.SourceBranch'], 'release/inproc6/') }}:
-    minorVersionPrefix: "6"
-  ${{ elseif contains(variables['Build.SourceBranch'], 'release/inproc8/') }}:
-    minorVersionPrefix: "8"
-  ${{ else }}:
-    minorVersionPrefix: ""
-  DOTNET_NOLOGO: 1
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: 1
-  DOTNET_CLI_TELEMETRY_OPTOUT: 1
-
 trigger:
   batch: true
   branches:
     include:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 pr:
   branches:
     include:
     - dev
     - in-proc
     - release/4.*
-    - release/inproc6/4.*
-    - release/inproc8/4.*
+    - release/in-proc
 
 resources:
   repositories:
@@ -38,6 +24,9 @@ resources:
     name: 1ESPipelineTemplates/1ESPipelineTemplates
     ref: refs/tags/release
 
+variables:
+  - template: /eng/ci/templates/variables/build.yml@self
+
 extends:
   template: v1/1ES.Unofficial.PipelineTemplate.yml@1es
   parameters:
@@ -47,13 +36,7 @@ extends:
       os: windows
 
     stages:
-    - stage: Initialize
-
-      jobs:
-      - template: /eng/ci/templates/jobs/initialize-pipeline.yml@self
-
     - stage: Test
-      dependsOn: Initialize
-
       jobs:
+      - template: /eng/ci/templates/jobs/initialize-pipeline.yml@self
       - template: /eng/ci/templates/jobs/run-unit-tests.yml@self
diff --git a/eng/ci/templates/jobs/initialize-pipeline.yml b/eng/ci/templates/jobs/initialize-pipeline.yml
@@ -14,6 +14,5 @@ jobs:
       name: Initialize
       inputs:
         filePath: build/initialize-pipeline.ps1
-        arguments: -minorVersionPrefix "$(minorVersionPrefix)"
         showWarnings: true
         pwsh: true
diff --git a/eng/ci/templates/jobs/run-unit-tests.yml b/eng/ci/templates/jobs/run-unit-tests.yml
@@ -2,15 +2,7 @@ jobs:
 - job: RunUnitTests
   displayName: Run Unit Tests
 
-  pool:
-    name: 1es-pool-azfunc
-    image: 1es-windows-2022 
-    os: windows
-
   steps:
-  - task: NuGetAuthenticate@1
-    displayName: NuGet Authenticate
-
   - template: /eng/ci/templates/install-dotnet.yml@self
 
   - task: DotNetCoreCLI@2