Skip to content

Commit cade60f

Browse files
AytackydlnAytackydln
committed
new CI for .net 6
seperate c++ projects to different solution
1 parent e7055aa commit cade60f

5 files changed

Lines changed: 191 additions & 165 deletions

File tree

‎.github/workflows/aurora-dev.yml‎

Lines changed: 71 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -10,78 +10,88 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
configuration: [Release]
13+
configuration: [ Release ]
1414

1515
runs-on: windows-2019 # For a list of available runner types, refer to
16-
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
16+
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
1717

1818
env:
1919
Solution_Name: Project-Aurora/Project-Aurora.sln
2020

2121
steps:
22-
- name: Generate build number
23-
id: buildnumber
24-
uses: einaregilsson/build-number@v3
25-
with:
26-
token: ${{secrets.github_token}}
27-
28-
- uses: rishabhgupta/split-by@v1
29-
id: split
30-
with:
31-
string: ${{github.repository}}
32-
split-by: '/'
33-
34-
- name: Checkout
35-
uses: actions/checkout@v2
36-
with:
37-
fetch-depth: 0
38-
submodules: true
22+
- name: Generate build number
23+
id: buildnumber
24+
uses: einaregilsson/build-number@v3
25+
with:
26+
token: ${{secrets.github_token}}
3927

40-
# Install the .NET Core workload
41-
- name: Install .NET Core
42-
uses: actions/setup-dotnet@v1
43-
with:
44-
dotnet-version: 5.0.x
28+
- uses: rishabhgupta/split-by@v1
29+
id: split
30+
with:
31+
string: ${{github.repository}}
32+
split-by: '/'
4533

46-
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
47-
- name: Setup MSBuild.exe
48-
uses: microsoft/setup-msbuild@v1.0.2
34+
- name: Checkout
35+
uses: actions/checkout@v2
36+
with:
37+
fetch-depth: 0
38+
submodules: true
39+
40+
# Install the .NET Core workload
41+
- name: Install .NET Core
42+
uses: actions/setup-dotnet@v2
43+
with:
44+
dotnet-version: 6.0.x
45+
46+
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
47+
- name: Setup MSBuild.exe
48+
uses: microsoft/setup-msbuild@v1.0.2
49+
50+
# Restore the application to populate the obj folder with RuntimeIdentifiers
51+
- name: Restore the application
52+
run: dotnet restore $env:Solution_Name
53+
env:
54+
Configuration: ${{ matrix.configuration }}
4955

50-
# Restore the application to populate the obj folder with RuntimeIdentifiers
51-
- name: Restore the application
52-
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
53-
env:
54-
Configuration: ${{ matrix.configuration }}
56+
- name: Restore msbuild
57+
run: msbuild Project-Aurora/Project-Aurora-MSBuild.sln /t:Restore /p:Configuration=$env:Configuration
58+
env:
59+
Configuration: ${{ matrix.configuration }}
5560

56-
- name: Build
57-
run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration
58-
env:
59-
APPVEYOR_BUILD_VERSION: v${{steps.buildnumber.outputs.build_number}}
60-
OWNER: ${{ steps.split.outputs._0 }}
61-
REPOSITORY: ${{ steps.split.outputs._1 }}
62-
Configuration: ${{ matrix.configuration }}
61+
- name: Build msbuild
62+
run: msbuild Project-Aurora/Project-Aurora-MSBuild.sln /p:Configuration=$env:Configuration /p:Platform=x64
63+
env:
64+
Configuration: ${{ matrix.configuration }}
6365

64-
# Create the app package by building and packaging the Windows Application Packaging project
65-
- name: Building the installer
66-
run: |
67-
"%programfiles(x86)%\Inno Setup 6\iscc.exe" /DEXTERNAL_VERSION=${{steps.buildnumber.outputs.build_number}} Installer\installer.iss
68-
shell: cmd
66+
- name: Build
67+
run: dotnet build $env:Solution_Name --configuration $env:Configuration --no-restore
68+
env:
69+
APPVEYOR_BUILD_VERSION: v${{steps.buildnumber.outputs.build_number}}
70+
OWNER: ${{ steps.split.outputs._0 }}
71+
REPOSITORY: ${{ steps.split.outputs._1 }}
72+
Configuration: ${{ matrix.configuration }}
6973

