Skip to content

Commit 22a24f2

Browse files
liliankasemliliankasem
authored
[.NET 8 in-proc] Multi-target test projects (#10117)
* Update unit tests & fix proxy breaking change * Update integration tests * Update azure pipeline * Update net6 deps file * Update ado pipeline to seperate EGM tests * Fixup tests csproj * Address PR feedback * Reference CSharpPrecompiledTestProjects directly * project cleanup
1 parent bf23160 commit 22a24f2

File tree

9 files changed

+356
-269
lines changed

9 files changed

+356
-269
lines changed

‎WebJobs.Script.sln‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks",
5656
EndProject
5757
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}"
5858
EndProject
59+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharpPrecompiledTestProjects", "CSharpPrecompiledTestProjects", "{4DA0497D-596C-4E48-8495-776BD6340901}"
60+
EndProject
61+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency56", "test\CSharpPrecompiledTestProjects\Dependency56\Dependency56.csproj", "{39C73557-F796-4EFC-AE71-CBF0F6524936}"
62+
EndProject
63+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeDependencyNoRuntimes", "test\CSharpPrecompiledTestProjects\NativeDependencyNoRuntimes\NativeDependencyNoRuntimes.csproj", "{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}"
64+
EndProject
65+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobsStartupTests", "test\CSharpPrecompiledTestProjects\WebJobsStartupTests\WebJobsStartupTests.csproj", "{702AC603-96E1-44A0-A49C-92A8925BDB65}"
66+
EndProject
67+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoadContextRace", "test\CSharpPrecompiledTestProjects\AssemblyLoadContextRace\AssemblyLoadContextRace.csproj", "{974054C1-BF68-4D75-8A3C-2DF209974A19}"
68+
EndProject
69+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency55", "test\CSharpPrecompiledTestProjects\Dependency55\Dependency55.csproj", "{EA092328-80C4-4C85-8212-2B0F13F2EBAF}"
70+
EndProject
71+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferenceOlderRuntimeAssembly", "test\CSharpPrecompiledTestProjects\ReferenceOlderRuntimeAssembly\ReferenceOlderRuntimeAssembly.csproj", "{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}"
72+
EndProject
73+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultipleDependencyVersions", "test\CSharpPrecompiledTestProjects\MultipleDependencyVersions\MultipleDependencyVersions.csproj", "{8926678E-3354-4AA7-9B5E-8165F44AA99A}"
74+
EndProject
5975
Global
6076
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6177
Debug|Any CPU = Debug|Any CPU
@@ -130,6 +146,62 @@ Global
130146
{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.Release|Any CPU.ActiveCfg = Release|Any CPU
131147
{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.Release|Any CPU.Build.0 = Release|Any CPU
132148
{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.ReleasePlaceholder|Any CPU.ActiveCfg = Release|Any CPU
149+
{39C73557-F796-4EFC-AE71-CBF0F6524936}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150+
{39C73557-F796-4EFC-AE71-CBF0F6524936}.Debug|Any CPU.Build.0 = Debug|Any CPU
151+
{39C73557-F796-4EFC-AE71-CBF0F6524936}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
152+
{39C73557-F796-4EFC-AE71-CBF0F6524936}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
153+
{39C73557-F796-4EFC-AE71-CBF0F6524936}.Release|Any CPU.ActiveCfg = Release|Any CPU
154+
{39C73557-F796-4EFC-AE71-CBF0F6524936}.Release|Any CPU.Build.0 = Release|Any CPU
155+
{39C73557-F796-4EFC-AE71-CBF0F6524936}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
156+
{39C73557-F796-4EFC-AE71-CBF0F6524936}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
157+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
159+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
160+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
161+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
162+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}.Release|Any CPU.Build.0 = Release|Any CPU
163+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
164+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
165+
{702AC603-96E1-44A0-A49C-92A8925BDB65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
166+
{702AC603-96E1-44A0-A49C-92A8925BDB65}.Debug|Any CPU.Build.0 = Debug|Any CPU
167+
{702AC603-96E1-44A0-A49C-92A8925BDB65}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
168+
{702AC603-96E1-44A0-A49C-92A8925BDB65}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
169+
{702AC603-96E1-44A0-A49C-92A8925BDB65}.Release|Any CPU.ActiveCfg = Release|Any CPU
170+
{702AC603-96E1-44A0-A49C-92A8925BDB65}.Release|Any CPU.Build.0 = Release|Any CPU
171+
{702AC603-96E1-44A0-A49C-92A8925BDB65}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
172+
{702AC603-96E1-44A0-A49C-92A8925BDB65}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
173+
{974054C1-BF68-4D75-8A3C-2DF209974A19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174+
{974054C1-BF68-4D75-8A3C-2DF209974A19}.Debug|Any CPU.Build.0 = Debug|Any CPU
175+
{974054C1-BF68-4D75-8A3C-2DF209974A19}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
176+
{974054C1-BF68-4D75-8A3C-2DF209974A19}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
177+
{974054C1-BF68-4D75-8A3C-2DF209974A19}.Release|Any CPU.ActiveCfg = Release|Any CPU
178+
{974054C1-BF68-4D75-8A3C-2DF209974A19}.Release|Any CPU.Build.0 = Release|Any CPU
179+
{974054C1-BF68-4D75-8A3C-2DF209974A19}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
180+
{974054C1-BF68-4D75-8A3C-2DF209974A19}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
181+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
183+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
184+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
185+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
186+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF}.Release|Any CPU.Build.0 = Release|Any CPU
187+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
188+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
189+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
190+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}.Debug|Any CPU.Build.0 = Debug|Any CPU
191+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
192+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
193+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}.Release|Any CPU.ActiveCfg = Release|Any CPU
194+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}.Release|Any CPU.Build.0 = Release|Any CPU
195+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
196+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
197+
{8926678E-3354-4AA7-9B5E-8165F44AA99A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198+
{8926678E-3354-4AA7-9B5E-8165F44AA99A}.Debug|Any CPU.Build.0 = Debug|Any CPU
199+
{8926678E-3354-4AA7-9B5E-8165F44AA99A}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
200+
{8926678E-3354-4AA7-9B5E-8165F44AA99A}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
201+
{8926678E-3354-4AA7-9B5E-8165F44AA99A}.Release|Any CPU.ActiveCfg = Release|Any CPU
202+
{8926678E-3354-4AA7-9B5E-8165F44AA99A}.Release|Any CPU.Build.0 = Release|Any CPU
203+
{8926678E-3354-4AA7-9B5E-8165F44AA99A}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
204+
{8926678E-3354-4AA7-9B5E-8165F44AA99A}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
133205
EndGlobalSection
134206
GlobalSection(SolutionProperties) = preSolution
135207
HideSolutionNode = FALSE
@@ -145,6 +217,14 @@ Global
145217
{5C308A72-5CF3-45E8-B64F-2C98F567054A} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
146218
{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
147219
{766DE3D5-4FB1-4602-9BB5-3779EECC232D} = {D5F77934-E468-4EE7-82F8-3B8149591174}
220+
{4DA0497D-596C-4E48-8495-776BD6340901} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
221+
{39C73557-F796-4EFC-AE71-CBF0F6524936} = {4DA0497D-596C-4E48-8495-776BD6340901}
222+
{C6EF1EBB-0EB2-4A72-A072-F1D5FD1DB7C5} = {4DA0497D-596C-4E48-8495-776BD6340901}
223+
{702AC603-96E1-44A0-A49C-92A8925BDB65} = {4DA0497D-596C-4E48-8495-776BD6340901}
224+
{974054C1-BF68-4D75-8A3C-2DF209974A19} = {4DA0497D-596C-4E48-8495-776BD6340901}
225+
{EA092328-80C4-4C85-8212-2B0F13F2EBAF} = {4DA0497D-596C-4E48-8495-776BD6340901}
226+
{BD05F1CE-5F52-48BC-AE6A-2C160F2AEF44} = {4DA0497D-596C-4E48-8495-776BD6340901}
227+
{8926678E-3354-4AA7-9B5E-8165F44AA99A} = {4DA0497D-596C-4E48-8495-776BD6340901}
148228
EndGlobalSection
149229
GlobalSection(ExtensibilityGlobals) = postSolution
150230
SolutionGuid = {85400884-5FFD-4C27-A571-58CB3C8CAAC5}

‎azure-pipelines.yml‎

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -300,30 +300,43 @@ jobs:
300300
artifact: NugetPackages
301301

302302
- job: RunUnitTests
303+
strategy:
304+
matrix:
305+
net6:
306+
targetFramework: "net6.0"
307+
net8:
308+
targetFramework: "net8.0"
303309
pool:
304310
name: '1ES-Hosted-AzFunc'
305311
demands:
306312
- ImageOverride -equals MMS2019TLS
307313
steps:
308314
- template: build/install-dotnet.yml
309315
- task: DotNetCoreCLI@2
310-
displayName: 'Build sln'
316+
displayName: 'Unit Tests'
311317
inputs:
312-
command: 'build'
318+
command: 'test'
319+
testRunTitle: 'Unit Tests'
320+
arguments: '-v n -f $(targetFramework)'
313321
projects: |
314-
**\WebJobs.Script.sln
322+
**\WebJobs.Script.Scaling.Tests.csproj
323+
**\WebJobs.Script.Tests.csproj
315324
- task: DotNetCoreCLI@2
316-
displayName: 'Unit Tests'
325+
displayName: 'EGM Unit Tests'
317326
inputs:
318327
command: 'test'
319-
testRunTitle: 'Unit Tests'
328+
testRunTitle: 'EGM Unit Tests'
320329
arguments: '-v n'
321330
projects: |
322331
**\ExtensionsMetadataGeneratorTests.csproj
323-
**\WebJobs.Script.Scaling.Tests.csproj
324-
**\WebJobs.Script.Tests.csproj
325332
326333
- job: RunNonE2EIntegrationTests
334+
strategy:
335+
matrix:
336+
net6:
337+
targetFramework: "net6.0"
338+
net8:
339+
targetFramework: "net8.0"
327340
pool:
328341
name: '1ES-Hosted-AzFunc'
329342
demands:
@@ -361,7 +374,7 @@ jobs:
361374
inputs:
362375
command: 'test'
363376
testRunTitle: 'Non-E2E integration tests'
364-
arguments: '--filter "Category!=E2E"'
377+
arguments: '--filter "Category!=E2E" -f $(targetFramework)'
365378
projects: |
366379
**\WebJobs.Script.Tests.Integration.csproj
367380
env:
@@ -382,6 +395,12 @@ jobs:
382395
arguments: '-connectionString ''$(Storage-azurefunctionshostci0)'' -leaseBlob $(LeaseBlob) -leaseToken $(LeaseToken)'
383396

384397
- job: RunIntegrationTests
398+
strategy:
399+
matrix:
400+
net6:
401+
targetFramework: "net6.0"
402+
net8:
403+
targetFramework: "net8.0"
385404
pool:
386405
name: '1ES-Hosted-AzFunc'
387406
demands:
@@ -449,7 +468,7 @@ jobs:
449468
inputs:
450469
command: 'test'
451470
testRunTitle: "C# end to end tests"
452-
arguments: '--filter "Group=CSharpEndToEndTests"'
471+
arguments: '--filter "Group=CSharpEndToEndTests" -f $(targetFramework)'
453472
projects: |
454473
**\WebJobs.Script.Tests.Integration.csproj
455474
- task: DotNetCoreCLI@2
@@ -458,7 +477,7 @@ jobs:
458477
inputs:
459478
command: 'test'
460479
testRunTitle: "Node end to end tests"
461-
arguments: '--filter "Group=NodeEndToEndTests" --no-build'
480+
arguments: '--filter "Group=NodeEndToEndTests" --no-build -f $(targetFramework)'
462481
projects: |
463482
**\WebJobs.Script.Tests.Integration.csproj
464483
- task: DotNetCoreCLI@2
@@ -467,7 +486,7 @@ jobs:
467486
inputs:
468487
command: 'test'
469488
testRunTitle: "Direct load end to end tests"
470-
arguments: '--filter "Group=DirectLoadEndToEndTests" --no-build'
489+
arguments: '--filter "Group=DirectLoadEndToEndTests" --no-build -f $(targetFramework)'
471490
projects: |
472491
**\WebJobs.Script.Tests.Integration.csproj
473492
- task: DotNetCoreCLI@2
@@ -476,7 +495,7 @@ jobs:
476495
inputs:
477496
command: 'test'
478497
testRunTitle: "F# end to end tests"
479-
arguments: '--filter "Group=FSharpEndToEndTests" --no-build'
498+
arguments: '--filter "Group=FSharpEndToEndTests" --no-build -f $(targetFramework)'
480499
projects: |
481500
**\WebJobs.Script.Tests.Integration.csproj
482501
- task: DotNetCoreCLI@2
@@ -485,7 +504,7 @@ jobs:
485504
inputs:
486505
command: 'test'
487506
testRunTitle: "Language worker end to end tests"
488-
arguments: '--filter "Group=LanguageWorkerSelectionEndToEndTests" --no-build'
507+
arguments: '--filter "Group=LanguageWorkerSelectionEndToEndTests" --no-build -f $(targetFramework)'
489508
projects: |
490509
**\WebJobs.Script.Tests.Integration.csproj
491510
- task: DotNetCoreCLI@2
@@ -494,7 +513,7 @@ jobs:
494513
inputs:
495514
command: 'test'
496515
testRunTitle: "Node script host end to end tests"
497-
arguments: '--filter "Group=NodeScriptHostTests" --no-build'
516+
arguments: '--filter "Group=NodeScriptHostTests" --no-build -f $(targetFramework)'
498517
projects: |
499518
**\WebJobs.Script.Tests.Integration.csproj
500519
- task: DotNetCoreCLI@2
@@ -503,7 +522,7 @@ jobs:
503522
inputs:
504523
command: 'test'
505524
testRunTitle: "Raw assembly end to end tests"
506-
arguments: '--filter "Group=RawAssemblyEndToEndTests" --no-build'
525+
arguments: '--filter "Group=RawAssemblyEndToEndTests" --no-build -f $(targetFramework)'
507526
projects: |
508527
**\WebJobs.Script.Tests.Integration.csproj
509528
- task: DotNetCoreCLI@2
@@ -512,7 +531,7 @@ jobs:
512531
inputs:
513532
command: 'test'
514533
testRunTitle: "Samples end to end tests"
515-
arguments: '--filter "Group=SamplesEndToEndTests" --no-build'
534+
arguments: '--filter "Group=SamplesEndToEndTests" --no-build -f $(targetFramework)'
516535
projects: |
517536
**\WebJobs.Script.Tests.Integration.csproj
518537
- task: DotNetCoreCLI@2
@@ -521,7 +540,7 @@ jobs:
521540
inputs:
522541
command: 'test'
523542
testRunTitle: "Drain mode end to end tests"
524-
arguments: '--filter "Group=DrainModeEndToEndTests" --no-build'
543+
arguments: '--filter "Group=DrainModeEndToEndTests" --no-build -f $(targetFramework)'
525544
projects: |
526545
**\WebJobs.Script.Tests.Integration.csproj
527546
- task: DotNetCoreCLI@2
@@ -530,7 +549,7 @@ jobs:
530549
inputs:
531550
command: 'test'
532551
testRunTitle: "Standby mode end to end tests Windows"
533-
arguments: '--filter "Group=StandbyModeEndToEndTests_Windows" --no-build'
552+
arguments: '--filter "Group=StandbyModeEndToEndTests_Windows" --no-build -f $(targetFramework)'
534553
projects: |
535554
**\WebJobs.Script.Tests.Integration.csproj
536555
- task: DotNetCoreCLI@2
@@ -539,7 +558,7 @@ jobs:
539558
inputs:
540559
command: 'test'
541560
testRunTitle: "Standby mode end to end tests Linux"
542-
arguments: '--filter "Group=StandbyModeEndToEndTests_Linux" --no-build'
561+
arguments: '--filter "Group=StandbyModeEndToEndTests_Linux" --no-build -f $(targetFramework)'
543562
projects: |
544563
**\WebJobs.Script.Tests.Integration.csproj
545564
- task: DotNetCoreCLI@2
@@ -548,7 +567,7 @@ jobs:
548567
inputs:
549568
command: 'test'
550569
testRunTitle: "Linux container end to end tests Windows"
551-
arguments: '--filter "Group=ContainerInstanceTests" --no-build'
570+
arguments: '--filter "Group=ContainerInstanceTests" --no-build -f $(targetFramework)'
552571
projects: |
553572
**\WebJobs.Script.Tests.Integration.csproj
554573
- task: DotNetCoreCLI@2
@@ -557,7 +576,7 @@ jobs:
557576
inputs:
558577
command: 'test'
559578
testRunTitle: "Release verification tests"
560-
arguments: '--filter "Group=ReleaseTests" --no-build'
579+
arguments: '--filter "Group=ReleaseTests" --no-build -f $(targetFramework)'
561580
projects: |
562581
**\WebJobs.Script.Tests.Integration.csproj
563582
- task: PowerShell@2

‎src/WebJobs.Script.Grpc/WebJobs.Script.Grpc.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\common.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
5+
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
66
<PackageId>Microsoft.Azure.WebJobs.Script.Grpc</PackageId>
77
<AssemblyName>Microsoft.Azure.WebJobs.Script.Grpc</AssemblyName>
88
<RootNamespace>Microsoft.Azure.WebJobs.Script.Grpc</RootNamespace>

‎src/WebJobs.Script.WebHost/WebJobs.Script.WebHost.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
<PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.21.0" />
7373
<PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.8" />
7474
<PackageReference Include="Microsoft.Azure.AppService.Middleware.Functions" Version="1.5.4" />
75-
<PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.3.20240307.67" />
7675
<PackageReference Include="Microsoft.Azure.Cosmos.Table" Version="1.0.8" />
7776
<PackageReference Include="Microsoft.Azure.Storage.File" Version="11.1.7" />
7877

@@ -102,11 +101,13 @@
102101
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
103102
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.29" />
104103
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.29" />
104+
<PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.2.20220831.41" />
105105
</ItemGroup>
106106

107107
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
108108
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
109109
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.4" />
110+
<PackageReference Include="Microsoft.Azure.AppService.Proxy.Client" Version="2.3.20240307.67" />
110111
</ItemGroup>
111112

112113
<ItemGroup>

‎test/WebJobs.Script.Tests.Integration/WebHostEndToEnd/HostProcessLauncher.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public async Task StartHostAsync(ITestOutputHelper outputHelper = null)
5656
var dirPath = Path.GetDirectoryName(typeof(HostProcessLauncher).Assembly.Location);
5757
var dirName = new DirectoryInfo(dirPath).Name;
5858

59-
string workingDir = Path.Combine("..", "..", "WebJobs.Script.WebHost", $"{dirName}_net8.0");
59+
string workingDir = Path.Combine("..", "..", "WebJobs.Script.WebHost", $"{dirName}");
6060
workingDir = Path.GetFullPath(workingDir);
6161
string filePath = Path.Combine(workingDir, "Microsoft.Azure.WebJobs.Script.WebHost.exe");
6262

‎test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\..\build\common.props" />
33
<Import Project="..\..\build\python.props" />
44
<PropertyGroup>
5-
<TargetFramework>net8.0</TargetFramework>
5+
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<AssemblyName>Microsoft.Azure.WebJobs.Script.Tests.Integration</AssemblyName>
88
<RootNamespace>Microsoft.Azure.WebJobs.Script.Tests.Integration</RootNamespace>
@@ -61,6 +61,7 @@
6161
<ProjectReference Include="..\..\src\WebJobs.Script.WebHost\WebJobs.Script.WebHost.csproj" />
6262
<ProjectReference Include="..\..\src\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj" />
6363
<ProjectReference Include="..\TestFunctions\TestFunctions.csproj" Private="true" />
64+
<ProjectReference Include="..\CSharpPrecompiledTestProjects\**\*.csproj" ReferenceOutputAssembly="false" />
6465
</ItemGroup>
6566

6667
<ItemGroup>
@@ -110,10 +111,4 @@
110111
<Import Project="..\..\build\GrpcTestFix.targets" />
111112
<Import Project="..\WebJobs.Script.Tests.Shared\WebJobs.Script.Tests.Shared.projitems" Label="Shared" />
112113

113-
<!-- Ensure this is built for tests; we cannot have a project reference due to conflicting nuget references -->
114-
<Target Name="BuildTestProjects" AfterTargets="Build">
115-
<MSBuild Projects="..\CSharpPrecompiledTestProjects\CSharpPrecompiledTestProjects.sln" Targets="Restore" />
116-
<MSBuild Projects="..\CSharpPrecompiledTestProjects\CSharpPrecompiledTestProjects.sln" Targets="Publish" Properties="Configuration=Debug" />
117-
</Target>
118-
119114
</Project>

0 commit comments

Comments
 (0)