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

Feature/all builds to action #715

Merged
merged 135 commits into from
May 14, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
fac523b
Create build.yml
TroyWalshProf May 3, 2021
3ce1d08
Update build.yml
TroyWalshProf May 3, 2021
b2c7ea9
Update build.yml
TroyWalshProf May 3, 2021
bbe0ee3
Update build.yml
TroyWalshProf May 3, 2021
898bd62
Update build.yml
TroyWalshProf May 3, 2021
cec272b
Create action.yml
TroyWalshProf May 3, 2021
095d2ea
Update build.yml
TroyWalshProf May 3, 2021
151909f
Update build.yml
TroyWalshProf May 3, 2021
2d5b36e
Update action.yml
TroyWalshProf May 3, 2021
3c7fba4
Update action.yml
TroyWalshProf May 3, 2021
0ac0e11
Update build.yml
TroyWalshProf May 3, 2021
c450abd
Update build.yml
TroyWalshProf May 3, 2021
d7ac84b
Update action.yml
TroyWalshProf May 3, 2021
a473aa1
Update build.yml
TroyWalshProf May 3, 2021
9b867fb
Update action.yml
TroyWalshProf May 3, 2021
e2d36c3
Update build.yml
TroyWalshProf May 3, 2021
86ae0f8
Update action.yml
TroyWalshProf May 3, 2021
c5a936c
Update action.yml
TroyWalshProf May 3, 2021
10314dc
Update action.yml
TroyWalshProf May 3, 2021
076a301
Update build.yml
TroyWalshProf May 3, 2021
d83660e
Update action.yml
TroyWalshProf May 3, 2021
0a45a8c
Update build.yml
TroyWalshProf May 3, 2021
7996126
Update build.yml
TroyWalshProf May 3, 2021
a802276
Update build.yml
TroyWalshProf May 4, 2021
ee9eb55
Update build.yml
TroyWalshProf May 4, 2021
5f4801e
Update build.yml
TroyWalshProf May 4, 2021
d206b9b
Update build.yml
TroyWalshProf May 4, 2021
9745703
Update build.yml
TroyWalshProf May 4, 2021
2e7d1e4
Update build.yml
TroyWalshProf May 4, 2021
28792f1
Update build.yml
TroyWalshProf May 4, 2021
c685353
Update build.yml
TroyWalshProf May 4, 2021
443938a
Update build.yml
TroyWalshProf May 4, 2021
9cec6ca
Update build.yml
TroyWalshProf May 4, 2021
a0eab99
Update build.yml
TroyWalshProf May 4, 2021
79f92db
Update build.yml
TroyWalshProf May 4, 2021
a0e4ca0
Update build.yml
TroyWalshProf May 4, 2021
dc2b564
Update build.yml
TroyWalshProf May 4, 2021
5ac3248
Update build.yml
TroyWalshProf May 4, 2021
3d16fa8
Update build.yml
TroyWalshProf May 4, 2021
c7d8425
Update build.yml
TroyWalshProf May 4, 2021
743a473
Update build.yml
TroyWalshProf May 4, 2021
f678b8d
Update build.yml
TroyWalshProf May 4, 2021
bb2d84e
Update build.yml
TroyWalshProf May 4, 2021
a3af928
Update build.yml
TroyWalshProf May 4, 2021
56c2b6b
Update build.yml
TroyWalshProf May 4, 2021
eefcaad
Update build.yml
TroyWalshProf May 4, 2021
f1f5c2c
Update build.yml
TroyWalshProf May 4, 2021
85e749f
Update build.yml
TroyWalshProf May 4, 2021
f825afb
Update build.yml
TroyWalshProf May 4, 2021
a2988dd
Update build.yml
TroyWalshProf May 4, 2021
9b0729a
Create action.yml
TroyWalshProf May 4, 2021
5a93750
Update build.yml
TroyWalshProf May 4, 2021
9325f5b
Delete .github/workflows/setupbrowser-action directory
TroyWalshProf May 4, 2021
5fa315b
Create action.yml
TroyWalshProf May 4, 2021
a7f7b16
Create action.yml
TroyWalshProf May 4, 2021
e4d7578
Update build.yml
TroyWalshProf May 4, 2021
810c70d
Update action.yml
TroyWalshProf May 4, 2021
e5d7faf
Update build.yml
TroyWalshProf May 4, 2021
4b574e0
Update build.yml
TroyWalshProf May 4, 2021
b00d53c
Update build.yml
TroyWalshProf May 4, 2021
25505a6
Update build.yml
TroyWalshProf May 4, 2021
ed02c1a
Update build.yml
TroyWalshProf May 4, 2021
345ae4c
Update build.yml
TroyWalshProf May 4, 2021
bfc0c25
Update build.yml
TroyWalshProf May 4, 2021
4c430a3
Update build.yml
TroyWalshProf May 4, 2021
22f8456
Update build.yml
TroyWalshProf May 4, 2021
5292d7b
Update App.config
TroyWalshProf May 4, 2021
d9b934c
Update to use Saucelabs open source account
TroyWalshProf May 5, 2021
0c944b7
Update build.yml
TroyWalshProf May 5, 2021
57e12a8
Update build.yml
TroyWalshProf May 5, 2021
8bdfeae
Make sure we are doing remote
TroyWalshProf May 5, 2021
8de88e0
Merge branch 'feature/AllBuildsToAction' of https://github.com/Mageni…
TroyWalshProf May 5, 2021
f8f4379
Update build.yml
TroyWalshProf May 5, 2021
5950846
Update build.yml
TroyWalshProf May 5, 2021
3289c3e
Update build.yml
TroyWalshProf May 5, 2021
b098ea2
Update build.yml
TroyWalshProf May 5, 2021
cbb1404
Lower to 2
TroyWalshProf May 5, 2021
179b3a8
Merge branch 'feature/AllBuildsToAction' of https://github.com/Mageni…
TroyWalshProf May 5, 2021
d5b2d18
Update build.yml
TroyWalshProf May 5, 2021
34c10cf
Update build.yml
TroyWalshProf May 5, 2021
a97f4ff
Update build.yml
TroyWalshProf May 5, 2021
af0a23b
Make test headless
TroyWalshProf May 5, 2021
7f58803
Merge branch 'feature/AllBuildsToAction' of https://github.com/Mageni…
TroyWalshProf May 5, 2021
d0e2347
Update build.yml
TroyWalshProf May 5, 2021
101ce75
Update build.yml
TroyWalshProf May 5, 2021
8c2c97a
Update build.yml
TroyWalshProf May 5, 2021
ca16e9d
Update build.yml
TroyWalshProf May 5, 2021
fec2e5c
Update build.yml
TroyWalshProf May 5, 2021
05f4656
Update build.yml
TroyWalshProf May 5, 2021
734d03a
Update build.yml
TroyWalshProf May 5, 2021
d2256c2
Update build.yml
TroyWalshProf May 5, 2021
153372a
Update build.yml
TroyWalshProf May 6, 2021
8fb93ed
Add test mocks
TroyWalshProf May 6, 2021
abee595
Merge branch 'feature/AllBuildsToAction' of https://github.com/Mageni…
TroyWalshProf May 6, 2021
7418db6
Got back to 3
TroyWalshProf May 6, 2021
f90b38e
Update SauceLabs.RunSettings
TroyWalshProf May 6, 2021
1c686d2
Update build.yml
TroyWalshProf May 6, 2021
dd93c1a
Update build.yml
TroyWalshProf May 6, 2021
f0c52b3
Update build.yml
TroyWalshProf May 6, 2021
ee03eb0
Update build.yml
TroyWalshProf May 6, 2021
1c94536
Update build.yml
TroyWalshProf May 6, 2021
497cbd1
Update build.yml
TroyWalshProf May 6, 2021
472fd37
Update build.yml
TroyWalshProf May 6, 2021
d7a9185
Update build.yml
TroyWalshProf May 6, 2021
74477f1
Update build.yml
TroyWalshProf May 6, 2021
86e41b4
Update build.yml
TroyWalshProf May 6, 2021
c6bf920
Update build.yml
TroyWalshProf May 6, 2021
ce1f284
Update build.yml
TroyWalshProf May 6, 2021
2db20f7
Update build.yml
TroyWalshProf May 6, 2021
8db1257
Update build.yml
TroyWalshProf May 6, 2021
1470809
Update builds so we can override the version at build time
TroyWalshProf May 7, 2021
c0fe8d3
Merge branch 'feature/AllBuildsToAction' of https://github.com/Mageni…
TroyWalshProf May 7, 2021
ddfa524
Update build.yml
TroyWalshProf May 11, 2021
532259a
Update build.yml
TroyWalshProf May 11, 2021
fb807b6
Update build.yml
TroyWalshProf May 12, 2021
afb84dd
Delete C# MAQS Build.yml
TroyWalshProf May 12, 2021
aec816b
Update build.yml
TroyWalshProf May 12, 2021
3ec51d7
Delete release-drafter.yml
TroyWalshProf May 12, 2021
f251e78
Update build.yml
TroyWalshProf May 12, 2021
6e8a8c1
Update build.yml
TroyWalshProf May 12, 2021
6706199
Merge branch 'master' into feature/AllBuildsToAction
TroyWalshProf May 13, 2021
8dc90ae
Update build.yml
TroyWalshProf May 13, 2021
1bfecba
Update build.yml
TroyWalshProf May 13, 2021
866db1e
Update build.yml
TroyWalshProf May 13, 2021
8df6a31
Update build.yml
TroyWalshProf May 13, 2021
7cd0e25
Update SauceLabs.RunSettings
TroyWalshProf May 13, 2021
1c0d332
Update README.md
TroyWalshProf May 13, 2021
9211324
Update build.yml
TroyWalshProf May 13, 2021
7cb6373
Update build.yml
TroyWalshProf May 13, 2021
5e2fffe
Update build.yml
TroyWalshProf May 13, 2021
420e9a6
Update build.yml
TroyWalshProf May 13, 2021
a824901
Update build.yml
TroyWalshProf May 14, 2021
3c0090b
Update build.yml
TroyWalshProf May 14, 2021
5c345a2
Update build.yml
TroyWalshProf May 14, 2021
1cc33d2
Update build.yml
TroyWalshProf May 14, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
545 changes: 545 additions & 0 deletions .github/workflows/build.yml

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions .github/workflows/buildtest-action/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: 'Build and test action'
description: 'Build and test something'
inputs:
bt-param: # id of input
description: 'Build and test params'
required: true
artifact-name: # id of input
description: 'Artifact name'
required: true
outputs:
random-number:
description: "Random number"
value: ${{ steps.random-number-generator.outputs.random-id }}
runs:
using: "composite"
steps:
- run: dotnet test ${{ inputs.bt-param }} -o "${{github.workspace}}/artifactTests/${{ inputs.artifact-name }}"
shell: pwsh
- id: random-number-generator
run: echo "::set-output name=random-id::123"
shell: pwsh
17 changes: 0 additions & 17 deletions .github/workflows/release-drafter.yml