70-
- name: Archive Build
71-
shell: pwsh
72-
run: |
73-
Compress-Archive .\Build\Release\* Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
74-
75-
- name: Installer Release
76-
uses: softprops/action-gh-release@v1
77-
with:
78-
token: ${{ secrets.GITHUB_TOKEN }}
79-
target_commitish: dev
80-
draft: true
81-
files: |
82-
Aurora-setup-v${{steps.buildnumber.outputs.build_number}}.exe
83-
Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
84-
tag_name: v${{steps.buildnumber.outputs.build_number}}
85-
allow_override: false
86-
prerelease: true
74+
# Create the app package by building and packaging the Windows Application Packaging project
75+
- name: Building the installer
76+
run: |
77+
"%programfiles(x86)%\Inno Setup 6\iscc.exe" /DEXTERNAL_VERSION=${{steps.buildnumber.outputs.build_number}} Installer\installer.iss
78+
shell: cmd
79+
80+
- name: Archive Build
81+
shell: pwsh
82+
run: |
83+
Compress-Archive .\Build\Release\* Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
84+
85+
- name: Installer Release
86+
uses: softprops/action-gh-release@v1
87+
with:
88+
token: ${{ secrets.GITHUB_TOKEN }}
89+
target_commitish: dev
90+
draft: true
91+
files: |
92+
Aurora-setup-v${{steps.buildnumber.outputs.build_number}}.exe
93+
Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
94+
tag_name: v${{steps.buildnumber.outputs.build_number}}
95+
allow_override: false
96+
prerelease: true
8797

‎.github/workflows/aurora-release.yml‎

Lines changed: 75 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -10,82 +10,92 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
configuration: [Release]
13+
configuration: [ Release ]
1414

1515
runs-on: windows-2019 # For a list of available runner types, refer to
16-
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
16+
# https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on
1717

1818
env:
1919
Solution_Name: Project-Aurora/Project-Aurora.sln
2020

2121
steps:
22-
- name: Generate build number
23-
id: buildnumber
24-
uses: einaregilsson/build-number@v3
25-
with:
26-
token: ${{secrets.github_token}}
27-
28-
- uses: rishabhgupta/split-by@v1
29-
id: split
30-
with:
31-
string: ${{github.repository}}
32-
split-by: '/'
33-
34-
- name: Checkout
35-
uses: actions/checkout@v2
36-
with:
37-
fetch-depth: 0
38-
submodules: true
39-
40-
# Install the .NET Core workload
41-
- name: Install .NET Core
42-
uses: actions/setup-dotnet@v1
43-
with:
44-
dotnet-version: 5.0.x
22+
- name: Generate build number
23+
id: buildnumber
24+
uses: einaregilsson/build-number@v3
25+
with:
26+
token: ${{secrets.github_token}}
4527

46-
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
47-
- name: Setup MSBuild.exe
48-
uses: microsoft/setup-msbuild@v1.0.2
28+
- uses: rishabhgupta/split-by@v1
29+
id: split
30+
with:
31+
string: ${{github.repository}}
32+
split-by: '/'
4933

50-
# Restore the application to populate the obj folder with RuntimeIdentifiers
51-
- name: Restore the application
52-
run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
53-
env:
54-
Configuration: ${{ matrix.configuration }}
34+
- name: Checkout
35+
uses: actions/checkout@v2
36+
with:
37+
fetch-depth: 0
38+
submodules: true
39+
40+
# Install the .NET Core workload
41+
- name: Install .NET Core
42+
uses: actions/setup-dotnet@v2
43+
with:
44+
dotnet-version: 6.0.x
45+
46+
# Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
47+
- name: Setup MSBuild.exe
48+
uses: microsoft/setup-msbuild@v1.0.2
49+
50+
# Restore the application to populate the obj folder with RuntimeIdentifiers
51+
- name: Restore the application
52+
run: dotnet restore $env:Solution_Name
53+
env:
54+
Configuration: ${{ matrix.configuration }}
5555

56-
- name: Build
57-
run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration
58-
env:
59-
APPVEYOR_BUILD_VERSION: v${{steps.buildnumber.outputs.build_number}}
60-
OWNER: ${{ steps.split.outputs._0 }}
61-
REPOSITORY: ${{ steps.split.outputs._1 }}
62-
Configuration: ${{ matrix.configuration }}
56+
- name: Restore msbuild
57+
run: msbuild Project-Aurora/Project-Aurora-MSBuild.sln /t:Restore /p:Configuration=$env:Configuration
58+
env:
59+
Configuration: ${{ matrix.configuration }}
6360

64-
# Decode the base 64 encoded pfx and save the Signing_Certificate
65-
#- name: Decode the pfx
66-
# run: |
67-
# $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
68-
# $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx
69-
# [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
61+
- name: Build msbuild
62+
run: msbuild Project-Aurora/Project-Aurora-MSBuild.sln /p:Configuration=$env:Configuration /p:Platform=x64
63+
env:
64+
Configuration: ${{ matrix.configuration }}
7065

