Skip to content

Commit f99ff8c

Browse files
1nf0rmagician1nf0rmagician
committed
Merge remote-tracking branch 'origin/future' into dev
2 parents 1a82246 + 1e3411d commit f99ff8c

13 files changed

+232
-1033
lines changed

‎.build/BuildToolkit.ps1‎

Lines changed: 0 additions & 680 deletions
This file was deleted.

‎.build/Common.props‎

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎.build/Output.ps1‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎.build/moryx-logo.png‎

-8.2 KB
Binary file not shown.

‎.github/workflows/build-and-test-tool.yml‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎.github/workflows/build-tool.yml‎

Lines changed: 58 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,75 @@ on:
99
REPOSITORY_NAME:
1010
required: true
1111
type: string
12-
MORYX_OPTIMIZE_CODE:
13-
required: false
14-
type: string
15-
MORYX_BUILD_CONFIG:
16-
required: false
17-
type: string
18-
MORYX_BUILDNUMBER:
19-
required: false
20-
type: string
21-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE:
22-
required: false
23-
type: boolean
24-
12+
2513
jobs:
2614
Build:
27-
runs-on: windows-latest
15+
runs-on: ubuntu-latest
2816
steps:
2917
- uses: actions/checkout@v2
30-
31-
- name: Setup .NET SDK
32-
uses: actions/setup-dotnet@v1
33-
with:
34-
dotnet-version: ${{ inputs.dotnet_sdk_version }}
3518

3619
- name: Setup Node version
3720
uses: actions/setup-node@v3
3821
with:
3922
node-version: 16
4023

41-
- name: Build
42-
shell: pwsh
43-
env:
44-
MORYX_BUILDNUMBER: ${{inputs.MORYX_BUILDNUMBER}}
45-
MORYX_OPTIMIZE_CODE: ${{inputs.MORYX_OPTIMIZE_CODE}}
46-
MORYX_BUILD_CONFIG: ${{inputs.MORYX_BUILD_CONFIG}}
47-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ${{inputs.DOTNET_SKIP_FIRST_TIME_EXPERIENCE}}
48-
run: ./Build.ps1 -Build -Pack
24+
- name: Setup .NET SDK
25+
uses: actions/setup-dotnet@v3
26+
with:
27+
dotnet-version: ${{ inputs.dotnet_sdk_version }}
28+
29+
- name: Clean
30+
run: dotnet clean && dotnet nuget locals all --clear
31+
32+
- name: Execute dotnet restore
33+
run: dotnet restore
4934

35+
- name: Execute dotnet build
36+
if: ${{ !(startsWith(github.ref, 'refs/tags/v')) }}
37+
run: |
38+
ASSEMBLY_VERSION="$(cat VERSION)"
39+
ASSEMBLY_VERSION="${ASSEMBLY_VERSION%%.*}".0.0.0
40+
echo "ASSEMBLY_VERSION = ${ASSEMBLY_VERSION}"
41+
FILE_VERSION="$(cat VERSION)"."${{github.run_number}}"
42+
echo "FILE_VERSION = ${FILE_VERSION}"
43+
INFORMATIONAL_VERSION="$(cat VERSION)"-"${{github.ref_name}}"."${{github.run_number}}"
44+
echo "INFORMATIONAL_VERSION = ${INFORMATIONAL_VERSION}"
45+
dotnet build --configuration Release --no-restore -p:AssemblyVersion=$ASSEMBLY_VERSION -p:FileVersion=$FILE_VERSION -p:InformationalVersion=$INFORMATIONAL_VERSION
46+
47+
48+
- name: Execute dotnet build (Release)
49+
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
50+
run: |
51+
ASSEMBLY_VERSION="${{github.ref_name}}"
52+
ASSEMBLY_VERSION="${ASSEMBLY_VERSION#v}"
53+
ASSEMBLY_VERSION="${ASSEMBLY_VERSION%%.*}".0.0.0
54+
echo "ASSEMBLY_VERSION = ${ASSEMBLY_VERSION}"
55+
FILE_VERSION="$(cat VERSION)"."${{github.run_number}}"
56+
echo "FILE_VERSION = ${FILE_VERSION}"
57+
INFORMATIONAL_VERSION="$(cat VERSION)"-"${{github.ref_name}}"."${{github.run_number}}"
58+
echo "INFORMATIONAL_VERSION = ${INFORMATIONAL_VERSION}"
59+
dotnet build --configuration Release --no-restore -p:AssemblyVersion=$ASSEMBLY_VERSION -p:FileVersion=$FILE_VERSION -p:InformationalVersion=$INFORMATIONAL_VERSION
60+
61+
62+
- name: Execute dotnet pack with release version
63+
if: ${{ startsWith(github.ref, 'refs/tags/v') }}
64+
run: |
65+
RELEASE_VERSION="${{github.ref_name}}"
66+
RELEASE_VERSION="${RELEASE_VERSION#v}"
67+
echo "RELEASE_VERSION = ${RELEASE_VERSION}"
68+
dotnet pack --configuration Release --no-build --no-restore --output artifacts/packages -p:PackageVersion=$RELEASE_VERSION
69+
70+
71+
- name: Execute dotnet pack with production version (dev or future)
72+
if: ${{ github.ref_name == 'dev' || github.ref_name == 'future'}}
73+
run: |
74+
PRODUCTION_VERSION="$(cat VERSION)"-"${{github.ref_name}}"."${{github.run_number}}"
75+
echo "PRODUCTION_VERSION = ${PRODUCTION_VERSION}"
76+
dotnet pack --configuration Release --no-build --no-restore --output artifacts/packages -p:PackageVersion=$PRODUCTION_VERSION
77+
5078
- name: Upload package artifacts
5179
uses: actions/upload-artifact@v2
5280
with:
53-
name: packages
54-
path: artifacts/Packages/
55-
retention-days: 1
81+
name: ${{inputs.REPOSITORY_NAME}}-packages
82+
path: artifacts/packages/
83+
retention-days: 1

