Skip to content

Commit

Permalink
Initial update for non-code
Browse files Browse the repository at this point in the history
  • Loading branch information
twalshcsv committed Jan 5, 2022
1 parent 37eaddb commit e1ae707
Show file tree
Hide file tree
Showing 310 changed files with 30 additions and 9,262 deletions.
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ updates:
interval: daily
time: "11:00"
open-pull-requests-limit: 99
target-branch: master
target-branch: main
labels:
- dependencies
- dependabot
24 changes: 12 additions & 12 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ on:
- cron: "13 23 * * *"
push:
branches:
- master
- main
pull_request:
branches: [ master ]
branches: [ main ]
workflow_dispatch:
inputs:
override:
Expand Down Expand Up @@ -53,7 +53,7 @@ jobs:
needs: waitOld
runs-on: ubuntu-latest
steps:
# Drafts your next Release notes as Pull Requests are merged into "master"
# Drafts your next Release notes as Pull Requests are merged into "main"
- uses: release-drafter/release-drafter@v5
if: github.event_name == 'push'
env:
Expand Down Expand Up @@ -94,10 +94,10 @@ jobs:
- uses: actions/checkout@v2
- id: builder
env:
MagenicMaqs:ConfigJsonEnvRunOverride: ENV
MagenicMaqs:ConfigJsonEnvRun: ENV
MagenicMaqs:ConfigJsonEnv: ENV
MagenicMaqs:EnvOnly: ENV
GlobalMaqs:ConfigJsonEnvRunOverride: ENV
GlobalMaqs:ConfigJsonEnvRun: ENV
GlobalMaqs:ConfigJsonEnv: ENV
GlobalMaqs:EnvOnly: ENV
uses: ./.github/workflows/buildtest-action
with:
bt-param: 'Framework/UtilitiesUnitTests/UtilitiesUnitTests.csproj --settings Framework/Parallel.RunSettings --logger trx --results-directory "${{github.workspace}}/artifactTests/untils/testResults/" /p:CoverletOutput="${{github.workspace}}/artifactTests/untils/" /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
Expand Down Expand Up @@ -200,7 +200,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build the docker-compose stack
run: docker-compose -f Docker/MAQSMongoDB/docker-compose.yml -p Magenic/MAQS up -d
run: docker-compose -f Docker/MAQSMongoDB/docker-compose.yml -p CognizantOpenSource/maqs-dotnet up -d
- id: builder
uses: ./.github/workflows/buildtest-action
with:
Expand All @@ -222,7 +222,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build the docker-compose stack
run: docker-compose -f Docker/MAQSSQLServer/docker-compose.yml -p Magenic/MAQS up -d
run: docker-compose -f Docker/MAQSSQLServer/docker-compose.yml -p CognizantOpenSource/maqs-dotnet up -d
- id: builder
uses: ./.github/workflows/buildtest-action
with:
Expand All @@ -244,7 +244,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Build the docker-compose stack
run: docker-compose -f Docker/MAQSEmail/docker-compose.yml -p Magenic/MAQS up -d
run: docker-compose -f Docker/MAQSEmail/docker-compose.yml -p CognizantOpenSource/maqs-dotnet up -d
- id: builder
uses: ./.github/workflows/buildtest-action
with:
Expand Down Expand Up @@ -320,9 +320,9 @@ jobs:
- id: browserupdate
uses: ./.github/workflows/setuplinbrowser-action
- name: Build the docker-compose mongo stack
run: docker-compose -f Docker/MAQSMongoDB/docker-compose.yml -p Magenic/MAQS up -d
run: docker-compose -f Docker/MAQSMongoDB/docker-compose.yml -p CognizantOpenSource/maqs-dotnet up -d
- name: Build the docker-compose email stack
run: docker-compose -f Docker/MAQSEmail/docker-compose.yml -p Magenic/MAQS up -d
run: docker-compose -f Docker/MAQSEmail/docker-compose.yml -p CognizantOpenSource/maqs-dotnet up -d
- id: builder
uses: ./.github/workflows/buildtest-action
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ name: "CodeQL"

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ master ]
branches: [ main ]
schedule:
- cron: '45 11 * * 6'

