Skip to content

Commit c33151c

Browse files
authored
Project cleanup round 2 (test & perf projects) (#10897)
* Re-organize test and perf projects * Add LinkBase to Integration.csproj * Force add OutOfDateExtension * Fix test assembly missing * Fix perf path
1 parent bb824d6 commit c33151c

File tree

280 files changed

+185
-1081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

280 files changed

+185
-1081
lines changed

WebJobs.Script.sln

Lines changed: 75 additions & 65 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ jobs:
117117
- task: CopyFiles@2
118118
displayName: Copy node js app content to script root dir
119119
inputs:
120-
SourceFolder: '$(Build.SourcesDirectory)/test/Performance/Apps/HelloHttpNode'
120+
SourceFolder: '$(Build.SourcesDirectory)/perf/Apps/HelloHttpNode'
121121
Contents: '**/*'
122122
TargetFolder: '$(functionAppOutputPath)'
123123
CleanTargetFolder: true
@@ -135,7 +135,7 @@ jobs:
135135
- task: CopyFiles@2
136136
displayName: Copy benchmark apps to temp location
137137
inputs:
138-
SourceFolder: '$(Build.SourcesDirectory)/test/Performance/Apps'
138+
SourceFolder: '$(Build.SourcesDirectory)/perf/Apps'
139139
Contents: '**/*'
140140
TargetFolder: '$(Build.ArtifactStagingDirectory)/PerformanceTestApps'
141141
CleanTargetFolder: true

eng/ci/templates/official/jobs/run-metrics-monitor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
- task: CopyFiles@2
4747
displayName: Copy benchmark apps to temp location
4848
inputs:
49-
SourceFolder: '$(Build.SourcesDirectory)/test/Performance/Apps'
49+
SourceFolder: '$(Build.SourcesDirectory)/perf/Apps'
5050
Contents: '**/*'
5151
TargetFolder: '$(Build.ArtifactStagingDirectory)/PerformanceTestApps'
5252
CleanTargetFolder: true

eng/ci/templates/official/jobs/setup-benchmark-agents.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
- task: CopyFiles@2
4949
displayName: Copy benchmark apps to temp location
5050
inputs:
51-
SourceFolder: '$(Build.SourcesDirectory)/test/Performance/Apps'
51+
SourceFolder: '$(Build.SourcesDirectory)/perf/Apps'
5252
Contents: '**/*'
5353
TargetFolder: '$(Build.ArtifactStagingDirectory)/PerformanceTestApps'
5454
CleanTargetFolder: true

test/Performance/Apps/HelloHttpNet9/HelloHttp.csproj renamed to perf/Apps/HelloHttpNet9/HelloHttp.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<TargetFramework>net9.0</TargetFramework>
45
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
@@ -7,10 +8,12 @@
78
<Nullable>enable</Nullable>
89
<PublishReadyToRun>true</PublishReadyToRun>
910
</PropertyGroup>
11+
1012
<ItemGroup>
1113
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1214
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
1315
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http.AspNetCore" Version="2.0.0" />
1416
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
1517
</ItemGroup>
18+
1619
</Project>

test/Performance/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj renamed to perf/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
23
<PropertyGroup>
34
<TargetFramework>net9.0</TargetFramework>
45
<AzureFunctionsVersion>v4</AzureFunctionsVersion>
@@ -7,10 +8,12 @@
78
<Nullable>enable</Nullable>
89
<PublishReadyToRun>true</PublishReadyToRun>
910
</PropertyGroup>
11+
1012
<ItemGroup>
1113
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1214
<PackageReference Include="Microsoft.Azure.Functions.Worker" Version="2.0.0" />
1315
<PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.1.0" />
1416
<PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="2.0.0" />
1517
</ItemGroup>
18+
1619
</Project>

0 commit comments

Comments
 (0)