71-
# Create the app package by building and packaging the Windows Application Packaging project
72-
- name: Building the installer
73-
run: |
74-
"%programfiles(x86)%\Inno Setup 6\iscc.exe" /DEXTERNAL_VERSION=${{steps.buildnumber.outputs.build_number}} Installer\installer.iss
75-
shell: cmd
66+
- name: Build
67+
run: dotnet build $env:Solution_Name --configuration $env:Configuration --no-restore
68+
env:
69+
APPVEYOR_BUILD_VERSION: v${{steps.buildnumber.outputs.build_number}}
70+
OWNER: ${{ steps.split.outputs._0 }}
71+
REPOSITORY: ${{ steps.split.outputs._1 }}
72+
Configuration: ${{ matrix.configuration }}
7673

77-
- name: Archive Build
78-
shell: pwsh
79-
run: |
80-
Compress-Archive .\Build\Release\* Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
74+
# Decode the base 64 encoded pfx and save the Signing_Certificate
75+
#- name: Decode the pfx
76+
# run: |
77+
# $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
78+
# $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx
79+
# [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
8180

82-
- name: Release
83-
uses: softprops/action-gh-release@v1
84-
with:
85-
token: ${{ secrets.GITHUB_TOKEN }}
86-
draft: true
87-
files: |
88-
Aurora-setup-v${{steps.buildnumber.outputs.build_number}}.exe
89-
Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
90-
tag_name: v${{steps.buildnumber.outputs.build_number}}
91-
allow_override: true
81+
# Create the app package by building and packaging the Windows Application Packaging project
82+
- name: Building the installer
83+
run: |
84+
"%programfiles(x86)%\Inno Setup 6\iscc.exe" /DEXTERNAL_VERSION=${{steps.buildnumber.outputs.build_number}} Installer\installer.iss
85+
shell: cmd
86+
87+
- name: Archive Build
88+
shell: pwsh
89+
run: |
90+
Compress-Archive .\Build\Release\* Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
91+
92+
- name: Release
93+
uses: softprops/action-gh-release@v1
94+
with:
95+
token: ${{ secrets.GITHUB_TOKEN }}
96+
draft: true
97+
files: |
98+
Aurora-setup-v${{steps.buildnumber.outputs.build_number}}.exe
99+
Aurora-v${{steps.buildnumber.outputs.build_number}}.zip
100+
tag_name: v${{steps.buildnumber.outputs.build_number}}
101+
allow_override: true

‎Project-Aurora/Project-Aurora-MSBuild.sln‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
Microsoft Visual Studio Solution File, Format Version 12.00
2+
# Visual Studio Version 16
3+
VisualStudioVersion = 16.0.29418.71
4+
MinimumVisualStudioVersion = 10.0.40219.1
5+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aurora-LogiLEDWrapper", "Aurora-LogiLEDWrapper\Aurora-LogiLEDWrapper.vcxproj", "{20259BE1-55C9-4EFB-9D30-C933F621B9D4}"
6+
EndProject
7+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aurora-RazerLEDWrapper", "Aurora-RazerLEDWrapper\Aurora-RazerLEDWrapper.vcxproj", "{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}"
8+
EndProject
9+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aurora-LightFXWrapper", "Aurora-LightFXWrapper\Aurora-LightFXWrapper.vcxproj", "{A759300D-9550-47BA-8616-C24B6BC05A02}"
10+
EndProject
11+
Global
12+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
13+
Debug|x64 = Debug|x64
14+
Release|x64 = Release|x64
15+
EndGlobalSection
16+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
17+
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Debug|x64.ActiveCfg = Release|x64
18+
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Debug|x64.Build.0 = Release|x64
19+
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Release|x64.ActiveCfg = Release|x64
20+
{20259BE1-55C9-4EFB-9D30-C933F621B9D4}.Release|x64.Build.0 = Release|x64
21+
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Debug|x64.ActiveCfg = Release|x64
22+
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Debug|x64.Build.0 = Release|x64
23+
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Release|x64.ActiveCfg = Release|x64
24+
{004D1E3E-F20E-4ECA-ABB1-467D1CE2C173}.Release|x64.Build.0 = Release|x64
25+
{A759300D-9550-47BA-8616-C24B6BC05A02}.Debug|x64.ActiveCfg = Release|x64
26+
{A759300D-9550-47BA-8616-C24B6BC05A02}.Debug|x64.Build.0 = Release|x64
27+
{A759300D-9550-47BA-8616-C24B6BC05A02}.Release|x64.ActiveCfg = Debug|x64
28+
{A759300D-9550-47BA-8616-C24B6BC05A02}.Release|x64.Build.0 = Debug|x64
29+
EndGlobalSection
30+
GlobalSection(SolutionProperties) = preSolution
31+
HideSolutionNode = FALSE
32+
EndGlobalSection
33+
GlobalSection(ExtensibilityGlobals) = postSolution
34+
SolutionGuid = {490F6EB6-991A-412C-B8F2-336A989F162A}
35+
EndGlobalSection
36+
EndGlobal

0 commit comments

Comments
 (0)