Skip to content

Commit 131e58d

Browse files
committed
Merge conflict
2 parents 0825d08 + e18bd4d commit 131e58d

File tree

6 files changed

+7
-7
lines changed

6 files changed

+7
-7
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# supported CodeQL languages.
1111
# ******** NOTE ********
1212

13-
name: "CodeQL"
13+
name: "CodeQL Analyze"
1414

1515
on:
1616
pull_request:
@@ -20,7 +20,6 @@ on:
2020

2121
jobs:
2222
analyze:
23-
name: Analyze
2423
runs-on: ubuntu-latest
2524

2625
strategy:

.github/workflows/dotnet-core.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Build .NET Library
22

33
on:
4+
push:
5+
branches: [ develop ]
46
pull_request:
57
branches: [ develop, main ]
68
release:

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<Version>0.1.6</Version>
3+
<Version>0.2.0</Version>
44
</PropertyGroup>
55
</Project>

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ The same swagger.json excerpt which support test type tags might look like this:
9898
If you feed the list of `HttpRequest` objects with load type tags to the library like `QAToolKit.Engine.Bombardier`, only those requests will be tested.
9999

100100
##### 2.3 EndpointNameWhitelist
101-
Final `RequestFilter` option is `EndpointNameWhitelist`. With it you can specify a list of endpoints that will be included in the results.
101+
Final `RequestFilter` option is `EndpointNameWhitelist`. You can specify a list of endpoints that will be included in the results.
102102

103-
Every other endpoint will be excluded. In the sample above we have set the result to include only `GetCategories` endpoint.
103+
Every other endpoint will be excluded from the results. In the sample above we have set the result to include only `GetCategories` endpoint.
104104
That corresponds to the `operationId` in the swagger file above.
105105

106106
#### 3. AddBaseUrl

src/QAToolKit.Source.Swagger/QAToolKit.Source.Swagger.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<PackageReference Include="Microsoft.OpenApi" Version="1.2.3" />
3838
<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
3939
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
40-
<PackageReference Include="QAToolKit.Core" Version="0.2.1" />
40+
<PackageReference Include="QAToolKit.Core" Version="0.2.2" />
4141
</ItemGroup>
4242

4343
</Project>

src/QAToolKit.Source.Swagger/SwaggerProcessor.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using QAToolKit.Source.Swagger.Exceptions;
66
using System;
77
using System.Collections.Generic;
8-
using System.Data;
98
using System.IO;
109
using System.Linq;
1110
using System.Net;

0 commit comments

Comments
 (0)