Expand Down
2 changes: 1 addition & 1 deletion CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @Magenic/maqs-architects
* @CognizantOpenSource/maqs-architects
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2021 Magenic
Copyright (c) 2022 Cognizant

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
Binary file modified MAQS Architecture Document.docx
Binary file not shown.
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
Builds:
[![Build Status](https://github.com/Magenic/MAQS/actions/workflows/build.yml/badge.svg?event=schedule)](https://github.com/Magenic/MAQS/actions/workflows/build.yml)
[![Build Status](https://github.com/CognizantOpenSource/maqs-dotnet/actions/workflows/build.yml/badge.svg?event=schedule)](https://github.com/CognizantOpenSource/maqs-dotnet/actions/workflows/build.yml)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=MAQS&metric=alert_status)](https://sonarcloud.io/dashboard?id=MAQS) [![Coverage](https://sonarcloud.io/api/project_badges/measure?project=MAQS&metric=coverage)](https://sonarcloud.io/dashboard?id=MAQS) [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=MAQS&metric=bugs)](https://sonarcloud.io/dashboard?id=MAQS) [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=MAQS&metric=vulnerabilities)](https://sonarcloud.io/dashboard?id=MAQS)

Releases:
[![Nuget](https://img.shields.io/nuget/v/Magenic.Maqs.svg?label=Nuget%20Package)](https://www.nuget.org/packages/Magenic.Maqs/) [![NuGet package download counter](https://img.shields.io/nuget/dt/Magenic.Maqs.svg?label=Downloads)](https://www.nuget.org/packages/Magenic.Maqs/)
[![Visual Studio Marketplace Version](https://img.shields.io/visual-studio-marketplace/v/vs-publisher-1465771.MAQSOpenFramework.svg?label=Visual%20Studio%20Extension)](https://marketplace.visualstudio.com/items?itemName=vs-publisher-1465771.MAQSOpenFramework)

License:
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://raw.githubusercontent.com/Magenic/MAQS/master/LICENSE)
[![License: MIT](https://img.shields.io/badge/License-MIT-green.svg)](https://raw.githubusercontent.com/CognizantOpenSource/maqs-dotnet/master/LICENSE)

# MAQS

## Introduction

MAQS stands for Magenic's automation quick start.
MAQS stands for Modular automation quick start.

It …

Expand All @@ -25,8 +25,8 @@ The main idea behind MAQS is to avoid **reinventing the wheel**. Most automation

## Help files

- [MAQS 6](https://magenic.github.io/MAQS/#/MAQS_6/Introduction)
- [MAQS 7](https://magenic.github.io/MAQS/#/MAQS_7/Introduction)
- [MAQS 6](https://cognizantopensource.github.io/maqs-dotnet/#/MAQS_6/Introduction)
- [MAQS 7](https://cognizantopensource.github.io/maqs-dotnet/#/MAQS_7/Introduction)

## Powered By

Expand All @@ -37,7 +37,7 @@ The main idea behind MAQS is to avoid **reinventing the wheel**. Most automation
## License

The MIT License (MIT)
Copyright (c) 2021 Magenic
Copyright (c) 2022 Cognizant

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Supported Versions
We are currently only supporting MAQS 6 and above.
*If you are using MAQS 5 or below we strongly recommend updating to 6, this [upgrade link](https://magenic.github.io/MAQS/#/MAQS_6/UpgradingFromMAQS5ToMAQS6) may help
*If you are using MAQS 5 or below we strongly recommend updating to 6, this [upgrade link](https://cognizantopensource.github.io/maqs-dotnet/#/MAQS_6/UpgradingFromMAQS5ToMAQS6) may help

| Version | Supported |
| ------- | ------------------ |
Expand Down
6 changes: 3 additions & 3 deletions Settings.StyleCop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<StyleCopSettings Version="105">
<GlobalSettings>
<CollectionProperty Name="RecognizedWords">
<Value>Magenic</Value>
<Value>Cognizant</Value>
<Value>Maqs</Value>
<Value>css</Value>
<Value>xml</Value>
Expand Down Expand Up @@ -45,8 +45,8 @@
</Analyzer>
<Analyzer AnalyzerId="StyleCop.CSharp.DocumentationRules">
<AnalyzerSettings>
<StringProperty Name="CompanyName">Magenic</StringProperty>
<StringProperty Name="Copyright">Copyright 2021 Magenic, All rights Reserved</StringProperty>
<StringProperty Name="CompanyName">Cognizant</StringProperty>
<StringProperty Name="Copyright">Copyright 2022 Cognizant, All rights Reserved</StringProperty>
</AnalyzerSettings>
</Analyzer>
<Analyzer AnalyzerId="StyleCop.CSharp.ReadabilityRules">
Expand Down
Loading

0 comments on commit e1ae707

Please sign in to comment.