Skip to content

Commit 857fb75

Browse files
committed
Merge remote-tracking branch 'origin/develop' into develop
2 parents 44a080f + cdf14d2 commit 857fb75

7 files changed

Lines changed: 18 additions & 3 deletions

File tree

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,10 @@ dotnet_3/em/embedded/rest/SampleProjectDriver/logs/
214214
.vs/
215215
*.launchSettings.json
216216
*.sln.DotSettings.user
217+
dotnet_3/em/embedded/rest/MenuAPIDriver/generated-tests/
218+
dotnet_3/em/embedded/rest/SampleProjectDriver/generated-tests/
219+
dotnet_3/em/embedded/rest/NcsDriver/generated-tests/
220+
dotnet_3/em/embedded/rest/ScsDriver/generated-tests/
217221

218222

219223
# RPC

dotnet_3/Emb.sln

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
44
VisualStudioVersion = 17.0.31919.166
55
MinimumVisualStudioVersion = 15.0.26124.0
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "em", "em", "{7CB8449A-28CC-44AA-A07E-0B583C8E43F0}"
7+
ProjectSection(SolutionItems) = preProject
8+
em\common.props = em\common.props
9+
EndProjectSection
710
EndProject
811
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "embedded", "embedded", "{551DA5A8-231C-46C4-9D70-C940BAE06D3C}"
912
EndProject

dotnet_3/em/common.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
<Project>
22
<ItemGroup>
33
<PackageReference Include="EvoMaster.Controller" Version="1.4.1-SNAPSHOT" />
4+
5+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0"/>
6+
<PackageReference Include="xunit" Version="2.4.0"/>
7+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0"/>
8+
<PackageReference Include="coverlet.collector" Version="1.2.0"/>
49
</ItemGroup>
510
</Project>

dotnet_3/em/embedded/rest/MenuAPIDriver/MenuAPIDriver.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<RootNamespace>Menu</RootNamespace>
77
<AssemblyName>menu-api-evomaster-runner</AssemblyName>
8+
<StartupObject>Menu.EmbeddedEvoMasterController</StartupObject>
89
</PropertyGroup>
910

1011
<Import Project="../../../common.props" />
@@ -22,7 +23,6 @@
2223
</Target>
2324

2425
<Target Name="PostClean" AfterTargets="Clean">
25-
<RemoveDir Directories="generated" />
2626
<RemoveDir Directories="bin-temp" />
2727
</Target>
2828

@@ -48,7 +48,7 @@
4848
<Copy SourceFiles="@(CurrentRuntimeConfig)" DestinationFiles="@(InstrumentationRuntimeConfig)" />
4949

5050
<!-- Run the instrumentation and specify bin-temp as output directory -->
51-
<Exec Command="cd $(OutputPath)&#xD;&#xA; dotnet EvoMaster.Instrumentation.dll @(Sut) @(TempDirectory)" />
51+
<Exec Command="cd $(OutputPath)&#xD;&#xA; dotnet EvoMaster.Instrumentation.dll @(Sut) @(TempDirectory)" />
5252

5353
</Target>
5454

dotnet_3/em/embedded/rest/NcsDriver/NcsDriver.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<AssemblyName>cs-rest-ncs-evomaster-runner</AssemblyName>
7-
</PropertyGroup>
7+
<StartupObject>NcsDriver.EmbeddedEvoMasterController</StartupObject>
8+
</PropertyGroup>
89

910
<Import Project="../../../common.props" />
1011

dotnet_3/em/embedded/rest/SampleProjectDriver/SampleProjectDriver.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<AssemblyName>sampleproject-evomaster-runner</AssemblyName>
7+
<StartupObject>SampleProjectDriver.EmbeddedEvoMasterController</StartupObject>
78
</PropertyGroup>
89

910
<Import Project="../../../common.props" />

dotnet_3/em/embedded/rest/ScsDriver/ScsDriver.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<OutputType>Exe</OutputType>
55
<TargetFramework>netcoreapp3.1</TargetFramework>
66
<AssemblyName>cs-rest-scs-evomaster-runner</AssemblyName>
7+
<StartupObject>ScsDriver.EmbeddedEvoMasterController</StartupObject>
78
</PropertyGroup>
89

910
<Import Project="../../../common.props" />

0 commit comments

Comments
 (0)