Project cleanup round 2 (test & perf projects)

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

@@ -74,7 +74,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/setup-benchmark-agents.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

test/Performance/Apps/HelloHttpNet9/HelloHttp.csproj → perf/Apps/HelloHttpNet9/HelloHttp.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
@@ -7,10 +8,12 @@
     <Nullable>enable</Nullable>
     <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
+
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
   </ItemGroup>
+
 </Project>

test/Performance/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj → perf/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net9.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
@@ -7,10 +8,12 @@
     <Nullable>enable</Nullable>
     <PublishReadyToRun>true</PublishReadyToRun>
   </PropertyGroup>
+
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
   </ItemGroup>
+
 </Project>

benchmarks/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj → perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj

@@ -1,15 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <!-- BenchmarkDotNet looks for a matching Project, see https://github.com/dotnet/BenchmarkDotNet/issues/1019 -->
-    <!--<AssemblyName>Microsoft.Azure.WebJobs.Script.Benchmarks</AssemblyName>-->
     <RootNamespace>Microsoft.Azure.WebJobs.Script.Benchmarks</RootNamespace>
     <LangVersion>Latest</LangVersion>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     <ProjectReference Include="../../src/WebJobs.Script/WebJobs.Script.csproj" />
     <ProjectReference Include="../../src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj" />
   </ItemGroup>
+
 </Project>

test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj → test/Resources/TestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj

@@ -1,20 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
   </PropertyGroup>
-  <ItemGroup>    
+
+  <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
+    <None Update="host.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="local.settings.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Never" />
   </ItemGroup>
+
 </Project>

test/DotNetIsolated60/DotNetIsolated60.csproj → test/Resources/TestProjects/DotNetIsolated60/DotNetIsolated60.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
@@ -10,6 +11,7 @@
     <FunctionsEnableExecutorSourceGen>True</FunctionsEnableExecutorSourceGen>
     <RunAnalyzers>false</RunAnalyzers>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
@@ -18,16 +20,10 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.15.1" /> <!-- Do not update. Verifies worker behavior. -->
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.5" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
+    <None Update="host.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="local.settings.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Never" />
   </ItemGroup>
+
 </Project>

test/DotNetIsolatedUnsupportedWorker/DotNetIsolatedUnsupportedWorker.csproj → test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/DotNetIsolatedUnsupportedWorker.csproj

@@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
@@ -8,6 +9,7 @@
     <FunctionsEnableWorkerIndexing>True</FunctionsEnableWorkerIndexing>
     <RunAnalyzers>false</RunAnalyzers>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.2.0" />
@@ -16,16 +18,10 @@
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.14.0" /> <!-- Do not update. Verifies worker behavior. -->
     <PackageReference Include="Microsoft.Extensions.Azure" Version="1.7.5" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Using Include="System.Threading.ExecutionContext" Alias="ExecutionContext" />
+    <None Update="host.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="local.settings.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Never" />
   </ItemGroup>
+
 </Project>

test/Performance/Apps/HelloHttpNet9/host.json → test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/host.json

@@ -1,12 +1,12 @@
-{
-    "version": "2.0",
-    "logging": {
-        "applicationInsights": {
-            "samplingSettings": {
-                "isEnabled": true,
-                "excludedTypes": "Request"
-            },
-            "enableLiveMetricsFilters": true
-        }
-    }
+{
+    "version": "2.0",
+    "logging": {
+        "applicationInsights": {
+            "samplingSettings": {
+                "isEnabled": true,
+                "excludedTypes": "Request"
+            },
+            "enableLiveMetricsFilters": true
+        }
+    }
 }

test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj → test/Resources/TestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj

@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <_FunctionsSkipCleanOutput>true</_FunctionsSkipCleanOutput>
   </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.3.*" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Dependency56\Dependency56.csproj" />
     <ProjectReference Include="..\Dependency55\Dependency55.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
+    <None Update="host.json" CopyToOutputDirectory="PreserveNewest" />
+    <None Update="local.settings.json" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="Never" />
   </ItemGroup>
+
 </Project>