Skip to content
This repository was archived by the owner on Apr 30, 2022. It is now read-only.

Commit 6706199

Browse files
TroyWalshProfTroyWalshProf
authored
Merge branch 'master' into feature/AllBuildsToAction
2 parents 6e8a8c1 + fc3010f commit 6706199

31 files changed

+176
-92
lines changed

‎.github/workflows/codeql-analysis.yml

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
# For most projects, this workflow file will not need changing; you simply need
2+
# to commit it to your repository.
3+
#
4+
# You may wish to alter this file to override the set of languages analyzed,
5+
# or to provide custom queries or build logic.
6+
#
7+
# ******** NOTE ********
8+
# We have attempted to detect the languages in your repository. Please check
9+
# the `language` matrix defined below to confirm you have the correct set of
10+
# supported CodeQL languages.
11+
#
12+
name: "CodeQL"
13+
14+
on:
15+
push:
16+
branches: [ master ]
17+
pull_request:
18+
# The branches below must be a subset of the branches above
19+
branches: [ master ]
20+
schedule:
21+
- cron: '45 11 * * 6'
22+
23+
jobs:
24+
analyze:
25+
name: Analyze
26+
runs-on: ubuntu-latest
27+
permissions:
28+
actions: read
29+
contents: read
30+
security-events: write
31+
32+
strategy:
33+
fail-fast: false
34+
matrix:
35+
language: [ 'csharp', 'javascript' ]
36+
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
37+
# Learn more:
38+
# https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
39+
40+
steps:
41+
- name: Checkout repository
42+
uses: actions/checkout@v2
43+
44+
# Initializes the CodeQL tools for scanning.
45+
- name: Initialize CodeQL
46+
uses: github/codeql-action/init@v1
47+
with:
48+
languages: ${{ matrix.language }}
49+
# If you wish to specify custom queries, you can do so here or in a config file.
50+
# By default, queries listed here will override any specified in a config file.
51+
# Prefix the list here with "+" to use these queries and those in the config file.
52+
# queries: ./path/to/local/query, your-org/your-repo/queries@main
53+
54+
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
55+
# If this step fails, then you should remove it and run the build manually (see below)
56+
- name: Autobuild
57+
uses: github/codeql-action/autobuild@v1
58+
59+
# ℹ️ Command-line programs to run using the OS shell.
60+
# 📚 https://git.io/JvXDl
61+
62+
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
63+
# and modify them (or add more) to build your code if your project
64+
# uses a compiled language
65+
66+
#- run: |
67+
# make bootstrap
68+
# make release
69+
70+
- name: Perform CodeQL Analysis
71+
uses: github/codeql-action/analyze@v1

‎Framework/AppiumUnitTests/AppiumUtilitiesTests.cs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,12 +174,12 @@ public void AppiumLazyParentTest()
174174

175175
this.SoftAssert.Assert(() => Assert.AreEqual(child.Text, parent.FindElement(child.By, "Child").Text));
176176
this.SoftAssert.Assert(() => Assert.AreEqual(1, parent.FindElements(child.By, "Child").Count), "Name1");
177-
this.SoftAssert.Assert(() => Assert.IsTrue(child.Exists, "Expect exists now"), "Name2");
177+
this.SoftAssert.Assert(() => Assert.IsTrue(child.Exists), "Expect exists now", "Name2");
178178

179179
// Override the timeout
180180
this.AppiumDriver.SetWaitDriver(new WebDriverWait(this.AppiumDriver, TimeSpan.FromSeconds(10)));
181181

182-
this.SoftAssert.Assert(() => Assert.IsFalse(missingChild.Exists, "Expect element not to exist"));
182+
this.SoftAssert.Assert(() => Assert.IsFalse(missingChild.Exists), "Expect element not to exist");
183183
this.SoftAssert.FailTestIfAssertFailed();
184184
}
185185

@@ -196,9 +196,8 @@ public void AppiumLazyWaitOverride()
196196

197197
this.AppiumDriver.SetWaitDriver(new WebDriverWait(this.AppiumDriver, overrideTimeSpan));
198198

