Skip to content

Commit 38b533c

Browse files
liliankasemliliankasem
authored
Reference CSharpPrecompiledTestProjects directly (#10144)
1 parent 61c075e commit 38b533c

File tree

3 files changed

+81
-73
lines changed

3 files changed

+81
-73
lines changed

‎WebJobs.Script.sln

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,22 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks",
5656
EndProject
5757
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.WebJobs.Script.Benchmarks", "benchmarks\WebJobs.Script.Benchmarks\Microsoft.Azure.WebJobs.Script.Benchmarks.csproj", "{766DE3D5-4FB1-4602-9BB5-3779EECC232D}"
5858
EndProject
59+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CSharpPrecompiledTestProjects", "CSharpPrecompiledTestProjects", "{B3ACC1B2-81F4-4035-9B24-169D4C7CB076}"
60+
EndProject
61+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency56", "test\CSharpPrecompiledTestProjects\Dependency56\Dependency56.csproj", "{504B98C7-F27F-4C02-9881-33048D4283CF}"
62+
EndProject
63+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NativeDependencyNoRuntimes", "test\CSharpPrecompiledTestProjects\NativeDependencyNoRuntimes\NativeDependencyNoRuntimes.csproj", "{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}"
64+
EndProject
65+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebJobsStartupTests", "test\CSharpPrecompiledTestProjects\WebJobsStartupTests\WebJobsStartupTests.csproj", "{9D7556C5-C828-4C19-8EC9-E10030777E48}"
66+
EndProject
67+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLoadContextRace", "test\CSharpPrecompiledTestProjects\AssemblyLoadContextRace\AssemblyLoadContextRace.csproj", "{29167303-5857-4BD5-9DDA-9EEA8C26CACC}"
68+
EndProject
69+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dependency55", "test\CSharpPrecompiledTestProjects\Dependency55\Dependency55.csproj", "{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}"
70+
EndProject
71+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReferenceOlderRuntimeAssembly", "test\CSharpPrecompiledTestProjects\ReferenceOlderRuntimeAssembly\ReferenceOlderRuntimeAssembly.csproj", "{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}"
72+
EndProject
73+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultipleDependencyVersions", "test\CSharpPrecompiledTestProjects\MultipleDependencyVersions\MultipleDependencyVersions.csproj", "{51E41947-888E-43BE-A1A9-6607AAED7B57}"
74+
EndProject
5975
Global
6076
GlobalSection(SolutionConfigurationPlatforms) = preSolution
6177
Debug|Any CPU = Debug|Any CPU
@@ -130,6 +146,62 @@ Global
130146
{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.Release|Any CPU.ActiveCfg = Release|Any CPU
131147
{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.Release|Any CPU.Build.0 = Release|Any CPU
132148
{766DE3D5-4FB1-4602-9BB5-3779EECC232D}.ReleasePlaceholder|Any CPU.ActiveCfg = Release|Any CPU
149+
{504B98C7-F27F-4C02-9881-33048D4283CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
150+
{504B98C7-F27F-4C02-9881-33048D4283CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
151+
{504B98C7-F27F-4C02-9881-33048D4283CF}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
152+
{504B98C7-F27F-4C02-9881-33048D4283CF}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
153+
{504B98C7-F27F-4C02-9881-33048D4283CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
154+
{504B98C7-F27F-4C02-9881-33048D4283CF}.Release|Any CPU.Build.0 = Release|Any CPU
155+
{504B98C7-F27F-4C02-9881-33048D4283CF}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
156+
{504B98C7-F27F-4C02-9881-33048D4283CF}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
157+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
158+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Debug|Any CPU.Build.0 = Debug|Any CPU
159+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
160+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
161+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Release|Any CPU.ActiveCfg = Release|Any CPU
162+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.Release|Any CPU.Build.0 = Release|Any CPU
163+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
164+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
165+
{9D7556C5-C828-4C19-8EC9-E10030777E48}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
166+
{9D7556C5-C828-4C19-8EC9-E10030777E48}.Debug|Any CPU.Build.0 = Debug|Any CPU
167+
{9D7556C5-C828-4C19-8EC9-E10030777E48}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
168+
{9D7556C5-C828-4C19-8EC9-E10030777E48}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
169+
{9D7556C5-C828-4C19-8EC9-E10030777E48}.Release|Any CPU.ActiveCfg = Release|Any CPU
170+
{9D7556C5-C828-4C19-8EC9-E10030777E48}.Release|Any CPU.Build.0 = Release|Any CPU
171+
{9D7556C5-C828-4C19-8EC9-E10030777E48}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
172+
{9D7556C5-C828-4C19-8EC9-E10030777E48}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
173+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
174+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Debug|Any CPU.Build.0 = Debug|Any CPU
175+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
176+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
177+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Release|Any CPU.ActiveCfg = Release|Any CPU
178+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.Release|Any CPU.Build.0 = Release|Any CPU
179+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
180+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
181+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
182+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
183+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
184+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
185+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
186+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.Release|Any CPU.Build.0 = Release|Any CPU
187+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
188+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
189+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
190+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Debug|Any CPU.Build.0 = Debug|Any CPU
191+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
192+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
193+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Release|Any CPU.ActiveCfg = Release|Any CPU
194+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.Release|Any CPU.Build.0 = Release|Any CPU
195+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
196+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
197+
{51E41947-888E-43BE-A1A9-6607AAED7B57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
198+
{51E41947-888E-43BE-A1A9-6607AAED7B57}.Debug|Any CPU.Build.0 = Debug|Any CPU
199+
{51E41947-888E-43BE-A1A9-6607AAED7B57}.DebugPlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
200+
{51E41947-888E-43BE-A1A9-6607AAED7B57}.DebugPlaceholder|Any CPU.Build.0 = Debug|Any CPU
201+
{51E41947-888E-43BE-A1A9-6607AAED7B57}.Release|Any CPU.ActiveCfg = Release|Any CPU
202+
{51E41947-888E-43BE-A1A9-6607AAED7B57}.Release|Any CPU.Build.0 = Release|Any CPU
203+
{51E41947-888E-43BE-A1A9-6607AAED7B57}.ReleasePlaceholder|Any CPU.ActiveCfg = Debug|Any CPU
204+
{51E41947-888E-43BE-A1A9-6607AAED7B57}.ReleasePlaceholder|Any CPU.Build.0 = Debug|Any CPU
133205
EndGlobalSection
134206
GlobalSection(SolutionProperties) = preSolution
135207
HideSolutionNode = FALSE
@@ -145,6 +217,14 @@ Global
145217
{5C308A72-5CF3-45E8-B64F-2C98F567054A} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
146218
{9A522D9D-2D86-4572-B7D1-ECBFBFAF312C} = {16351B76-87CA-4A8C-80A1-3DD83A0C4AA6}
147219
{766DE3D5-4FB1-4602-9BB5-3779EECC232D} = {D5F77934-E468-4EE7-82F8-3B8149591174}
220+
{B3ACC1B2-81F4-4035-9B24-169D4C7CB076} = {AFB0F5F7-A612-4F4A-94DD-8B69CABF7970}
221+
{504B98C7-F27F-4C02-9881-33048D4283CF} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
222+
{A094FBDA-B6A7-48DA-BF7C-39FA661C1A07} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
223+
{9D7556C5-C828-4C19-8EC9-E10030777E48} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
224+
{29167303-5857-4BD5-9DDA-9EEA8C26CACC} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
225+
{A7A6A7C2-DD95-4425-916E-9AC629CD4DB8} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
226+
{C14B6921-A12B-4203-8E3A-34BA4E5ACC98} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
227+
{51E41947-888E-43BE-A1A9-6607AAED7B57} = {B3ACC1B2-81F4-4035-9B24-169D4C7CB076}
148228
EndGlobalSection
149229
GlobalSection(ExtensibilityGlobals) = postSolution
150230
SolutionGuid = {85400884-5FFD-4C27-A571-58CB3C8CAAC5}

‎test/CSharpPrecompiledTestProjects/CSharpPrecompiledTestProjects.sln

Lines changed: 0 additions & 67 deletions
This file was deleted.

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
<ProjectReference Include="..\..\src\WebJobs.Script.WebHost\WebJobs.Script.WebHost.csproj" />
6262
<ProjectReference Include="..\..\src\WebJobs.Script.Grpc\WebJobs.Script.Grpc.csproj" />
6363
<ProjectReference Include="..\TestFunctions\TestFunctions.csproj" Private="true" />
64+
<ProjectReference Include="..\CSharpPrecompiledTestProjects\**\*.csproj" ReferenceOutputAssembly="false" />
6465
</ItemGroup>
6566

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

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

0 commit comments

Comments
 (0)