diff --git a/WebJobs.Script.sln b/WebJobs.Script.sln
index 2d03bba521..329c7f59d2 100644
--- a/WebJobs.Script.sln
+++ b/WebJobs.Script.sln
@@ -19,10 +19,6 @@ EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.WebHost", "src\WebJobs.Script.WebHost\WebJobs.Script.WebHost.csproj", "{D5162088-C119-4A06-896D-E65983CAEDFD}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}"
- ProjectSection(SolutionItems) = preProject
- src\WebJobs.Script.WebHost\appsettings.Development.json = src\WebJobs.Script.WebHost\appsettings.Development.json
- src\WebJobs.Script.WebHost\appsettings.json = src\WebJobs.Script.WebHost\appsettings.json
- EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Tests", "test\WebJobs.Script.Tests\WebJobs.Script.Tests.csproj", "{3BA93614-3A4A-49B0-BFBC-7831E2C02BB7}"
EndProject
@@ -32,8 +28,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Tests.Integr
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Grpc", "src\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj", "{38920568-003E-448F-963B-41B739D1E01C}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFunctions", "test\TestFunctions\TestFunctions.csproj", "{5C308A72-5CF3-45E8-B64F-2C98F567054A}"
-EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebJobs.Script.Abstractions", "src\WebJobs.Script.Abstractions\WebJobs.Script.Abstractions.csproj", "{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9111825C-9831-4672-8223-82F489853F19}"
@@ -43,28 +37,33 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Samples", "sample\Samples.csproj", "{F381CDD6-50BD-48BC-B292-230C52589A30}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{D5F77934-E468-4EE7-82F8-3B8149591174}"
- ProjectSection(SolutionItems) = preProject
- benchmarks\README.md = benchmarks\README.md
- EndProjectSection
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "perf", "perf", "{18C87032-2D3A-472E-A3E7-5F12D0CCB1F1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.Azure.WebJobs.Script.Benchmarks", "perf\WebJobs.Script.Benchmarks\Microsoft.Azure.WebJobs.Script.Benchmarks.csproj", "{7330A1D8-5A22-4AB8-9EE6-0BBDDB73A3BD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resources", "Resources", "{886F7C37-D94A-48EB-85D8-64FB9AC9D6FA}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestProjects", "TestProjects", "{B2312621-6D0A-429F-9A45-06B45CE69691}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoadContextRace", "test\Resources\TestProjects\AssemblyLoadContextRace\AssemblyLoadContextRace.csproj", "{7627A64D-C958-441F-9B59-1A44BE0DDCEE}"
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}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency55", "test\Resources\TestProjects\Dependency55\Dependency55.csproj", "{BBBC56A0-D27A-4B43-B401-2ADBFE27E934}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharpPrecompiledTestProjects", "CSharpPrecompiledTestProjects", "{B3ACC1B2-81F4-4035-9B24-169D4C7CB076}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency56", "test\Resources\TestProjects\Dependency56\Dependency56.csproj", "{3A3448DF-186D-49CE-A1B9-151EFF4D4E99}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency56", "test\CSharpPrecompiledTestProjects\Dependency56\Dependency56.csproj", "{504B98C7-F27F-4C02-9881-33048D4283CF}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetIsolated60", "test\Resources\TestProjects\DotNetIsolated60\DotNetIsolated60.csproj", "{4CC2E32D-5218-4B32-B0B0-2D3FF226B6A4}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeDependencyNoRuntimes", "test\CSharpPrecompiledTestProjects\NativeDependencyNoRuntimes\NativeDependencyNoRuntimes.csproj", "{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetIsolatedUnsupportedWorker", "test\Resources\TestProjects\DotNetIsolatedUnsupportedWorker\DotNetIsolatedUnsupportedWorker.csproj", "{EC30E842-9AD0-4F32-8D18-1A5C876CD6FB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobsStartupTests", "test\CSharpPrecompiledTestProjects\WebJobsStartupTests\WebJobsStartupTests.csproj", "{9D7556C5-C828-4C19-8EC9-E10030777E48}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultipleDependencyVersions", "test\Resources\TestProjects\MultipleDependencyVersions\MultipleDependencyVersions.csproj", "{BB42BA6A-5419-49DE-ADAB-5A295E0AA312}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoadContextRace", "test\CSharpPrecompiledTestProjects\AssemblyLoadContextRace\AssemblyLoadContextRace.csproj", "{29167303-5857-4BD5-9DDA-9EEA8C26CACC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeDependencyNoRuntimes", "test\Resources\TestProjects\NativeDependencyNoRuntimes\NativeDependencyNoRuntimes.csproj", "{99979ABE-EAC9-4C88-A933-4BF5DF1138F9}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency55", "test\CSharpPrecompiledTestProjects\Dependency55\Dependency55.csproj", "{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferenceOlderRuntimeAssembly", "test\Resources\TestProjects\ReferenceOlderRuntimeAssembly\ReferenceOlderRuntimeAssembly.csproj", "{AACC1353-EA9B-4FCE-A50F-6A27900C088C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferenceOlderRuntimeAssembly", "test\CSharpPrecompiledTestProjects\ReferenceOlderRuntimeAssembly\ReferenceOlderRuntimeAssembly.csproj", "{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestFunctions", "test\Resources\TestProjects\TestFunctions\TestFunctions.csproj", "{98B2CC4A-33EB-4310-B08D-3DB58630E981}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultipleDependencyVersions", "test\CSharpPrecompiledTestProjects\MultipleDependencyVersions\MultipleDependencyVersions.csproj", "{51E41947-888E-43BE-A1A9-6607AAED7B57}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobsStartupTests", "test\Resources\TestProjects\WebJobsStartupTests\WebJobsStartupTests.csproj", "{3746E49F-DD26-4CBD-B961-0ADF6EA84909}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -92,48 +91,56 @@ Global
{38920568-003E-448F-963B-41B739D1E01C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{38920568-003E-448F-963B-41B739D1E01C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{38920568-003E-448F-963B-41B739D1E01C}.Release|Any CPU.Build.0 = Release|Any CPU
- {5C308A72-5CF3-45E8-B64F-2C98F567054A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {5C308A72-5CF3-45E8-B64F-2C98F567054A}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {5C308A72-5CF3-45E8-B64F-2C98F567054A}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {5C308A72-5CF3-45E8-B64F-2C98F567054A}.Release|Any CPU.Build.0 = Release|Any CPU
{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C}.Release|Any CPU.Build.0 = Release|Any CPU
{F381CDD6-50BD-48BC-B292-230C52589A30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F381CDD6-50BD-48BC-B292-230C52589A30}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {766DE3D5-4FB1-4602-9BB5-3779EECC232D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {766DE3D5-4FB1-4602-9BB5-3779EECC232D}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {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
- {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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {504B98C7-F27F-4C02-9881-33048D4283CF}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {9D7556C5-C828-4C19-8EC9-E10030777E48}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Release|Any CPU.Build.0 = Release|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}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {51E41947-888E-43BE-A1A9-6607AAED7B57}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7330A1D8-5A22-4AB8-9EE6-0BBDDB73A3BD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7330A1D8-5A22-4AB8-9EE6-0BBDDB73A3BD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7330A1D8-5A22-4AB8-9EE6-0BBDDB73A3BD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7330A1D8-5A22-4AB8-9EE6-0BBDDB73A3BD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7627A64D-C958-441F-9B59-1A44BE0DDCEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7627A64D-C958-441F-9B59-1A44BE0DDCEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7627A64D-C958-441F-9B59-1A44BE0DDCEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7627A64D-C958-441F-9B59-1A44BE0DDCEE}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BBBC56A0-D27A-4B43-B401-2ADBFE27E934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BBBC56A0-D27A-4B43-B401-2ADBFE27E934}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BBBC56A0-D27A-4B43-B401-2ADBFE27E934}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BBBC56A0-D27A-4B43-B401-2ADBFE27E934}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3A3448DF-186D-49CE-A1B9-151EFF4D4E99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3A3448DF-186D-49CE-A1B9-151EFF4D4E99}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3A3448DF-186D-49CE-A1B9-151EFF4D4E99}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3A3448DF-186D-49CE-A1B9-151EFF4D4E99}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4CC2E32D-5218-4B32-B0B0-2D3FF226B6A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4CC2E32D-5218-4B32-B0B0-2D3FF226B6A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4CC2E32D-5218-4B32-B0B0-2D3FF226B6A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4CC2E32D-5218-4B32-B0B0-2D3FF226B6A4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EC30E842-9AD0-4F32-8D18-1A5C876CD6FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EC30E842-9AD0-4F32-8D18-1A5C876CD6FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EC30E842-9AD0-4F32-8D18-1A5C876CD6FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EC30E842-9AD0-4F32-8D18-1A5C876CD6FB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {BB42BA6A-5419-49DE-ADAB-5A295E0AA312}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {BB42BA6A-5419-49DE-ADAB-5A295E0AA312}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {BB42BA6A-5419-49DE-ADAB-5A295E0AA312}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {BB42BA6A-5419-49DE-ADAB-5A295E0AA312}.Release|Any CPU.Build.0 = Release|Any CPU
+ {99979ABE-EAC9-4C88-A933-4BF5DF1138F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {99979ABE-EAC9-4C88-A933-4BF5DF1138F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {99979ABE-EAC9-4C88-A933-4BF5DF1138F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {99979ABE-EAC9-4C88-A933-4BF5DF1138F9}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AACC1353-EA9B-4FCE-A50F-6A27900C088C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AACC1353-EA9B-4FCE-A50F-6A27900C088C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AACC1353-EA9B-4FCE-A50F-6A27900C088C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AACC1353-EA9B-4FCE-A50F-6A27900C088C}.Release|Any CPU.Build.0 = Release|Any CPU
+ {98B2CC4A-33EB-4310-B08D-3DB58630E981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {98B2CC4A-33EB-4310-B08D-3DB58630E981}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {98B2CC4A-33EB-4310-B08D-3DB58630E981}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {98B2CC4A-33EB-4310-B08D-3DB58630E981}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3746E49F-DD26-4CBD-B961-0ADF6EA84909}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -146,17 +153,20 @@ Global
{35C9CCB7-D8B6-4161-BB0D-BCFA7C6DCFFB} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
{EDDDAED1-0E37-4ED7-A595-63F686DEE90A} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
{38920568-003E-448F-963B-41B739D1E01C} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
- {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}
+ {7330A1D8-5A22-4AB8-9EE6-0BBDDB73A3BD} = {18C87032-2D3A-472E-A3E7-5F12D0CCB1F1}
+ {886F7C37-D94A-48EB-85D8-64FB9AC9D6FA} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
+ {B2312621-6D0A-429F-9A45-06B45CE69691} = {886F7C37-D94A-48EB-85D8-64FB9AC9D6FA}
+ {7627A64D-C958-441F-9B59-1A44BE0DDCEE} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {BBBC56A0-D27A-4B43-B401-2ADBFE27E934} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {3A3448DF-186D-49CE-A1B9-151EFF4D4E99} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {4CC2E32D-5218-4B32-B0B0-2D3FF226B6A4} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {EC30E842-9AD0-4F32-8D18-1A5C876CD6FB} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {BB42BA6A-5419-49DE-ADAB-5A295E0AA312} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {99979ABE-EAC9-4C88-A933-4BF5DF1138F9} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {AACC1353-EA9B-4FCE-A50F-6A27900C088C} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {98B2CC4A-33EB-4310-B08D-3DB58630E981} = {B2312621-6D0A-429F-9A45-06B45CE69691}
+ {3746E49F-DD26-4CBD-B961-0ADF6EA84909} = {B2312621-6D0A-429F-9A45-06B45CE69691}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {85400884-5FFD-4C27-A571-58CB3C8CAAC5}
diff --git a/eng/ci/templates/official/jobs/run-coldstart.yml b/eng/ci/templates/official/jobs/run-coldstart.yml
index 51ea8d2535..a38bc61b95 100644
--- a/eng/ci/templates/official/jobs/run-coldstart.yml
+++ b/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
diff --git a/eng/ci/templates/official/jobs/setup-benchmark-agents.yml b/eng/ci/templates/official/jobs/setup-benchmark-agents.yml
index a5188c20f5..7be5f385bb 100644
--- a/eng/ci/templates/official/jobs/setup-benchmark-agents.yml
+++ b/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
diff --git a/test/Performance/Apps/HelloHttpNet9/Hello.cs b/perf/Apps/HelloHttpNet9/Hello.cs
similarity index 100%
rename from test/Performance/Apps/HelloHttpNet9/Hello.cs
rename to perf/Apps/HelloHttpNet9/Hello.cs
diff --git a/test/Performance/Apps/HelloHttpNet9/HelloHttp.csproj b/perf/Apps/HelloHttpNet9/HelloHttp.csproj
similarity index 99%
rename from test/Performance/Apps/HelloHttpNet9/HelloHttp.csproj
rename to perf/Apps/HelloHttpNet9/HelloHttp.csproj
index 5b0003fa26..48721cef29 100644
--- a/test/Performance/Apps/HelloHttpNet9/HelloHttp.csproj
+++ b/perf/Apps/HelloHttpNet9/HelloHttp.csproj
@@ -1,4 +1,5 @@
+
net9.0
v4
@@ -7,10 +8,12 @@
enable
true
+
+
\ No newline at end of file
diff --git a/test/Performance/Apps/HelloHttpNet9/Program.cs b/perf/Apps/HelloHttpNet9/Program.cs
similarity index 100%
rename from test/Performance/Apps/HelloHttpNet9/Program.cs
rename to perf/Apps/HelloHttpNet9/Program.cs
diff --git a/test/DotNetIsolatedUnsupportedWorker/host.json b/perf/Apps/HelloHttpNet9/host.json
similarity index 100%
rename from test/DotNetIsolatedUnsupportedWorker/host.json
rename to perf/Apps/HelloHttpNet9/host.json
diff --git a/test/Performance/Apps/HelloHttpNet9NoProxy/Hello.cs b/perf/Apps/HelloHttpNet9NoProxy/Hello.cs
similarity index 100%
rename from test/Performance/Apps/HelloHttpNet9NoProxy/Hello.cs
rename to perf/Apps/HelloHttpNet9NoProxy/Hello.cs
diff --git a/test/Performance/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj b/perf/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj
similarity index 99%
rename from test/Performance/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj
rename to perf/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj
index 616ed44d20..a3f4815c55 100644
--- a/test/Performance/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj
+++ b/perf/Apps/HelloHttpNet9NoProxy/HelloHttp.csproj
@@ -1,4 +1,5 @@
+
net9.0
v4
@@ -7,10 +8,12 @@
enable
true
+
+
\ No newline at end of file
diff --git a/test/Performance/Apps/HelloHttpNet9NoProxy/Program.cs b/perf/Apps/HelloHttpNet9NoProxy/Program.cs
similarity index 100%
rename from test/Performance/Apps/HelloHttpNet9NoProxy/Program.cs
rename to perf/Apps/HelloHttpNet9NoProxy/Program.cs
diff --git a/test/Performance/Apps/HelloHttpNet9NoProxy/host.json b/perf/Apps/HelloHttpNet9NoProxy/host.json
similarity index 100%
rename from test/Performance/Apps/HelloHttpNet9NoProxy/host.json
rename to perf/Apps/HelloHttpNet9NoProxy/host.json
diff --git a/test/Performance/Apps/global.json b/perf/Apps/global.json
similarity index 100%
rename from test/Performance/Apps/global.json
rename to perf/Apps/global.json
diff --git a/benchmarks/WebJobs.Script.Benchmarks/AuthUtilityBenchmarks.cs b/perf/WebJobs.Script.Benchmarks/AuthUtilityBenchmarks.cs
similarity index 100%
rename from benchmarks/WebJobs.Script.Benchmarks/AuthUtilityBenchmarks.cs
rename to perf/WebJobs.Script.Benchmarks/AuthUtilityBenchmarks.cs
diff --git a/benchmarks/WebJobs.Script.Benchmarks/CSharpCompilationBenchmarks.cs b/perf/WebJobs.Script.Benchmarks/CSharpCompilationBenchmarks.cs
similarity index 100%
rename from benchmarks/WebJobs.Script.Benchmarks/CSharpCompilationBenchmarks.cs
rename to perf/WebJobs.Script.Benchmarks/CSharpCompilationBenchmarks.cs
diff --git a/benchmarks/WebJobs.Script.Benchmarks/GrpcMessageConversionBenchmarks.cs b/perf/WebJobs.Script.Benchmarks/GrpcMessageConversionBenchmarks.cs
similarity index 100%
rename from benchmarks/WebJobs.Script.Benchmarks/GrpcMessageConversionBenchmarks.cs
rename to perf/WebJobs.Script.Benchmarks/GrpcMessageConversionBenchmarks.cs
diff --git a/benchmarks/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj b/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj
similarity index 89%
rename from benchmarks/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj
rename to perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj
index 0c065657e8..8aba112cd7 100644
--- a/benchmarks/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj
+++ b/perf/WebJobs.Script.Benchmarks/Microsoft.Azure.WebJobs.Script.Benchmarks.csproj
@@ -1,15 +1,17 @@
+
net8.0
Exe
-
Microsoft.Azure.WebJobs.Script.Benchmarks
Latest
+
+
\ No newline at end of file
diff --git a/benchmarks/WebJobs.Script.Benchmarks/Program.cs b/perf/WebJobs.Script.Benchmarks/Program.cs
similarity index 100%
rename from benchmarks/WebJobs.Script.Benchmarks/Program.cs
rename to perf/WebJobs.Script.Benchmarks/Program.cs
diff --git a/benchmarks/README.md b/perf/WebJobs.Script.Benchmarks/README.md
similarity index 100%
rename from benchmarks/README.md
rename to perf/WebJobs.Script.Benchmarks/README.md
diff --git a/benchmarks/WebJobs.Script.Benchmarks/RecommendedConfig.cs b/perf/WebJobs.Script.Benchmarks/RecommendedConfig.cs
similarity index 100%
rename from benchmarks/WebJobs.Script.Benchmarks/RecommendedConfig.cs
rename to perf/WebJobs.Script.Benchmarks/RecommendedConfig.cs
diff --git a/benchmarks/WebJobs.Script.Benchmarks/SanitizerBenchmarks.cs b/perf/WebJobs.Script.Benchmarks/SanitizerBenchmarks.cs
similarity index 100%
rename from benchmarks/WebJobs.Script.Benchmarks/SanitizerBenchmarks.cs
rename to perf/WebJobs.Script.Benchmarks/SanitizerBenchmarks.cs
diff --git a/benchmarks/WebJobs.Script.Benchmarks/ScriptLoggingBuilderExtensionsBenchmarks.cs b/perf/WebJobs.Script.Benchmarks/ScriptLoggingBuilderExtensionsBenchmarks.cs
similarity index 100%
rename from benchmarks/WebJobs.Script.Benchmarks/ScriptLoggingBuilderExtensionsBenchmarks.cs
rename to perf/WebJobs.Script.Benchmarks/ScriptLoggingBuilderExtensionsBenchmarks.cs
diff --git a/src/WebJobs.Script/app.config b/src/WebJobs.Script/app.config
deleted file mode 100644
index f775448c4d..0000000000
--- a/src/WebJobs.Script/app.config
+++ /dev/null
@@ -1,165 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj b/test/Resources/TestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj
similarity index 58%
rename from test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj
rename to test/Resources/TestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj
index 952a5972f0..919cddaa7a 100644
--- a/test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj
+++ b/test/Resources/TestProjects/AssemblyLoadContextRace/AssemblyLoadContextRace.csproj
@@ -1,20 +1,19 @@
+
net6.0
v4
<_FunctionsSkipCleanOutput>true
-
+
+
+
-
- PreserveNewest
-
-
- PreserveNewest
- Never
-
+
+
+
diff --git a/test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/Function1.cs b/test/Resources/TestProjects/AssemblyLoadContextRace/Function1.cs
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/Function1.cs
rename to test/Resources/TestProjects/AssemblyLoadContextRace/Function1.cs
diff --git a/test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/host.json b/test/Resources/TestProjects/AssemblyLoadContextRace/host.json
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/AssemblyLoadContextRace/host.json
rename to test/Resources/TestProjects/AssemblyLoadContextRace/host.json
diff --git a/test/CSharpPrecompiledTestProjects/Dependency55/Dependency55.csproj b/test/Resources/TestProjects/Dependency55/Dependency55.csproj
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/Dependency55/Dependency55.csproj
rename to test/Resources/TestProjects/Dependency55/Dependency55.csproj
diff --git a/test/CSharpPrecompiledTestProjects/Dependency55/TypeGetter.cs b/test/Resources/TestProjects/Dependency55/TypeGetter.cs
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/Dependency55/TypeGetter.cs
rename to test/Resources/TestProjects/Dependency55/TypeGetter.cs
diff --git a/test/CSharpPrecompiledTestProjects/Dependency56/Dependency56.csproj b/test/Resources/TestProjects/Dependency56/Dependency56.csproj
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/Dependency56/Dependency56.csproj
rename to test/Resources/TestProjects/Dependency56/Dependency56.csproj
diff --git a/test/CSharpPrecompiledTestProjects/Dependency56/TypeGetter.cs b/test/Resources/TestProjects/Dependency56/TypeGetter.cs
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/Dependency56/TypeGetter.cs
rename to test/Resources/TestProjects/Dependency56/TypeGetter.cs
diff --git a/test/DotNetIsolated60/DotNetIsolated60.csproj b/test/Resources/TestProjects/DotNetIsolated60/DotNetIsolated60.csproj
similarity index 75%
rename from test/DotNetIsolated60/DotNetIsolated60.csproj
rename to test/Resources/TestProjects/DotNetIsolated60/DotNetIsolated60.csproj
index 3d6990daec..93d6aa7203 100644
--- a/test/DotNetIsolated60/DotNetIsolated60.csproj
+++ b/test/Resources/TestProjects/DotNetIsolated60/DotNetIsolated60.csproj
@@ -1,4 +1,5 @@
+
net6.0
v4
@@ -10,6 +11,7 @@
True
false
+
@@ -18,16 +20,10 @@
+
-
- PreserveNewest
-
-
- PreserveNewest
- Never
-
-
-
-
+
+
+
diff --git a/test/DotNetIsolated60/HttpRequestDataFunction.cs b/test/Resources/TestProjects/DotNetIsolated60/HttpRequestDataFunction.cs
similarity index 100%
rename from test/DotNetIsolated60/HttpRequestDataFunction.cs
rename to test/Resources/TestProjects/DotNetIsolated60/HttpRequestDataFunction.cs
diff --git a/test/DotNetIsolated60/HttpRequestFunction.cs b/test/Resources/TestProjects/DotNetIsolated60/HttpRequestFunction.cs
similarity index 100%
rename from test/DotNetIsolated60/HttpRequestFunction.cs
rename to test/Resources/TestProjects/DotNetIsolated60/HttpRequestFunction.cs
diff --git a/test/DotNetIsolated60/Program.cs b/test/Resources/TestProjects/DotNetIsolated60/Program.cs
similarity index 100%
rename from test/DotNetIsolated60/Program.cs
rename to test/Resources/TestProjects/DotNetIsolated60/Program.cs
diff --git a/test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/Properties/serviceDependencies.json b/test/Resources/TestProjects/DotNetIsolated60/Properties/serviceDependencies.json
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/Properties/serviceDependencies.json
rename to test/Resources/TestProjects/DotNetIsolated60/Properties/serviceDependencies.json
diff --git a/test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/Properties/serviceDependencies.local.json b/test/Resources/TestProjects/DotNetIsolated60/Properties/serviceDependencies.local.json
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/Properties/serviceDependencies.local.json
rename to test/Resources/TestProjects/DotNetIsolated60/Properties/serviceDependencies.local.json
diff --git a/test/DotNetIsolated60/QueueFunction.cs b/test/Resources/TestProjects/DotNetIsolated60/QueueFunction.cs
similarity index 100%
rename from test/DotNetIsolated60/QueueFunction.cs
rename to test/Resources/TestProjects/DotNetIsolated60/QueueFunction.cs
diff --git a/test/DotNetIsolated60/host.json b/test/Resources/TestProjects/DotNetIsolated60/host.json
similarity index 100%
rename from test/DotNetIsolated60/host.json
rename to test/Resources/TestProjects/DotNetIsolated60/host.json
diff --git a/test/DotNetIsolatedUnsupportedWorker/DotNetIsolatedUnsupportedWorker.csproj b/test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/DotNetIsolatedUnsupportedWorker.csproj
similarity index 72%
rename from test/DotNetIsolatedUnsupportedWorker/DotNetIsolatedUnsupportedWorker.csproj
rename to test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/DotNetIsolatedUnsupportedWorker.csproj
index 44708d3475..f19aafbd1e 100644
--- a/test/DotNetIsolatedUnsupportedWorker/DotNetIsolatedUnsupportedWorker.csproj
+++ b/test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/DotNetIsolatedUnsupportedWorker.csproj
@@ -1,4 +1,5 @@
+
net6.0
v4
@@ -8,6 +9,7 @@
True
false
+
@@ -16,16 +18,10 @@
+
-
- PreserveNewest
-
-
- PreserveNewest
- Never
-
-
-
-
+
+
+
diff --git a/test/DotNetIsolatedUnsupportedWorker/HttpRequestDataFunction.cs b/test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/HttpRequestDataFunction.cs
similarity index 100%
rename from test/DotNetIsolatedUnsupportedWorker/HttpRequestDataFunction.cs
rename to test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/HttpRequestDataFunction.cs
diff --git a/test/DotNetIsolatedUnsupportedWorker/HttpRequestFunction.cs b/test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/HttpRequestFunction.cs
similarity index 100%
rename from test/DotNetIsolatedUnsupportedWorker/HttpRequestFunction.cs
rename to test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/HttpRequestFunction.cs
diff --git a/test/DotNetIsolatedUnsupportedWorker/Program.cs b/test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/Program.cs
similarity index 100%
rename from test/DotNetIsolatedUnsupportedWorker/Program.cs
rename to test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/Program.cs
diff --git a/test/DotNetIsolatedUnsupportedWorker/QueueFunction.cs b/test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/QueueFunction.cs
similarity index 100%
rename from test/DotNetIsolatedUnsupportedWorker/QueueFunction.cs
rename to test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/QueueFunction.cs
diff --git a/test/Performance/Apps/HelloHttpNet9/host.json b/test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/host.json
similarity index 95%
rename from test/Performance/Apps/HelloHttpNet9/host.json
rename to test/Resources/TestProjects/DotNetIsolatedUnsupportedWorker/host.json
index d4f2d4120c..ee5cf5f83f 100644
--- a/test/Performance/Apps/HelloHttpNet9/host.json
+++ b/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
+ }
+ }
}
\ No newline at end of file
diff --git a/test/EmptyScriptRoot/host.json b/test/Resources/TestProjects/EmptyScriptRoot/host.json
similarity index 100%
rename from test/EmptyScriptRoot/host.json
rename to test/Resources/TestProjects/EmptyScriptRoot/host.json
diff --git a/test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.cs b/test/Resources/TestProjects/MultipleDependencyVersions/MultipleDependencyVersions.cs
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.cs
rename to test/Resources/TestProjects/MultipleDependencyVersions/MultipleDependencyVersions.cs
diff --git a/test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj b/test/Resources/TestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj
similarity index 65%
rename from test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj
rename to test/Resources/TestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj
index 40fd9215ee..8bba7a79cc 100644
--- a/test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj
+++ b/test/Resources/TestProjects/MultipleDependencyVersions/MultipleDependencyVersions.csproj
@@ -1,23 +1,23 @@
+
net6.0
v4
<_FunctionsSkipCleanOutput>true
+
+
+
-
- PreserveNewest
-
-
- PreserveNewest
- Never
-
+
+
+
diff --git a/test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/host.json b/test/Resources/TestProjects/MultipleDependencyVersions/host.json
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/MultipleDependencyVersions/host.json
rename to test/Resources/TestProjects/MultipleDependencyVersions/host.json
diff --git a/test/CSharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.cs b/test/Resources/TestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.cs
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.cs
rename to test/Resources/TestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.cs
diff --git a/test/CSharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj b/test/Resources/TestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj
similarity index 54%
rename from test/CSharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj
rename to test/Resources/TestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj
index 4218cc35ec..1e55a767b5 100644
--- a/test/CSharpPrecompiledTestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj
+++ b/test/Resources/TestProjects/NativeDependencyNoRuntimes/NativeDependencyNoRuntimes.csproj
@@ -1,23 +1,23 @@
+
net6.0
- v4
+ v4
+
+
-
- PreserveNewest
-
-
- PreserveNewest
- Never
-
+
+
+
-
+
+
diff --git a/test/CSharpPrecompiledTestProjects/NativeDependencyNoRuntimes/host.json b/test/Resources/TestProjects/NativeDependencyNoRuntimes/host.json
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/NativeDependencyNoRuntimes/host.json
rename to test/Resources/TestProjects/NativeDependencyNoRuntimes/host.json
diff --git a/test/DotNetIsolated60/Properties/serviceDependencies.json b/test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/Properties/serviceDependencies.json
similarity index 100%
rename from test/DotNetIsolated60/Properties/serviceDependencies.json
rename to test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/Properties/serviceDependencies.json
diff --git a/test/DotNetIsolated60/Properties/serviceDependencies.local.json b/test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/Properties/serviceDependencies.local.json
similarity index 100%
rename from test/DotNetIsolated60/Properties/serviceDependencies.local.json
rename to test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/Properties/serviceDependencies.local.json
diff --git a/test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.cs b/test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.cs
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.cs
rename to test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.cs
diff --git a/test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj b/test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj
similarity index 66%
rename from test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj
rename to test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj
index c11310e598..3d3a6b0efd 100644
--- a/test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj
+++ b/test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/ReferenceOlderRuntimeAssembly.csproj
@@ -1,21 +1,20 @@
+
net6.0
v4
<_FunctionsSkipCleanOutput>true
+
+
-
- PreserveNewest
-
-
- PreserveNewest
- Never
-
+
+
+
diff --git a/test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/host.json b/test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/host.json
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/ReferenceOlderRuntimeAssembly/host.json
rename to test/Resources/TestProjects/ReferenceOlderRuntimeAssembly/host.json
diff --git a/test/TestFunctions/Functions.cs b/test/Resources/TestProjects/TestFunctions/Functions.cs
similarity index 100%
rename from test/TestFunctions/Functions.cs
rename to test/Resources/TestProjects/TestFunctions/Functions.cs
diff --git a/test/TestFunctions/TestFunctions.csproj b/test/Resources/TestProjects/TestFunctions/TestFunctions.csproj
similarity index 100%
rename from test/TestFunctions/TestFunctions.csproj
rename to test/Resources/TestProjects/TestFunctions/TestFunctions.csproj
diff --git a/test/CSharpPrecompiledTestProjects/WebJobsStartupTests/Function1.cs b/test/Resources/TestProjects/WebJobsStartupTests/Function1.cs
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/WebJobsStartupTests/Function1.cs
rename to test/Resources/TestProjects/WebJobsStartupTests/Function1.cs
diff --git a/test/CSharpPrecompiledTestProjects/WebJobsStartupTests/Startup.cs b/test/Resources/TestProjects/WebJobsStartupTests/Startup.cs
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/WebJobsStartupTests/Startup.cs
rename to test/Resources/TestProjects/WebJobsStartupTests/Startup.cs
diff --git a/test/CSharpPrecompiledTestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj b/test/Resources/TestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj
similarity index 68%
rename from test/CSharpPrecompiledTestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj
rename to test/Resources/TestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj
index cd63db01fb..c2073dde8c 100644
--- a/test/CSharpPrecompiledTestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj
+++ b/test/Resources/TestProjects/WebJobsStartupTests/WebJobsStartupTests.csproj
@@ -11,9 +11,8 @@
-
- PreserveNewest
-
+
+
diff --git a/test/CSharpPrecompiledTestProjects/WebJobsStartupTests/host.json b/test/Resources/TestProjects/WebJobsStartupTests/host.json
similarity index 100%
rename from test/CSharpPrecompiledTestProjects/WebJobsStartupTests/host.json
rename to test/Resources/TestProjects/WebJobsStartupTests/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/AssembliesFromSharedLocation/function.json b/test/Resources/TestScripts/CSharp/AssembliesFromSharedLocation/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/AssembliesFromSharedLocation/function.json
rename to test/Resources/TestScripts/CSharp/AssembliesFromSharedLocation/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/AssembliesFromSharedLocation/run.csx b/test/Resources/TestScripts/CSharp/AssembliesFromSharedLocation/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/AssembliesFromSharedLocation/run.csx
rename to test/Resources/TestScripts/CSharp/AssembliesFromSharedLocation/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBIn/function.json b/test/Resources/TestScripts/CSharp/CosmosDBIn/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBIn/function.json
rename to test/Resources/TestScripts/CSharp/CosmosDBIn/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBIn/run.csx b/test/Resources/TestScripts/CSharp/CosmosDBIn/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBIn/run.csx
rename to test/Resources/TestScripts/CSharp/CosmosDBIn/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBOut/function.json b/test/Resources/TestScripts/CSharp/CosmosDBOut/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBOut/function.json
rename to test/Resources/TestScripts/CSharp/CosmosDBOut/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBOut/run.csx b/test/Resources/TestScripts/CSharp/CosmosDBOut/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBOut/run.csx
rename to test/Resources/TestScripts/CSharp/CosmosDBOut/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBTrigger/function.json b/test/Resources/TestScripts/CSharp/CosmosDBTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBTrigger/function.json
rename to test/Resources/TestScripts/CSharp/CosmosDBTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBTrigger/run.csx b/test/Resources/TestScripts/CSharp/CosmosDBTrigger/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CosmosDBTrigger/run.csx
rename to test/Resources/TestScripts/CSharp/CosmosDBTrigger/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CustomTrigger/function.json b/test/Resources/TestScripts/CSharp/CustomTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CustomTrigger/function.json
rename to test/Resources/TestScripts/CSharp/CustomTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CustomTrigger/run.csx b/test/Resources/TestScripts/CSharp/CustomTrigger/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/CustomTrigger/run.csx
rename to test/Resources/TestScripts/CSharp/CustomTrigger/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/FunctionExecutionContext/function.json b/test/Resources/TestScripts/CSharp/FunctionExecutionContext/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/FunctionExecutionContext/function.json
rename to test/Resources/TestScripts/CSharp/FunctionExecutionContext/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/FunctionExecutionContext/run.csx b/test/Resources/TestScripts/CSharp/FunctionExecutionContext/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/FunctionExecutionContext/run.csx
rename to test/Resources/TestScripts/CSharp/FunctionExecutionContext/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/FunctionIndexingError/function.json b/test/Resources/TestScripts/CSharp/FunctionIndexingError/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/FunctionIndexingError/function.json
rename to test/Resources/TestScripts/CSharp/FunctionIndexingError/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/FunctionIndexingError/run.csx b/test/Resources/TestScripts/CSharp/FunctionIndexingError/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/FunctionIndexingError/run.csx
rename to test/Resources/TestScripts/CSharp/FunctionIndexingError/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Dynamic/function.json b/test/Resources/TestScripts/CSharp/HttpTrigger-Dynamic/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Dynamic/function.json
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Dynamic/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Dynamic/run.csx b/test/Resources/TestScripts/CSharp/HttpTrigger-Dynamic/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Dynamic/run.csx
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Dynamic/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-FunctionAuth/function.json b/test/Resources/TestScripts/CSharp/HttpTrigger-FunctionAuth/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-FunctionAuth/function.json
rename to test/Resources/TestScripts/CSharp/HttpTrigger-FunctionAuth/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-FunctionAuth/run.csx b/test/Resources/TestScripts/CSharp/HttpTrigger-FunctionAuth/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-FunctionAuth/run.csx
rename to test/Resources/TestScripts/CSharp/HttpTrigger-FunctionAuth/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Model-v2/function.json b/test/Resources/TestScripts/CSharp/HttpTrigger-Model-v2/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Model-v2/function.json
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Model-v2/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Model-v2/run.csx b/test/Resources/TestScripts/CSharp/HttpTrigger-Model-v2/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Model-v2/run.csx
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Model-v2/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Model/function.json b/test/Resources/TestScripts/CSharp/HttpTrigger-Model/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Model/function.json
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Model/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Model/run.csx b/test/Resources/TestScripts/CSharp/HttpTrigger-Model/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Model/run.csx
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Model/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Redirect/function.json b/test/Resources/TestScripts/CSharp/HttpTrigger-Redirect/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Redirect/function.json
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Redirect/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Redirect/run.csx b/test/Resources/TestScripts/CSharp/HttpTrigger-Redirect/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Redirect/run.csx
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Redirect/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Routed/function.json b/test/Resources/TestScripts/CSharp/HttpTrigger-Routed/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Routed/function.json
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Routed/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Routed/run.csx b/test/Resources/TestScripts/CSharp/HttpTrigger-Routed/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Routed/run.csx
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Routed/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Scenarios/function.json b/test/Resources/TestScripts/CSharp/HttpTrigger-Scenarios/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Scenarios/function.json
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Scenarios/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Scenarios/run.csx b/test/Resources/TestScripts/CSharp/HttpTrigger-Scenarios/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTrigger-Scenarios/run.csx
rename to test/Resources/TestScripts/CSharp/HttpTrigger-Scenarios/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTriggerToBlob/function.json b/test/Resources/TestScripts/CSharp/HttpTriggerToBlob/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTriggerToBlob/function.json
rename to test/Resources/TestScripts/CSharp/HttpTriggerToBlob/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTriggerToBlob/run.csx b/test/Resources/TestScripts/CSharp/HttpTriggerToBlob/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/HttpTriggerToBlob/run.csx
rename to test/Resources/TestScripts/CSharp/HttpTriggerToBlob/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/LoadScriptReference/class.csx b/test/Resources/TestScripts/CSharp/LoadScriptReference/class.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/LoadScriptReference/class.csx
rename to test/Resources/TestScripts/CSharp/LoadScriptReference/class.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/LoadScriptReference/function.json b/test/Resources/TestScripts/CSharp/LoadScriptReference/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/LoadScriptReference/function.json
rename to test/Resources/TestScripts/CSharp/LoadScriptReference/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/LoadScriptReference/run.csx b/test/Resources/TestScripts/CSharp/LoadScriptReference/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/LoadScriptReference/run.csx
rename to test/Resources/TestScripts/CSharp/LoadScriptReference/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ManualTrigger/function.json b/test/Resources/TestScripts/CSharp/ManualTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ManualTrigger/function.json
rename to test/Resources/TestScripts/CSharp/ManualTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ManualTrigger/run.csx b/test/Resources/TestScripts/CSharp/ManualTrigger/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ManualTrigger/run.csx
rename to test/Resources/TestScripts/CSharp/ManualTrigger/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MissingAssemblies/function.json b/test/Resources/TestScripts/CSharp/MissingAssemblies/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MissingAssemblies/function.json
rename to test/Resources/TestScripts/CSharp/MissingAssemblies/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MissingAssemblies/project.json b/test/Resources/TestScripts/CSharp/MissingAssemblies/project.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MissingAssemblies/project.json
rename to test/Resources/TestScripts/CSharp/MissingAssemblies/project.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MissingAssemblies/run.csx b/test/Resources/TestScripts/CSharp/MissingAssemblies/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MissingAssemblies/run.csx
rename to test/Resources/TestScripts/CSharp/MissingAssemblies/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MobileTableIn/function.json b/test/Resources/TestScripts/CSharp/MobileTableIn/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MobileTableIn/function.json
rename to test/Resources/TestScripts/CSharp/MobileTableIn/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MobileTableIn/run.csx b/test/Resources/TestScripts/CSharp/MobileTableIn/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MobileTableIn/run.csx
rename to test/Resources/TestScripts/CSharp/MobileTableIn/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MobileTableOut/function.json b/test/Resources/TestScripts/CSharp/MobileTableOut/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MobileTableOut/function.json
rename to test/Resources/TestScripts/CSharp/MobileTableOut/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MobileTableOut/run.csx b/test/Resources/TestScripts/CSharp/MobileTableOut/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MobileTableOut/run.csx
rename to test/Resources/TestScripts/CSharp/MobileTableOut/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MultipleOutputs/function.json b/test/Resources/TestScripts/CSharp/MultipleOutputs/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MultipleOutputs/function.json
rename to test/Resources/TestScripts/CSharp/MultipleOutputs/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MultipleOutputs/run.csx b/test/Resources/TestScripts/CSharp/MultipleOutputs/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MultipleOutputs/run.csx
rename to test/Resources/TestScripts/CSharp/MultipleOutputs/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MultipleTriggers/function.json b/test/Resources/TestScripts/CSharp/MultipleTriggers/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MultipleTriggers/function.json
rename to test/Resources/TestScripts/CSharp/MultipleTriggers/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MultipleTriggers/run.csx b/test/Resources/TestScripts/CSharp/MultipleTriggers/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/MultipleTriggers/run.csx
rename to test/Resources/TestScripts/CSharp/MultipleTriggers/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubNative/function.json b/test/Resources/TestScripts/CSharp/NotificationHubNative/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubNative/function.json
rename to test/Resources/TestScripts/CSharp/NotificationHubNative/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubNative/run.csx b/test/Resources/TestScripts/CSharp/NotificationHubNative/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubNative/run.csx
rename to test/Resources/TestScripts/CSharp/NotificationHubNative/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubOut/function.json b/test/Resources/TestScripts/CSharp/NotificationHubOut/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubOut/function.json
rename to test/Resources/TestScripts/CSharp/NotificationHubOut/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubOut/run.csx b/test/Resources/TestScripts/CSharp/NotificationHubOut/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubOut/run.csx
rename to test/Resources/TestScripts/CSharp/NotificationHubOut/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubOutNotification/function.json b/test/Resources/TestScripts/CSharp/NotificationHubOutNotification/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubOutNotification/function.json
rename to test/Resources/TestScripts/CSharp/NotificationHubOutNotification/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubOutNotification/run.csx b/test/Resources/TestScripts/CSharp/NotificationHubOutNotification/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/NotificationHubOutNotification/run.csx
rename to test/Resources/TestScripts/CSharp/NotificationHubOutNotification/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/OneSecondTimer/function.json b/test/Resources/TestScripts/CSharp/OneSecondTimer/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/OneSecondTimer/function.json
rename to test/Resources/TestScripts/CSharp/OneSecondTimer/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/OneSecondTimer/run.csx b/test/Resources/TestScripts/CSharp/OneSecondTimer/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/OneSecondTimer/run.csx
rename to test/Resources/TestScripts/CSharp/OneSecondTimer/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/QueueTriggerToBlob/function.json b/test/Resources/TestScripts/CSharp/QueueTriggerToBlob/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/QueueTriggerToBlob/function.json
rename to test/Resources/TestScripts/CSharp/QueueTriggerToBlob/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/QueueTriggerToBlob/run.csx b/test/Resources/TestScripts/CSharp/QueueTriggerToBlob/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/QueueTriggerToBlob/run.csx
rename to test/Resources/TestScripts/CSharp/QueueTriggerToBlob/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/QueueTriggerToBlobRichTypes/function.json b/test/Resources/TestScripts/CSharp/QueueTriggerToBlobRichTypes/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/QueueTriggerToBlobRichTypes/function.json
rename to test/Resources/TestScripts/CSharp/QueueTriggerToBlobRichTypes/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/QueueTriggerToBlobRichTypes/run.csx b/test/Resources/TestScripts/CSharp/QueueTriggerToBlobRichTypes/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/QueueTriggerToBlobRichTypes/run.csx
rename to test/Resources/TestScripts/CSharp/QueueTriggerToBlobRichTypes/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/Scenarios/function.json b/test/Resources/TestScripts/CSharp/Scenarios/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/Scenarios/function.json
rename to test/Resources/TestScripts/CSharp/Scenarios/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/Scenarios/run.csx b/test/Resources/TestScripts/CSharp/Scenarios/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/Scenarios/run.csx
rename to test/Resources/TestScripts/CSharp/Scenarios/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusQueueTriggerAndOutput/function.json b/test/Resources/TestScripts/CSharp/ServiceBusQueueTriggerAndOutput/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusQueueTriggerAndOutput/function.json
rename to test/Resources/TestScripts/CSharp/ServiceBusQueueTriggerAndOutput/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusQueueTriggerAndOutput/run.csx b/test/Resources/TestScripts/CSharp/ServiceBusQueueTriggerAndOutput/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusQueueTriggerAndOutput/run.csx
rename to test/Resources/TestScripts/CSharp/ServiceBusQueueTriggerAndOutput/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusTopicOutput/function.json b/test/Resources/TestScripts/CSharp/ServiceBusTopicOutput/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusTopicOutput/function.json
rename to test/Resources/TestScripts/CSharp/ServiceBusTopicOutput/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusTopicOutput/run.csx b/test/Resources/TestScripts/CSharp/ServiceBusTopicOutput/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusTopicOutput/run.csx
rename to test/Resources/TestScripts/CSharp/ServiceBusTopicOutput/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusTopicTrigger/function.json b/test/Resources/TestScripts/CSharp/ServiceBusTopicTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusTopicTrigger/function.json
rename to test/Resources/TestScripts/CSharp/ServiceBusTopicTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusTopicTrigger/run.csx b/test/Resources/TestScripts/CSharp/ServiceBusTopicTrigger/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/ServiceBusTopicTrigger/run.csx
rename to test/Resources/TestScripts/CSharp/ServiceBusTopicTrigger/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/StorageReferenceV12/function.json b/test/Resources/TestScripts/CSharp/StorageReferenceV12/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/StorageReferenceV12/function.json
rename to test/Resources/TestScripts/CSharp/StorageReferenceV12/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/StorageReferenceV12/run.csx b/test/Resources/TestScripts/CSharp/StorageReferenceV12/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/StorageReferenceV12/run.csx
rename to test/Resources/TestScripts/CSharp/StorageReferenceV12/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutStopHost/run.csx b/test/Resources/TestScripts/CSharp/TimeoutStopHost/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutStopHost/run.csx
rename to test/Resources/TestScripts/CSharp/TimeoutStopHost/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutSync/function.json b/test/Resources/TestScripts/CSharp/TimeoutSync/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutSync/function.json
rename to test/Resources/TestScripts/CSharp/TimeoutSync/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutSync/run.csx b/test/Resources/TestScripts/CSharp/TimeoutSync/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutSync/run.csx
rename to test/Resources/TestScripts/CSharp/TimeoutSync/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutToken/function.json b/test/Resources/TestScripts/CSharp/TimeoutToken/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutToken/function.json
rename to test/Resources/TestScripts/CSharp/TimeoutToken/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutToken/run.csx b/test/Resources/TestScripts/CSharp/TimeoutToken/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TimeoutToken/run.csx
rename to test/Resources/TestScripts/CSharp/TimeoutToken/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TwilioReference/function.json b/test/Resources/TestScripts/CSharp/TwilioReference/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TwilioReference/function.json
rename to test/Resources/TestScripts/CSharp/TwilioReference/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TwilioReference/run.csx b/test/Resources/TestScripts/CSharp/TwilioReference/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/TwilioReference/run.csx
rename to test/Resources/TestScripts/CSharp/TwilioReference/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/host.json b/test/Resources/TestScripts/CSharp/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CSharp/host.json
rename to test/Resources/TestScripts/CSharp/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/CSharp/HttpTrigger/function.json b/test/Resources/TestScripts/CustomHeadersMiddleware/CSharp/HttpTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/CSharp/HttpTrigger/function.json
rename to test/Resources/TestScripts/CustomHeadersMiddleware/CSharp/HttpTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/CSharp/HttpTrigger/run.csx b/test/Resources/TestScripts/CustomHeadersMiddleware/CSharp/HttpTrigger/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/CSharp/HttpTrigger/run.csx
rename to test/Resources/TestScripts/CustomHeadersMiddleware/CSharp/HttpTrigger/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/CSharp/host.json b/test/Resources/TestScripts/CustomHeadersMiddleware/CSharp/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/CSharp/host.json
rename to test/Resources/TestScripts/CustomHeadersMiddleware/CSharp/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/Node/HttpTrigger/function.json b/test/Resources/TestScripts/CustomHeadersMiddleware/Node/HttpTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/Node/HttpTrigger/function.json
rename to test/Resources/TestScripts/CustomHeadersMiddleware/Node/HttpTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/Node/HttpTrigger/index.js b/test/Resources/TestScripts/CustomHeadersMiddleware/Node/HttpTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/Node/HttpTrigger/index.js
rename to test/Resources/TestScripts/CustomHeadersMiddleware/Node/HttpTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/Node/host.json b/test/Resources/TestScripts/CustomHeadersMiddleware/Node/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/CustomHeadersMiddleware/Node/host.json
rename to test/Resources/TestScripts/CustomHeadersMiddleware/Node/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/Function1/function.json b/test/Resources/TestScripts/DirectLoad/Function1/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/Function1/function.json
rename to test/Resources/TestScripts/DirectLoad/Function1/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/Function2/function.json b/test/Resources/TestScripts/DirectLoad/Function2/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/Function2/function.json
rename to test/Resources/TestScripts/DirectLoad/Function2/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/host.json b/test/Resources/TestScripts/DirectLoad/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/DirectLoad/host.json
rename to test/Resources/TestScripts/DirectLoad/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/DotNet/host.json b/test/Resources/TestScripts/DotNet/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/DotNet/host.json
rename to test/Resources/TestScripts/DotNet/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/HttpTrigger-CSharp/function.json b/test/Resources/TestScripts/FunctionGeneration/HttpTrigger-CSharp/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/HttpTrigger-CSharp/function.json
rename to test/Resources/TestScripts/FunctionGeneration/HttpTrigger-CSharp/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/HttpTrigger-CSharp/run.csx b/test/Resources/TestScripts/FunctionGeneration/HttpTrigger-CSharp/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/HttpTrigger-CSharp/run.csx
rename to test/Resources/TestScripts/FunctionGeneration/HttpTrigger-CSharp/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/HttpTrigger-FSharp/function.json b/test/Resources/TestScripts/FunctionGeneration/HttpTrigger-FSharp/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/HttpTrigger-FSharp/function.json
rename to test/Resources/TestScripts/FunctionGeneration/HttpTrigger-FSharp/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/HttpTrigger-FSharp/run.fsx b/test/Resources/TestScripts/FunctionGeneration/HttpTrigger-FSharp/run.fsx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/HttpTrigger-FSharp/run.fsx
rename to test/Resources/TestScripts/FunctionGeneration/HttpTrigger-FSharp/run.fsx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/host.json b/test/Resources/TestScripts/FunctionGeneration/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/FunctionGeneration/host.json
rename to test/Resources/TestScripts/FunctionGeneration/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Invalid/host.json b/test/Resources/TestScripts/Invalid/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Invalid/host.json
rename to test/Resources/TestScripts/Invalid/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/ListenerStartupException/function.json b/test/Resources/TestScripts/ListenerExceptions/ListenerStartupException/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/ListenerStartupException/function.json
rename to test/Resources/TestScripts/ListenerExceptions/ListenerStartupException/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/ListenerStartupException/index.js b/test/Resources/TestScripts/ListenerExceptions/ListenerStartupException/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/ListenerStartupException/index.js
rename to test/Resources/TestScripts/ListenerExceptions/ListenerStartupException/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/TimerTrigger/function.json b/test/Resources/TestScripts/ListenerExceptions/TimerTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/TimerTrigger/function.json
rename to test/Resources/TestScripts/ListenerExceptions/TimerTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/TimerTrigger/index.js b/test/Resources/TestScripts/ListenerExceptions/TimerTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/TimerTrigger/index.js
rename to test/Resources/TestScripts/ListenerExceptions/TimerTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/host.json b/test/Resources/TestScripts/ListenerExceptions/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/ListenerExceptions/host.json
rename to test/Resources/TestScripts/ListenerExceptions/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/NoFunction/host.json b/test/Resources/TestScripts/NoFunction/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/NoFunction/host.json
rename to test/Resources/TestScripts/NoFunction/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/BlobTriggerToBlob/function.json b/test/Resources/TestScripts/Node/BlobTriggerToBlob/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/BlobTriggerToBlob/function.json
rename to test/Resources/TestScripts/Node/BlobTriggerToBlob/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/BlobTriggerToBlob/index.js b/test/Resources/TestScripts/Node/BlobTriggerToBlob/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/BlobTriggerToBlob/index.js
rename to test/Resources/TestScripts/Node/BlobTriggerToBlob/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/Common/test.js b/test/Resources/TestScripts/Node/Common/test.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/Common/test.js
rename to test/Resources/TestScripts/Node/Common/test.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBIn/function.json b/test/Resources/TestScripts/Node/CosmosDBIn/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBIn/function.json
rename to test/Resources/TestScripts/Node/CosmosDBIn/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBIn/index.js b/test/Resources/TestScripts/Node/CosmosDBIn/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBIn/index.js
rename to test/Resources/TestScripts/Node/CosmosDBIn/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBOut/function.json b/test/Resources/TestScripts/Node/CosmosDBOut/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBOut/function.json
rename to test/Resources/TestScripts/Node/CosmosDBOut/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBOut/index.js b/test/Resources/TestScripts/Node/CosmosDBOut/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBOut/index.js
rename to test/Resources/TestScripts/Node/CosmosDBOut/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBTrigger/function.json b/test/Resources/TestScripts/Node/CosmosDBTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBTrigger/function.json
rename to test/Resources/TestScripts/Node/CosmosDBTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBTrigger/index.js b/test/Resources/TestScripts/Node/CosmosDBTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/CosmosDBTrigger/index.js
rename to test/Resources/TestScripts/Node/CosmosDBTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/EventHubSender/function.json b/test/Resources/TestScripts/Node/EventHubSender/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/EventHubSender/function.json
rename to test/Resources/TestScripts/Node/EventHubSender/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/EventHubSender/index.js b/test/Resources/TestScripts/Node/EventHubSender/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/EventHubSender/index.js
rename to test/Resources/TestScripts/Node/EventHubSender/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/EventHubTrigger/function.json b/test/Resources/TestScripts/Node/EventHubTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/EventHubTrigger/function.json
rename to test/Resources/TestScripts/Node/EventHubTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/EventHubTrigger/index.js b/test/Resources/TestScripts/Node/EventHubTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/EventHubTrigger/index.js
rename to test/Resources/TestScripts/Node/EventHubTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger-Scenarios/function.json b/test/Resources/TestScripts/Node/HttpTrigger-Scenarios/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger-Scenarios/function.json
rename to test/Resources/TestScripts/Node/HttpTrigger-Scenarios/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger-Scenarios/index.js b/test/Resources/TestScripts/Node/HttpTrigger-Scenarios/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger-Scenarios/index.js
rename to test/Resources/TestScripts/Node/HttpTrigger-Scenarios/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger/function.json b/test/Resources/TestScripts/Node/HttpTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger/function.json
rename to test/Resources/TestScripts/Node/HttpTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger/index.js b/test/Resources/TestScripts/Node/HttpTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTrigger/index.js
rename to test/Resources/TestScripts/Node/HttpTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerByteArray/function.json b/test/Resources/TestScripts/Node/HttpTriggerByteArray/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerByteArray/function.json
rename to test/Resources/TestScripts/Node/HttpTriggerByteArray/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerByteArray/index.js b/test/Resources/TestScripts/Node/HttpTriggerByteArray/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerByteArray/index.js
rename to test/Resources/TestScripts/Node/HttpTriggerByteArray/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerExpressApi/function.json b/test/Resources/TestScripts/Node/HttpTriggerExpressApi/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerExpressApi/function.json
rename to test/Resources/TestScripts/Node/HttpTriggerExpressApi/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerExpressApi/index.js b/test/Resources/TestScripts/Node/HttpTriggerExpressApi/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerExpressApi/index.js
rename to test/Resources/TestScripts/Node/HttpTriggerExpressApi/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerPromise/function.json b/test/Resources/TestScripts/Node/HttpTriggerPromise/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerPromise/function.json
rename to test/Resources/TestScripts/Node/HttpTriggerPromise/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerPromise/index.js b/test/Resources/TestScripts/Node/HttpTriggerPromise/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerPromise/index.js
rename to test/Resources/TestScripts/Node/HttpTriggerPromise/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerShared/function.json b/test/Resources/TestScripts/Node/HttpTriggerShared/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerShared/function.json
rename to test/Resources/TestScripts/Node/HttpTriggerShared/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerToBlob/function.json b/test/Resources/TestScripts/Node/HttpTriggerToBlob/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerToBlob/function.json
rename to test/Resources/TestScripts/Node/HttpTriggerToBlob/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerToBlob/index.js b/test/Resources/TestScripts/Node/HttpTriggerToBlob/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/HttpTriggerToBlob/index.js
rename to test/Resources/TestScripts/Node/HttpTriggerToBlob/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/Invalid/function.json b/test/Resources/TestScripts/Node/Invalid/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/Invalid/function.json
rename to test/Resources/TestScripts/Node/Invalid/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/Invalid/index.js b/test/Resources/TestScripts/Node/Invalid/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/Invalid/index.js
rename to test/Resources/TestScripts/Node/Invalid/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/ManualTrigger/function.json b/test/Resources/TestScripts/Node/ManualTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/ManualTrigger/function.json
rename to test/Resources/TestScripts/Node/ManualTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/ManualTrigger/index.js b/test/Resources/TestScripts/Node/ManualTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/ManualTrigger/index.js
rename to test/Resources/TestScripts/Node/ManualTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MobileTableIn/function.json b/test/Resources/TestScripts/Node/MobileTableIn/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MobileTableIn/function.json
rename to test/Resources/TestScripts/Node/MobileTableIn/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MobileTableIn/index.js b/test/Resources/TestScripts/Node/MobileTableIn/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MobileTableIn/index.js
rename to test/Resources/TestScripts/Node/MobileTableIn/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MobileTableOut/function.json b/test/Resources/TestScripts/Node/MobileTableOut/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MobileTableOut/function.json
rename to test/Resources/TestScripts/Node/MobileTableOut/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MobileTableOut/index.js b/test/Resources/TestScripts/Node/MobileTableOut/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MobileTableOut/index.js
rename to test/Resources/TestScripts/Node/MobileTableOut/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleExports/function.json b/test/Resources/TestScripts/Node/MultipleExports/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleExports/function.json
rename to test/Resources/TestScripts/Node/MultipleExports/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleExports/index.js b/test/Resources/TestScripts/Node/MultipleExports/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleExports/index.js
rename to test/Resources/TestScripts/Node/MultipleExports/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleInputs/function.json b/test/Resources/TestScripts/Node/MultipleInputs/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleInputs/function.json
rename to test/Resources/TestScripts/Node/MultipleInputs/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleInputs/index.js b/test/Resources/TestScripts/Node/MultipleInputs/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleInputs/index.js
rename to test/Resources/TestScripts/Node/MultipleInputs/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleOutputs/function.json b/test/Resources/TestScripts/Node/MultipleOutputs/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleOutputs/function.json
rename to test/Resources/TestScripts/Node/MultipleOutputs/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleOutputs/index.js b/test/Resources/TestScripts/Node/MultipleOutputs/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/MultipleOutputs/index.js
rename to test/Resources/TestScripts/Node/MultipleOutputs/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/NotificationHubNative/function.json b/test/Resources/TestScripts/Node/NotificationHubNative/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/NotificationHubNative/function.json
rename to test/Resources/TestScripts/Node/NotificationHubNative/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/NotificationHubNative/index.js b/test/Resources/TestScripts/Node/NotificationHubNative/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/NotificationHubNative/index.js
rename to test/Resources/TestScripts/Node/NotificationHubNative/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/NotificationHubOut/function.json b/test/Resources/TestScripts/Node/NotificationHubOut/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/NotificationHubOut/function.json
rename to test/Resources/TestScripts/Node/NotificationHubOut/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/NotificationHubOut/index.js b/test/Resources/TestScripts/Node/NotificationHubOut/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/NotificationHubOut/index.js
rename to test/Resources/TestScripts/Node/NotificationHubOut/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/QueueTriggerByteArray/function.json b/test/Resources/TestScripts/Node/QueueTriggerByteArray/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/QueueTriggerByteArray/function.json
rename to test/Resources/TestScripts/Node/QueueTriggerByteArray/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/QueueTriggerByteArray/index.js b/test/Resources/TestScripts/Node/QueueTriggerByteArray/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/QueueTriggerByteArray/index.js
rename to test/Resources/TestScripts/Node/QueueTriggerByteArray/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/QueueTriggerToBlob/function.json b/test/Resources/TestScripts/Node/QueueTriggerToBlob/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/QueueTriggerToBlob/function.json
rename to test/Resources/TestScripts/Node/QueueTriggerToBlob/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/QueueTriggerToBlob/index.js b/test/Resources/TestScripts/Node/QueueTriggerToBlob/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/QueueTriggerToBlob/index.js
rename to test/Resources/TestScripts/Node/QueueTriggerToBlob/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/Scenarios/function.json b/test/Resources/TestScripts/Node/Scenarios/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/Scenarios/function.json
rename to test/Resources/TestScripts/Node/Scenarios/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/Scenarios/index.js b/test/Resources/TestScripts/Node/Scenarios/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/Scenarios/index.js
rename to test/Resources/TestScripts/Node/Scenarios/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusQueueTriggerAndOutput/function.json b/test/Resources/TestScripts/Node/ServiceBusQueueTriggerAndOutput/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusQueueTriggerAndOutput/function.json
rename to test/Resources/TestScripts/Node/ServiceBusQueueTriggerAndOutput/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusQueueTriggerAndOutput/index.js b/test/Resources/TestScripts/Node/ServiceBusQueueTriggerAndOutput/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusQueueTriggerAndOutput/index.js
rename to test/Resources/TestScripts/Node/ServiceBusQueueTriggerAndOutput/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusTopicOutput/function.json b/test/Resources/TestScripts/Node/ServiceBusTopicOutput/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusTopicOutput/function.json
rename to test/Resources/TestScripts/Node/ServiceBusTopicOutput/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusTopicOutput/index.js b/test/Resources/TestScripts/Node/ServiceBusTopicOutput/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusTopicOutput/index.js
rename to test/Resources/TestScripts/Node/ServiceBusTopicOutput/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusTopicTrigger/function.json b/test/Resources/TestScripts/Node/ServiceBusTopicTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusTopicTrigger/function.json
rename to test/Resources/TestScripts/Node/ServiceBusTopicTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusTopicTrigger/index.js b/test/Resources/TestScripts/Node/ServiceBusTopicTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/ServiceBusTopicTrigger/index.js
rename to test/Resources/TestScripts/Node/ServiceBusTopicTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/SingleNamedExport/function.json b/test/Resources/TestScripts/Node/SingleNamedExport/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/SingleNamedExport/function.json
rename to test/Resources/TestScripts/Node/SingleNamedExport/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/SingleNamedExport/index.js b/test/Resources/TestScripts/Node/SingleNamedExport/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/SingleNamedExport/index.js
rename to test/Resources/TestScripts/Node/SingleNamedExport/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/TableIn/function.json b/test/Resources/TestScripts/Node/TableIn/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/TableIn/function.json
rename to test/Resources/TestScripts/Node/TableIn/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/TableIn/index.js b/test/Resources/TestScripts/Node/TableIn/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/TableIn/index.js
rename to test/Resources/TestScripts/Node/TableIn/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/TableOut/function.json b/test/Resources/TestScripts/Node/TableOut/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/TableOut/function.json
rename to test/Resources/TestScripts/Node/TableOut/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/TableOut/index.js b/test/Resources/TestScripts/Node/TableOut/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/TableOut/index.js
rename to test/Resources/TestScripts/Node/TableOut/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/TimeoutSync/function.json b/test/Resources/TestScripts/Node/TimeoutSync/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/TimeoutSync/function.json
rename to test/Resources/TestScripts/Node/TimeoutSync/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/TimeoutSync/index.js b/test/Resources/TestScripts/Node/TimeoutSync/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/TimeoutSync/index.js
rename to test/Resources/TestScripts/Node/TimeoutSync/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/TimerTrigger/function.json b/test/Resources/TestScripts/Node/TimerTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/TimerTrigger/function.json
rename to test/Resources/TestScripts/Node/TimerTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/TimerTrigger/index.js b/test/Resources/TestScripts/Node/TimerTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/TimerTrigger/index.js
rename to test/Resources/TestScripts/Node/TimerTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/WebHookTrigger/function.json b/test/Resources/TestScripts/Node/WebHookTrigger/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/WebHookTrigger/function.json
rename to test/Resources/TestScripts/Node/WebHookTrigger/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/WebHookTrigger/index.js b/test/Resources/TestScripts/Node/WebHookTrigger/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/WebHookTrigger/index.js
rename to test/Resources/TestScripts/Node/WebHookTrigger/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/functions.tests.js b/test/Resources/TestScripts/Node/functions.tests.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/functions.tests.js
rename to test/Resources/TestScripts/Node/functions.tests.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/host.json b/test/Resources/TestScripts/Node/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/host.json
rename to test/Resources/TestScripts/Node/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/index.js b/test/Resources/TestScripts/Node/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/index.js
rename to test/Resources/TestScripts/Node/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Node/package.json b/test/Resources/TestScripts/Node/package.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Node/package.json
rename to test/Resources/TestScripts/Node/package.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/NodeWithBundles/HttpTriggerNoAuth/function.json b/test/Resources/TestScripts/NodeWithBundles/HttpTriggerNoAuth/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/NodeWithBundles/HttpTriggerNoAuth/function.json
rename to test/Resources/TestScripts/NodeWithBundles/HttpTriggerNoAuth/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/NodeWithBundles/HttpTriggerNoAuth/index.js b/test/Resources/TestScripts/NodeWithBundles/HttpTriggerNoAuth/index.js
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/NodeWithBundles/HttpTriggerNoAuth/index.js
rename to test/Resources/TestScripts/NodeWithBundles/HttpTriggerNoAuth/index.js
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/NodeWithBundles/host.json b/test/Resources/TestScripts/NodeWithBundles/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/NodeWithBundles/host.json
rename to test/Resources/TestScripts/NodeWithBundles/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.Extensions.DurableTask.dll b/test/Resources/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.Extensions.DurableTask.dll
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.Extensions.DurableTask.dll
rename to test/Resources/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.Extensions.DurableTask.dll
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.Extensions.Storage.dll b/test/Resources/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.Extensions.Storage.dll
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.Extensions.Storage.dll
rename to test/Resources/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.Extensions.Storage.dll
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.ServiceBus.dll b/test/Resources/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.ServiceBus.dll
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.ServiceBus.dll
rename to test/Resources/TestScripts/OutOfDateExtension/bin/Microsoft.Azure.WebJobs.ServiceBus.dll
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/extensions.json b/test/Resources/TestScripts/OutOfDateExtension/bin/extensions.json
similarity index 99%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/extensions.json
rename to test/Resources/TestScripts/OutOfDateExtension/bin/extensions.json
index 93e9b5c46a..742735a7c4 100644
--- a/test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/bin/extensions.json
+++ b/test/Resources/TestScripts/OutOfDateExtension/bin/extensions.json
@@ -1,7 +1,7 @@
-{
- "extensions":[
- { "name": "AzureStorage", "typeName":"Microsoft.Azure.WebJobs.Extensions.Storage.AzureStorageWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.Storage, Version=3.0.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"},
- { "name": "ServiceBus", "typeName":"Microsoft.Azure.WebJobs.ServiceBus.ServiceBusWebJobsStartup, Microsoft.Azure.WebJobs.ServiceBus, Version=4.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"},
- { "name": "DurableTask", "typeName":"Microsoft.Azure.WebJobs.Extensions.DurableTask.DurableTaskWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.DurableTask, Version=2.0.0.0, Culture=neutral, PublicKeyToken=014045d636e89289"}
- ]
+{
+ "extensions":[
+ { "name": "AzureStorage", "typeName":"Microsoft.Azure.WebJobs.Extensions.Storage.AzureStorageWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.Storage, Version=3.0.10.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"},
+ { "name": "ServiceBus", "typeName":"Microsoft.Azure.WebJobs.ServiceBus.ServiceBusWebJobsStartup, Microsoft.Azure.WebJobs.ServiceBus, Version=4.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35"},
+ { "name": "DurableTask", "typeName":"Microsoft.Azure.WebJobs.Extensions.DurableTask.DurableTaskWebJobsStartup, Microsoft.Azure.WebJobs.Extensions.DurableTask, Version=2.0.0.0, Culture=neutral, PublicKeyToken=014045d636e89289"}
+ ]
}
\ No newline at end of file
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/host.json b/test/Resources/TestScripts/OutOfDateExtension/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/OutOfDateExtension/host.json
rename to test/Resources/TestScripts/OutOfDateExtension/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/OutOfRange/host.json b/test/Resources/TestScripts/OutOfRange/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/OutOfRange/host.json
rename to test/Resources/TestScripts/OutOfRange/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/Ping/function.json b/test/Resources/TestScripts/Proxies/Ping/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/Ping/function.json
rename to test/Resources/TestScripts/Proxies/Ping/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/Ping/run.csx b/test/Resources/TestScripts/Proxies/Ping/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/Ping/run.csx
rename to test/Resources/TestScripts/Proxies/Ping/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingAuth/function.json b/test/Resources/TestScripts/Proxies/PingAuth/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingAuth/function.json
rename to test/Resources/TestScripts/Proxies/PingAuth/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingAuth/run.csx b/test/Resources/TestScripts/Proxies/PingAuth/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingAuth/run.csx
rename to test/Resources/TestScripts/Proxies/PingAuth/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingMakeResponse/function.json b/test/Resources/TestScripts/Proxies/PingMakeResponse/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingMakeResponse/function.json
rename to test/Resources/TestScripts/Proxies/PingMakeResponse/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingMakeResponse/run.csx b/test/Resources/TestScripts/Proxies/PingMakeResponse/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingMakeResponse/run.csx
rename to test/Resources/TestScripts/Proxies/PingMakeResponse/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingRoute/function.json b/test/Resources/TestScripts/Proxies/PingRoute/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingRoute/function.json
rename to test/Resources/TestScripts/Proxies/PingRoute/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingRoute/run.csx b/test/Resources/TestScripts/Proxies/PingRoute/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/PingRoute/run.csx
rename to test/Resources/TestScripts/Proxies/PingRoute/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/host.json b/test/Resources/TestScripts/Proxies/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/host.json
rename to test/Resources/TestScripts/Proxies/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/proxies.json b/test/Resources/TestScripts/Proxies/proxies.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/Proxies/proxies.json
rename to test/Resources/TestScripts/Proxies/proxies.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/ProxiesOnly/host.json b/test/Resources/TestScripts/ProxiesOnly/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/ProxiesOnly/host.json
rename to test/Resources/TestScripts/ProxiesOnly/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/ProxiesOnly/proxies.json b/test/Resources/TestScripts/ProxiesOnly/proxies.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/ProxiesOnly/proxies.json
rename to test/Resources/TestScripts/ProxiesOnly/proxies.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/Ping/function.json b/test/Resources/TestScripts/WarmupFunction/Ping/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/Ping/function.json
rename to test/Resources/TestScripts/WarmupFunction/Ping/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/Ping/run.csx b/test/Resources/TestScripts/WarmupFunction/Ping/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/Ping/run.csx
rename to test/Resources/TestScripts/WarmupFunction/Ping/run.csx
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/host.json b/test/Resources/TestScripts/WarmupFunction/host.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/host.json
rename to test/Resources/TestScripts/WarmupFunction/host.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/proxies.json b/test/Resources/TestScripts/WarmupFunction/proxies.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/proxies.json
rename to test/Resources/TestScripts/WarmupFunction/proxies.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/warmup/function.json b/test/Resources/TestScripts/WarmupFunction/warmup/function.json
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/warmup/function.json
rename to test/Resources/TestScripts/WarmupFunction/warmup/function.json
diff --git a/test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/warmup/run.csx b/test/Resources/TestScripts/WarmupFunction/warmup/run.csx
similarity index 100%
rename from test/WebJobs.Script.Tests.Integration/TestScripts/WarmupFunction/warmup/run.csx
rename to test/Resources/TestScripts/WarmupFunction/warmup/run.csx
diff --git a/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj b/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj
index 228cc25690..e3651327a5 100644
--- a/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj
+++ b/test/WebJobs.Script.Abstractions/WebJobs.Script.Tests.Abstractions.csproj
@@ -6,6 +6,7 @@
Microsoft.Azure.WebJobs.Script.Tests.Abstractions
Microsoft.Azure.WebJobs.Script.Tests.Abstractions
+
@@ -13,10 +14,7 @@
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
diff --git a/test/WebJobs.Script.Tests.Integration/App.config b/test/WebJobs.Script.Tests.Integration/App.config
deleted file mode 100644
index b7bb4cc796..0000000000
--- a/test/WebJobs.Script.Tests.Integration/App.config
+++ /dev/null
@@ -1,170 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/DirectLoadEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/DirectLoadEndToEndTests.cs
index f5bb86b0c1..1029bd9839 100644
--- a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/DirectLoadEndToEndTests.cs
+++ b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/DirectLoadEndToEndTests.cs
@@ -20,11 +20,11 @@ namespace Microsoft.Azure.WebJobs.Script.Tests
[Trait(TestTraits.Group, nameof(DirectLoadEndToEndTests))]
public class DirectLoadEndToEndTests : IClassFixture
{
- TestFixture Fixture;
+ private readonly TestFixture _fixture;
public DirectLoadEndToEndTests(TestFixture fixture)
{
- Fixture = fixture;
+ _fixture = fixture;
}
[Fact]
@@ -44,13 +44,13 @@ public async Task Invoke_Succeeds()
};
request.Headers.Append("Accept", new StringValues("text/plain"));
- await Fixture.JobHost.CallAsync("Function1", arguments);
+ await _fixture.JobHost.CallAsync("Function1", arguments);
var response = (OkObjectResult)request.HttpContext.Items[ScriptConstants.AzureFunctionsHttpResponseKey];
Assert.Equal("Hello, Mathew!", (string)response.Value);
- var log = Fixture.LoggerProvider.GetAllLogMessages().SingleOrDefault(p => p.FormattedMessage == "C# HTTP trigger function processed a request.");
+ var log = _fixture.LoggerProvider.GetAllLogMessages().SingleOrDefault(p => p.FormattedMessage == "C# HTTP trigger function processed a request.");
Assert.NotNull(log);
Assert.Equal(LogLevel.Information, log.Level);
Assert.Equal("Function1", log.Scope[ScopeKeys.FunctionName]);
@@ -76,12 +76,12 @@ public async Task Invoke_ExceptionThrown_DetailsLogged()
var ex = await Assert.ThrowsAsync(async () =>
{
- await Fixture.JobHost.CallAsync("Function1", arguments);
+ await _fixture.JobHost.CallAsync("Function1", arguments);
});
var response = request.HttpContext.Items[ScriptConstants.AzureFunctionsHttpResponseKey];
- var errorLogs = Fixture.LoggerProvider.GetAllLogMessages().Where(p => p.Level == LogLevel.Error).ToArray();
+ var errorLogs = _fixture.LoggerProvider.GetAllLogMessages().Where(p => p.Level == LogLevel.Error).ToArray();
Assert.Equal(2, errorLogs.Length);
// first log is the result
@@ -97,10 +97,6 @@ public async Task Invoke_ExceptionThrown_DetailsLogged()
public class TestFixture : ScriptHostEndToEndTestFixture
{
- static TestFixture()
- {
- }
-
public TestFixture() : base(@"TestScripts\DirectLoad\", "dotnet", RpcWorkerConstants.DotNetLanguageWorkerName)
{
}
diff --git a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/ListenerFailureTests.cs b/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/ListenerFailureTests.cs
deleted file mode 100644
index a5e3fdebfd..0000000000
--- a/test/WebJobs.Script.Tests.Integration/ScriptHostEndToEnd/ListenerFailureTests.cs
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System.Linq;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.Azure.WebJobs.Script.Tests
-{
- public class ListenerFailureTests : IClassFixture
- {
- private TestFixture _fixture;
-
- public ListenerFailureTests(TestFixture fixture)
- {
- _fixture = fixture;
- }
-
- ///
- /// This test uses an EventHub triggered function that references an
- /// invalid hub name.
- ///
- ///
- [Fact]
- public async Task ListenerError_LogsAndDoesNotStopHost()
- {
- string[] logs = null;
-
- await TestHelpers.Await(() =>
- {
- logs = _fixture.Host.GetLogMessages().Select(p => p.FormattedMessage).Where(p => p != null).ToArray();
-
- string logToFind = "The listener for function 'Functions.ListenerStartupException' was unable to start.";
- return logs.Any(l => l.Contains(logToFind));
- });
-
- // assert that timer function is still running
- await TestHelpers.Await(() =>
- {
- logs = _fixture.Host.GetLogMessages().Select(p => p.FormattedMessage).Where(p => p != null).ToArray();
-
- string logToFind = "Timer function ran!";
- return logs.Any(l => l.Contains(logToFind));
- });
-
- // assert that the host is retrying to start the
- // listener in the background
- await TestHelpers.Await(() =>
- {
- logs = _fixture.Host.GetLogMessages().Select(p => p.FormattedMessage).Where(p => p != null).ToArray();
- string logToFind = "Retrying to start listener for function 'Functions.ListenerStartupException' (Attempt 2)";
- return logs.Any(l => l.Contains(logToFind));
- });
- }
-
- public class TestFixture : EndToEndTestFixture
- {
- private const string ScriptRoot = @"TestScripts\ListenerExceptions";
-
- public TestFixture() : base(ScriptRoot, "node", "Microsoft.Azure.WebJobs.Extensions.EventHubs", "3.0.0-rc*")
- {
- }
-
- protected override Task CreateTestStorageEntities()
- {
- return Task.CompletedTask;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusEndToEndTestBase.cs b/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusEndToEndTestBase.cs
deleted file mode 100644
index 3203d63764..0000000000
--- a/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusEndToEndTestBase.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using Microsoft.Azure.ServiceBus;
-using Microsoft.Azure.ServiceBus.Core;
-using Microsoft.Azure.WebJobs.Host;
-using Microsoft.Azure.Storage.Blob;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.ServiceBus
-{
- public abstract class ServiceBusEndToEndTestsBase :
- EndToEndTestsBase where TTestFixture : ServiceBusTestFixture, new()
- {
- public ServiceBusEndToEndTestsBase(TTestFixture fixture) : base(fixture)
- {
- }
-
- protected async Task ServiceBusQueueTriggerAndOutputTest()
- {
- // ServiceBus tests need the following environment vars:
- // "AzureWebJobsServiceBus" -- the connection string to the account
-
- var resultBlob = Fixture.TestOutputContainer.GetBlockBlobReference("servicebuse2e-queue-completed");
- await resultBlob.DeleteIfExistsAsync();
-
- await Fixture.CleanUpEntity(Fixture.TestQueueName1);
- await Fixture.CleanUpEntity(Fixture.TestQueueName2);
- // trigger
- await Fixture.SendQueueMessage(Fixture.TestQueueName1, "test-queue");
-
- // now wait for function to be invoked
- string result = await TestHelpers.WaitForBlobAndGetStringAsync(resultBlob,
- () => string.Join(Environment.NewLine, Fixture.Host.GetLogMessages()));
-
- var list = await Fixture.CleanUpEntity(Fixture.TestQueueName2);
- Assert.Equal(list.Count, 1);
- Assert.Equal(list[0], "test-queue-completed");
- }
-
- protected async Task ServiceBusTopicTriggerTest()
- {
- var resultBlob = Fixture.TestOutputContainer.GetBlockBlobReference("servicebuse2e-topic-completed");
- await resultBlob.DeleteIfExistsAsync();
-
- await Fixture.CleanUpEntity(Fixture.TestTopicName1);
- // trigger
- await Fixture.SendTopicMessage(Fixture.TestTopicName1, "test-topic");
-
- // now wait for function to be invoked
- string result = await TestHelpers.WaitForBlobAndGetStringAsync(resultBlob,
- () => string.Join(Environment.NewLine, Fixture.Host.GetLogMessages()));
-
- Assert.Equal(result, "test-topic-completed");
- }
-
- protected async Task ServiceBusTopicOutputTest()
- {
-
- var resultBlob = Fixture.TestOutputContainer.GetBlockBlobReference("servicebuse2e-topic-completed");
- await resultBlob.DeleteIfExistsAsync();
-
- await Fixture.CleanUpEntity(Fixture.TestTopicName2);
- await Fixture.Host.BeginFunctionAsync("ServiceBusTopicOutput", "test-topic");
-
- // now wait for function to be invoked
- string result = await TestHelpers.WaitForBlobAndGetStringAsync(resultBlob,
- () => string.Join(Environment.NewLine, Fixture.Host.GetLogMessages()));
-
- var list = await Fixture.CleanUpEntity(Fixture.TestTopicName2);
- Assert.Equal(list.Count, 1);
- Assert.Equal(list[0], "test-topic-completed");
- }
- }
-
- public abstract class ServiceBusTestFixture : EndToEndTestFixture
- {
- // Azure Service Bus DotNet Core client does not allow to create new Service Bus entities(queues and topics).
- // So we are using same precreated entities as for WebJobs tests
-
- public string TestQueueName1 = "core-test-queue1";
- public string TestQueueName2 = "core-test-queue2";
- public string TestTopicName1 = EntityNameHelper.FormatSubscriptionPath("core-test-topic1", "sub1");
- public string TestTopicName2 = EntityNameHelper.FormatSubscriptionPath("core-test-topic1", "sub2");
- private string connectionString = AmbientConnectionStringProvider.Instance.GetConnectionString(ConnectionStringNames.ServiceBus);
-
- protected ServiceBusTestFixture(string rootPath, string testId) : base(rootPath, testId, "Microsoft.Azure.WebJobs.ServiceBus", "3.0.0-rc*")
- {
- }
-
- protected override IEnumerable GetActiveFunctions() => new[] { "ServiceBusQueueTriggerAndOutput", "ServiceBusTopicTrigger", "ServiceBusTopicOutput" };
-
- public async Task> CleanUpEntity(string entityPath)
- {
- string connectionString = AmbientConnectionStringProvider.Instance.GetConnectionString(ConnectionStringNames.ServiceBus);
- var messageReceiver = new MessageReceiver(connectionString, entityPath, ReceiveMode.ReceiveAndDelete);
- Message message;
- List result = new List();
- do
- {
- message = await messageReceiver.ReceiveAsync(TimeSpan.FromSeconds(3)).ConfigureAwait(false);
- if (message != null)
- {
- result.Add(Encoding.UTF8.GetString(message.Body));
- }
- else
- {
- break;
- }
- } while (true);
- await messageReceiver.CloseAsync();
- return result;
- }
-
- public async Task SendQueueMessage(string entityPath, string message)
- {
- var queueClient = new QueueClient(connectionString, entityPath);
- await queueClient.SendAsync(new Message(Encoding.UTF8.GetBytes(message)));
- }
-
- public async Task SendTopicMessage(string entityPath, string message)
- {
- var topicClient = new TopicClient(connectionString, entityPath);
- await topicClient.SendAsync(new Message(Encoding.UTF8.GetBytes(message)));
- }
- }
-}
diff --git a/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusTriggerCSharpEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusTriggerCSharpEndToEndTests.cs
deleted file mode 100644
index f16a4dce9e..0000000000
--- a/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusTriggerCSharpEndToEndTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.ServiceBus
-{
- public class ServiceBusCSharpEndToEndTests :
- ServiceBusEndToEndTestsBase
- {
- public ServiceBusCSharpEndToEndTests(TestFixture fixture) : base(fixture)
- {
- }
-
- [Fact]
- public Task ServiceBusQueueTriggerAndOutput()
- {
- return ServiceBusQueueTriggerAndOutputTest();
- }
-
- [Fact]
- public Task ServiceBusTopicTrigger()
- {
- return ServiceBusTopicTriggerTest();
- }
-
- [Fact]
- public Task ServiceBusTopicOutput()
- {
- return ServiceBusTopicOutputTest();
- }
-
- public class TestFixture : ServiceBusTestFixture
- {
- private const string ScriptRoot = @"TestScripts\CSharp";
-
- public TestFixture() : base(ScriptRoot, "csharp")
- {
- }
- }
- }
-}
diff --git a/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusTriggerNodeEndToEndTests.cs b/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusTriggerNodeEndToEndTests.cs
deleted file mode 100644
index 82ca9b87df..0000000000
--- a/test/WebJobs.Script.Tests.Integration/ServiceBus/ServiceBusTriggerNodeEndToEndTests.cs
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.ServiceBus
-{
- public class ServiceBusNodeEndToEndTests :
- ServiceBusEndToEndTestsBase
- {
- public ServiceBusNodeEndToEndTests(TestFixture fixture) : base(fixture)
- {
- }
-
- [Fact]
- public Task ServiceBusQueueTriggerAndOutput()
- {
- return ServiceBusQueueTriggerAndOutputTest();
- }
-
- [Fact]
- public Task ServiceBusTopicTrigger()
- {
- return ServiceBusTopicTriggerTest();
- }
-
- [Fact]
- public Task ServiceBusTopicOutput()
- {
- return ServiceBusTopicOutputTest();
- }
-
- public class TestFixture : ServiceBusTestFixture
- {
- private const string ScriptRoot = @"TestScripts\Node";
-
- public TestFixture() : base(ScriptRoot, "node")
- {
- }
- }
- }
-}
diff --git a/test/WebJobs.Script.Tests.Integration/Twilio/TwilioEndToEndTestsBase.cs b/test/WebJobs.Script.Tests.Integration/Twilio/TwilioEndToEndTestsBase.cs
deleted file mode 100644
index 3ae7ea98db..0000000000
--- a/test/WebJobs.Script.Tests.Integration/Twilio/TwilioEndToEndTestsBase.cs
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the MIT License. See License.txt in the project root for license information.
-
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using Xunit;
-
-namespace Microsoft.Azure.WebJobs.Script.Tests.Integration.Twilio
-{
- public class TwilioEndToEndTestsBase : IClassFixture
- {
- private EndToEndTestFixture _fixture;
-
- public TwilioEndToEndTestsBase(TestFixture fixture)
- {
- _fixture = fixture;
- }
-
- [Fact]
- public async Task TwilioReference()
- {
- string testData = Guid.NewGuid().ToString();
-
- // Run function that references Twilio Api
- await _fixture.Host.BeginFunctionAsync("TwilioReference", testData);
- string logs = "";
-
- await TestHelpers.Await(() =>
- {
- // Wait until input has been processed, fail if missing
- logs = _fixture.Host.GetLog();
- return logs.Contains(testData);
- });
- }
-
- public class TestFixture : EndToEndTestFixture
- {
- public TestFixture() :
- base(@"TestScripts\CSharp", "csharp", "Microsoft.Azure.WebJobs.Extensions.Twilio", "3.0.0-rc*")
- {
- }
-
- protected override IEnumerable GetActiveFunctions() => new[] { "TwilioReference" };
- }
- }
-}
\ No newline at end of file
diff --git a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
index fbd9882e5e..f6e0e44623 100644
--- a/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
+++ b/test/WebJobs.Script.Tests.Integration/WebJobs.Script.Tests.Integration.csproj
@@ -10,14 +10,6 @@
-
-
-
-
-
-
-
-
@@ -36,28 +28,18 @@
-
- all
- runtime; build; native; contentfiles; analyzers
-
-
-
-
-
-
-
-
-
+
-
- PreserveNewest
-
+
+
+
+
-
+
True
True
Resources.resx
@@ -65,35 +47,19 @@
-
+
ResXFileCodeGenerator
Resources.Designer.cs
-
- Always
-
-
- PreserveNewest
-
-
-
-
-
-
-
-
-
-
-
-
-
- Always
-
+
+
+
+
-
+
diff --git a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
index 273f84d00c..1eff3678a4 100644
--- a/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
+++ b/test/WebJobs.Script.Tests/WebJobs.Script.Tests.csproj
@@ -5,19 +5,14 @@
true
Microsoft.Azure.WebJobs.Script.Tests
Microsoft.Azure.WebJobs.Script.Tests
- preview
- true
-
+
-
- Always
- TestScripts
-
+
@@ -33,57 +28,36 @@
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
-
-
+
-
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
-
-
-
+
+
+
-
-
-
-
-
-
+
+
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
-
-
+
+
+
-
+
-
-
+
+
-
+
diff --git a/test/WebJobs.Script.Tests/app.config b/test/WebJobs.Script.Tests/app.config
deleted file mode 100644
index 312da8d225..0000000000
--- a/test/WebJobs.Script.Tests/app.config
+++ /dev/null
@@ -1,168 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-