199-
this.SoftAssert.Assert(() => Assert.AreEqual(overrideTimeSpan, parent.WaitDriver().Timeout, "Parent wait override was not respected"), "Name1");
200-
this.SoftAssert.Assert(() => Assert.AreEqual(overrideTimeSpan, child.WaitDriver().Timeout, "Child wait override was not respected"), "Name2");
201-
199+
this.SoftAssert.Assert(() => Assert.AreEqual(overrideTimeSpan, parent.WaitDriver().Timeout), "Name1", "Parent wait override was not respected");
200+
this.SoftAssert.Assert(() => Assert.AreEqual(overrideTimeSpan, child.WaitDriver().Timeout), "Name2", "Child wait override was not respected");
202201
this.SoftAssert.FailTestIfAssertFailed();
203202
}
204203
}

‎Framework/BaseAppiumTest/BaseAppiumTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>6.2.3</VersionPrefix>
4+
<VersionPrefix>6.3.0</VersionPrefix>
55
<VersionSuffix>beta1</VersionSuffix>
66
</PropertyGroup>
77

‎Framework/BaseCompositeTest/BaseCompositeTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>6.2.3</VersionPrefix>
4+
<VersionPrefix>6.3.0</VersionPrefix>
55
<VersionSuffix>beta1</VersionSuffix>
66
</PropertyGroup>
77

‎Framework/BaseDatabaseTest/BaseDatabaseTest.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>6.2.3</VersionPrefix>
4+
<VersionPrefix>6.3.0</VersionPrefix>
55
<VersionSuffix>beta1</VersionSuffix>
66
</PropertyGroup>
77

@@ -46,7 +46,7 @@
4646
<PrivateAssets>all</PrivateAssets>
4747
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4848
</PackageReference>
49-
<PackageReference Include="Npgsql" Version="5.0.4" />
49+
<PackageReference Include="Npgsql" Version="5.0.5" />
5050
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="2.0.4" />
5151
<PackageReference Include="SQLitePCLRaw.core" Version="2.0.4" />
5252
<PackageReference Include="System.Data.Common" Version="4.3.0" />

‎Framework/BaseEmailTest/BaseEmailTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>6.2.3</VersionPrefix>
4+
<VersionPrefix>6.3.0</VersionPrefix>
55
<VersionSuffix>beta1</VersionSuffix>
66
</PropertyGroup>
77

‎Framework/BaseMongoTest/BaseMongoTest.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>6.2.3</VersionPrefix>
4+
<VersionPrefix>6.3.0</VersionPrefix>
55
<VersionSuffix>beta1</VersionSuffix>
66
</PropertyGroup>
77

@@ -45,9 +45,9 @@
4545
<PrivateAssets>all</PrivateAssets>
4646
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
4747
</PackageReference>
48-
<PackageReference Include="MongoDB.Bson" Version="2.12.2" />
49-
<PackageReference Include="MongoDB.Driver" Version="2.12.2" />
50-
<PackageReference Include="MongoDB.Driver.Core" Version="2.12.2" />
48+
<PackageReference Include="MongoDB.Bson" Version="2.12.3" />
49+
<PackageReference Include="MongoDB.Driver" Version="2.12.3" />
50+
<PackageReference Include="MongoDB.Driver.Core" Version="2.12.3" />
5151
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
5252
</ItemGroup>
5353

‎Framework/BaseSeleniumTest/BaseSeleniumTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>6.2.3</VersionPrefix>
4+
<VersionPrefix>6.3.0</VersionPrefix>
55
<VersionSuffix>beta1</VersionSuffix>
66
</PropertyGroup>
77

‎Framework/BaseTest/BaseTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>6.2.3</VersionPrefix>
4+
<VersionPrefix>6.3.0</VersionPrefix>
55
<VersionSuffix>beta1</VersionSuffix>
66
</PropertyGroup>
77

‎Framework/BaseWebServiceTest/BaseWebServiceTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<VersionPrefix>6.2.3</VersionPrefix>
4+
<VersionPrefix>6.3.0</VersionPrefix>
55
<VersionSuffix>beta1</VersionSuffix>
66
</PropertyGroup>
77

0 commit comments

Comments
 (0)