This file was deleted.

10 changes: 10 additions & 0 deletions .github/workflows/setuplinbrowser-action/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
name: 'Setup Linux browser action'
description: 'Make sure latest browser version is installed'
runs:
using: "composite"
steps:
- run: |
sudo apt-get update
Write-Host "Installing/Updating Chrome"
sudo apt-get --only-upgrade install google-chrome-stable
shell: pwsh
7 changes: 7 additions & 0 deletions .github/workflows/setupwinbrowser-action/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
name: 'Setup Windows browser action'
description: 'Make sure latest browser version is installed'
runs:
using: "composite"
steps:
- run: choco upgrade googlechrome
shell: pwsh
49 changes: 0 additions & 49 deletions C# MAQS Build.yml

This file was deleted.

2 changes: 1 addition & 1 deletion Framework/AppiumUnitTests/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
<add key="SavePagesourceOnFail" value="YES" />
</AppiumMaqs>
<AppiumCapsMaqs>
<add key="username" value="Partner_Magenic" />
<add key="username" value="magenicMAQSService" />
<add key="accessKey" value="NEVER_ENTER_THIS_VALUE" />
<add key="deviceName" value="Android Emulator" />
<add key="deviceOrientation" value="portrait" />
Expand Down
1 change: 1 addition & 0 deletions Framework/Base.sln
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CF6F67BE-25AF-4BB3-B841-CF40FA8EC6D1}"
ProjectSection(SolutionItems) = preProject
Parallel.RunSettings = Parallel.RunSettings
SauceLabs.RunSettings = SauceLabs.RunSettings
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DatabaseUnitTests", "DatabaseUnitTests\DatabaseUnitTests.csproj", "{1BF34A71-A13B-4E18-843D-4F296805B6C9}"
Expand Down
10 changes: 3 additions & 7 deletions Framework/BaseAppiumTest/BaseAppiumTest.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<BuildVersion>6.3.0</BuildVersion>
<PreRelease></PreRelease>
<VersionPrefix>6.3.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyVersion>$(BuildVersion)</AssemblyVersion>
<FileVersion>$(BuildVersion)</FileVersion>
<Version>$(BuildVersion)</Version>
<PackageVersion>$(BuildVersion)$(PreRelease)</PackageVersion>
<PackageId>Magenic.Maqs.Appium</PackageId>
<Product>Magenic.Maqs.Appium</Product>
<AssemblyName>Magenic.Maqs.BaseAppiumTest</AssemblyName>
Expand All @@ -21,7 +17,7 @@
<Authors>Magenic</Authors>
<Company>Magenic</Company>
<Description>Appium extension for Magenic's automation quick start framework</Description>
<Copyright>Copyright © Magenic 2021</Copyright>
<Copyright>Copyright © Magenic $([System.DateTime]::Now.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>MAQS.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/Magenic/MAQS</PackageProjectUrl>
Expand Down
10 changes: 3 additions & 7 deletions Framework/BaseCompositeTest/BaseCompositeTest.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<BuildVersion>6.3.0</BuildVersion>
<PreRelease></PreRelease>
<VersionPrefix>6.3.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyVersion>$(BuildVersion)</AssemblyVersion>
<FileVersion>$(BuildVersion)</FileVersion>
<Version>$(BuildVersion)</Version>
<PackageVersion>$(BuildVersion)$(PreRelease)</PackageVersion>
<PackageId>Magenic.Maqs</PackageId>
<Product>Magenic.Maqs</Product>
<AssemblyName>Magenic.Maqs.BaseCompositeTest</AssemblyName>
Expand All @@ -21,7 +17,7 @@
<Authors>Magenic</Authors>
<Company>Magenic</Company>
<Description>Composite extension for Magenic's automation quick start framework. Includes all MAQS extensions.</Description>
<Copyright>Copyright © Magenic 2021</Copyright>
<Copyright>Copyright © Magenic $([System.DateTime]::Now.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>MAQS.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/Magenic/MAQS</PackageProjectUrl>
Expand Down
10 changes: 3 additions & 7 deletions Framework/BaseDatabaseTest/BaseDatabaseTest.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<BuildVersion>6.3.0</BuildVersion>
<PreRelease></PreRelease>
<VersionPrefix>6.3.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyVersion>$(BuildVersion)</AssemblyVersion>
<FileVersion>$(BuildVersion)</FileVersion>
<Version>$(BuildVersion)</Version>
<PackageVersion>$(BuildVersion)$(PreRelease)</PackageVersion>
<PackageId>Magenic.Maqs.Database</PackageId>
<AssemblyName>Magenic.Maqs.BaseDatabaseTest</AssemblyName>
<RootNamespace>Magenic.Maqs.BaseDatabaseTest</RootNamespace>
Expand All @@ -19,7 +15,7 @@
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Authors>Magenic</Authors>
<Description>Database extension for Magenic's automation quick start framework</Description>
<Copyright>Copyright © Magenic 2021</Copyright>
<Copyright>Copyright © Magenic $([System.DateTime]::Now.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>MAQS.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/Magenic/MAQS</PackageProjectUrl>
Expand Down
10 changes: 3 additions & 7 deletions Framework/BaseEmailTest/BaseEmailTest.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<BuildVersion>6.3.0</BuildVersion>
<PreRelease></PreRelease>
<VersionPrefix>6.3.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyVersion>$(BuildVersion)</AssemblyVersion>
<FileVersion>$(BuildVersion)</FileVersion>
<Version>$(BuildVersion)</Version>
<PackageVersion>$(BuildVersion)$(PreRelease)</PackageVersion>
<PackageId>Magenic.Maqs.Email</PackageId>
<AssemblyName>Magenic.Maqs.BaseEmailTest</AssemblyName>
<RootNamespace>Magenic.Maqs.BaseEmailTest</RootNamespace>
Expand All @@ -19,7 +15,7 @@
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
<Authors>Magenic</Authors>
<Description>Email extension for Magenic's automation quick start framework</Description>
<Copyright>Copyright © Magenic 2021</Copyright>
<Copyright>Copyright © Magenic $([System.DateTime]::Now.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>MAQS.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/Magenic/MAQS</PackageProjectUrl>
Expand Down
10 changes: 3 additions & 7 deletions Framework/BaseMongoTest/BaseMongoTest.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<BuildVersion>6.3.0</BuildVersion>
<PreRelease></PreRelease>
<VersionPrefix>6.3.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyVersion>$(BuildVersion)</AssemblyVersion>
<FileVersion>$(BuildVersion)</FileVersion>
<Version>$(BuildVersion)</Version>
<PackageVersion>$(BuildVersion)$(PreRelease)</PackageVersion>
<PackageId>Magenic.Maqs.Mongo</PackageId>
<Product>Magenic.Maqs.Mongo</Product>
<AssemblyName>Magenic.Maqs.BaseMongoTest</AssemblyName>
Expand All @@ -21,7 +17,7 @@
<Authors>Magenic</Authors>
<Company>Magenic</Company>
<Description>Mongo extension for Magenic's automation quick start framework</Description>
<Copyright>Copyright © Magenic 2021</Copyright>
<Copyright>Copyright © Magenic $([System.DateTime]::Now.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>MAQS.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/Magenic/MAQS</PackageProjectUrl>
Expand Down
10 changes: 3 additions & 7 deletions Framework/BaseSeleniumTest/BaseSeleniumTest.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<BuildVersion>6.3.0</BuildVersion>
<PreRelease></PreRelease>
<VersionPrefix>6.3.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyVersion>$(BuildVersion)</AssemblyVersion>
<FileVersion>$(BuildVersion)</FileVersion>
<Version>$(BuildVersion)</Version>
<PackageVersion>$(BuildVersion)$(PreRelease)</PackageVersion>
<PackageId>Magenic.Maqs.Selenium</PackageId>
<Product>Magenic.Maqs.Selenium</Product>
<AssemblyName>Magenic.Maqs.BaseSeleniumTest</AssemblyName>
Expand All @@ -21,7 +17,7 @@
<Authors>Magenic</Authors>
<Company>Magenic</Company>
<Description>Magenic's automation quick start framework</Description>
<Copyright>Copyright © Magenic 2021</Copyright>
<Copyright>Copyright © Magenic $([System.DateTime]::Now.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>MAQS.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/Magenic/MAQS</PackageProjectUrl>
Expand Down
10 changes: 3 additions & 7 deletions Framework/BaseTest/BaseTest.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<BuildVersion>6.3.0</BuildVersion>
<PreRelease></PreRelease>
<VersionPrefix>6.3.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyVersion>$(BuildVersion)</AssemblyVersion>
<FileVersion>$(BuildVersion)</FileVersion>
<Version>$(BuildVersion)</Version>
<PackageVersion>$(BuildVersion)$(PreRelease)</PackageVersion>
<PackageId>Magenic.Maqs.Base</PackageId>
<Product>Magenic.Maqs.Base</Product>
<AssemblyName>Magenic.Maqs.BaseTest</AssemblyName>
Expand All @@ -21,7 +17,7 @@
<Authors>Magenic</Authors>
<Company>Magenic</Company>
<Description>Magenic's automation quick start framework</Description>
<Copyright>Copyright © Magenic 2021</Copyright>
<Copyright>Copyright © Magenic $([System.DateTime]::Now.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>MAQS.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/Magenic/MAQS</PackageProjectUrl>
Expand Down
10 changes: 3 additions & 7 deletions Framework/BaseWebServiceTest/BaseWebServiceTest.csproj
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<BuildVersion>6.3.0</BuildVersion>
<PreRelease></PreRelease>
<VersionPrefix>6.3.0</VersionPrefix>
<VersionSuffix>beta1</VersionSuffix>
</PropertyGroup>

<PropertyGroup>
<TargetFrameworks>net471;netstandard2.0;netstandard2.1</TargetFrameworks>
<AssemblyVersion>$(BuildVersion)</AssemblyVersion>
<FileVersion>$(BuildVersion)</FileVersion>
<Version>$(BuildVersion)</Version>
<PackageVersion>$(BuildVersion)$(PreRelease)</PackageVersion>
<PackageId>Magenic.Maqs.WebService</PackageId>
<Product>Magenic.Maqs.Base</Product>
<AssemblyName>Magenic.Maqs.BaseWebServiceTest</AssemblyName>
Expand All @@ -21,7 +17,7 @@
<Authors>Magenic</Authors>
<Company>Magenic</Company>
<Description>Web Service extension for Magenic's automation quick start framework</Description>
<Copyright>Copyright © Magenic 2021</Copyright>
<Copyright>Copyright © Magenic $([System.DateTime]::Now.Year)</Copyright>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>MAQS.jpg</PackageIcon>
<PackageProjectUrl>https://github.com/Magenic/MAQS</PackageProjectUrl>
Expand Down
15 changes: 7 additions & 8 deletions Framework/CompositeUnitTests/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -109,20 +109,19 @@
<add key="DataBaseConnectionString" value="Data Source=qasqlserver.database.windows.net;Initial Catalog=MagenicAutomation;Persist Security Info=True;User ID=MagenicQA;Password=1magenicMARQ;Connection Timeout=30" />
</DatabaseMaqs>
<EmailMaqs>
<add key="SectionOverride" value="WillFailWithoutRunSettingOverride" />

<!--IMAP connection settings-->
<add key="EmailHost" value="imap.gmail.com" />
<add key="EmailUserName" value="maqsfakeemailtest@gmail.com" />
<add key="EmailPassword" value="Magenic3" />
<add key="EmailHost" value="localhost" />
<add key="EmailUserName" value="debug@localdomain.test" />
<add key="EmailPassword" value="pass" />
<add key="EmailPort" value="993" />
<add key="ConnectViaSSL" value="Yes" />
<add key="SkipSslValidation" value="Yes" />

<!--Email attachment download folder-->
<add key="AttachmentDownloadPath" value="/tmp/emailmaqsdownloads" />

<!-- Time-out in milliseconds -->
<add key="EmailTimeout" value="10000" />

<!-- Download attachment path - Defaults to attachments folder under the build location if no value is defined
<add key="AttachmentDownloadPath" value="C:\Frameworks\downloads"/>-->
</EmailMaqs>
<MongoMaqs>
<add key="MongoConnectionString" value="mongodb://localhost:27017" />
Expand Down
6 changes: 3 additions & 3 deletions Framework/FrameworkUnitTests/DatabaseDriverManagerTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,10 @@ public void MixedStoreTypes()
[TestMethod]
public void Intialized()
{
// Do something so we initialize the driver
this.DatabaseDriver.Execute("Select * from Sys.Databases");

DatabaseDriverManager driverDriver = this.ManagerStore[typeof(DatabaseDriverManager).FullName] as DatabaseDriverManager;

// Do something so we initialize the driver
Assert.IsNotNull(this.DatabaseDriver.Connection, "Connection should not be null");
Assert.IsTrue(driverDriver.IsDriverIntialized(), "The driver should have been initialized");
}

Expand Down
Loading