‎.github/workflows/documentation-tool.yml‎

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,25 @@ name: Documentation
33
on:
44
workflow_call:
55
inputs:
6-
dotnet_sdk_version:
7-
required: true
8-
type: string
96
REPOSITORY_NAME:
107
required: true
118
type: string
12-
MORYX_OPTIMIZE_CODE:
13-
required: false
14-
type: string
15-
MORYX_BUILD_CONFIG:
16-
required: false
17-
type: string
18-
MORYX_BUILDNUMBER:
19-
required: false
20-
type: string
21-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE:
22-
required: false
23-
type: boolean
249

2510
jobs:
2611
Documentation:
27-
runs-on: windows-latest
12+
runs-on: ubuntu-latest
2813
steps:
29-
- uses: actions/checkout@v2
14+
- name: Checkout code
15+
uses: actions/checkout@v2
3016

31-
- name: Generate docFx
32-
shell: pwsh
33-
env:
34-
MORYX_BUILDNUMBER: ${{inputs.MORYX_BUILDNUMBER}}
35-
MORYX_OPTIMIZE_CODE: ${{inputs.MORYX_OPTIMIZE_CODE}}
36-
MORYX_BUILD_CONFIG: ${{inputs.MORYX_BUILD_CONFIG}}
37-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ${{inputs.DOTNET_SKIP_FIRST_TIME_EXPERIENCE}}
38-
run: ./Build.ps1 -GenerateDocs
17+
- name: Build Documentation
18+
uses: nunit/docfx-action@v2.6.0
19+
with:
20+
args: docs/docfx.json
3921

4022
- name: Upload documentation results
4123
uses: actions/upload-artifact@v2
4224
with:
43-
name: documentation
44-
path: artifacts/Documentation/
25+
name: ${{inputs.REPOSITORY_NAME}}-documentation
26+
path: docs/_site
4527
retention-days: 2

‎.github/workflows/integrationtest-tool.yml‎

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,13 @@ on:
99
REPOSITORY_NAME:
1010
required: true
1111
type: string
12-
MORYX_OPTIMIZE_CODE:
13-
required: false
14-
type: string
15-
MORYX_BUILD_CONFIG:
16-
required: false
17-
type: string
18-
MORYX_BUILDNUMBER:
19-
required: false
20-
type: string
21-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE:
22-
required: false
23-
type: boolean
2412

2513
jobs:
2614
IntegrationTests:
27-
runs-on: windows-latest
15+
runs-on: ubuntu-latest
2816
steps:
29-
- uses: actions/checkout@v2
17+
- name: Checkout code
18+
uses: actions/checkout@v2
3019

3120
- name: Setup .NET SDK
3221
uses: actions/setup-dotnet@v1
@@ -41,18 +30,19 @@ jobs:
4130
- name: Clean
4231
run: dotnet clean && dotnet nuget locals all --clear
4332

44-
- name: Execute Integration Tests
45-
shell: pwsh
46-
env:
47-
MORYX_BUILDNUMBER: ${{inputs.MORYX_BUILDNUMBER}}
48-
MORYX_OPTIMIZE_CODE: ${{inputs.MORYX_OPTIMIZE_CODE}}
49-
MORYX_BUILD_CONFIG: ${{inputs.MORYX_BUILD_CONFIG}}
50-
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: ${{inputs.DOTNET_SKIP_FIRST_TIME_EXPERIENCE}}
51-
run: ./Build.ps1 -IntegrationTests
33+
- name: Execute dotnet restore
34+
run: dotnet restore
5235

36+
- name: Execute dotnet build
37+
run: dotnet build --no-restore
38+
39+
- name: Execute dotnet test (needs coverlet.collector nuget)
40+
run: dotnet test --no-build --filter FullyQualifiedName~Integration --collect:"XPlat Code Coverage"
41+
5342
- name: Upload test results
5443
uses: actions/upload-artifact@v2
5544
with:
5645
name: ${{inputs.REPOSITORY_NAME}}-test-results
57-
path: artifacts/Tests/
58-
retention-days: 1
46+
path: src/Tests/**/TestResults/**/coverage.cobertura.xml
47+
retention-days: 1
48+

0 commit comments

Comments
 (0)