Skip to content

Commit f957f29

Browse files
ejsmithejsmith
committed
Fix cross-plat build
1 parent da642d8 commit f957f29

File tree

4 files changed

+114
-11
lines changed

4 files changed

+114
-11
lines changed

‎.github/workflows/build.yml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,27 @@ jobs:
2626
dotnet tool install --global minver-cli --version 2.3.1
2727
version=$(minver --tag-prefix v)
2828
echo "::set-env name=MINVERVERSIONOVERRIDE::$version"
29-
- name: Build
30-
run: dotnet build --configuration Release Exceptionless.Net.ClientsOnly.sln
31-
- name: Run Tests
32-
run: dotnet test --configuration Release --no-build Exceptionless.Net.ClientsOnly.sln
29+
- name: Build Windows
30+
if: matrix.os == 'windows-latest'
31+
run: dotnet build --configuration Release Exceptionless.Net.Windows.sln
32+
- name: Build Non-Windows
33+
if: matrix.os != 'windows-latest'
34+
run: dotnet build --configuration Release Exceptionless.Net.NonWindows.sln
35+
- name: Run Tests Windows
36+
if: matrix.os == 'windows-latest'
37+
run: dotnet test --configuration Release --no-build Exceptionless.Net.Windows.sln
38+
- name: Run Tests Non-Windows
39+
if: matrix.os == 'windows-latest'
40+
run: dotnet test --configuration Release --no-build Exceptionless.Net.NonWindows.sln
3341
- name: Package
34-
if: github.event_name != 'pull_request'
35-
run: dotnet pack --configuration Release --no-build Exceptionless.Net.ClientsOnly.sln
42+
if: github.event_name != 'pull_request' && matrix.os == 'windows-latest'
43+
run: dotnet pack --configuration Release --no-build Exceptionless.Net.Windows.sln
3644
- name: Install GitHub Package Tool
37-
if: github.event_name != 'pull_request'
45+
if: github.event_name != 'pull_request' && matrix.os == 'windows-latest'
3846
run: dotnet tool install gpr -g
3947
- name: Publish CI Packages
4048
shell: bash
41-
if: github.event_name != 'pull_request' && matrix.os == 'ubuntu-latest'
49+
if: github.event_name != 'pull_request' && matrix.os == 'windows-latest'
4250
run: |
4351
for package in $(find -name "*.nupkg" | grep "minver" -v); do
4452
echo "${0##*/}": Pushing $package...
@@ -51,7 +59,7 @@ jobs:
5159
done
5260
- name: Publish Release Packages
5361
shell: bash
54-
if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'ubuntu-latest'
62+
if: startsWith(github.ref, 'refs/tags/v') && matrix.os == 'windows-latest'
5563
run: |
5664
for package in $(find -name "*.nupkg" | grep "minver" -v); do
5765
echo "${0##*/}": Pushing $package...

‎.vscode/tasks.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"build",
1010
"/property:GenerateFullPaths=true",
1111
"/consoleloggerparameters:NoSummary",
12-
"Exceptionless.Net.ClientsOnly.sln"
12+
"Exceptionless.Net.NonWindows.sln"
1313
],
1414
"group": {
1515
"kind": "build",
@@ -28,7 +28,7 @@
2828
"test",
2929
"/property:GenerateFullPaths=true",
3030
"/consoleloggerparameters:NoSummary",
31-
"Exceptionless.Net.ClientsOnly.sln"
31+
"Exceptionless.Net.NonWindows.sln"
3232
],
3333
"group": {
3434
"kind": "test",

‎Exceptionless.Net.NonWindows.sln

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29209.152
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{728C18BC-4085-4492-B0B2-8211CA209A50}"
7+
ProjectSection(SolutionItems) = preProject
8+
build\common.props = build\common.props
9+
CONTRIBUTING.md = CONTRIBUTING.md
10+
LICENSE.txt = LICENSE.txt
11+
README.md = README.md
12+
EndProjectSection
13+
EndProject
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Platforms", "Platforms", "{D363E15F-621D-40E4-8C96-DEE41A7070FF}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless", "src\Exceptionless\Exceptionless.csproj", "{C3664CAF-6DE9-4049-951F-516C10FBA012}"
17+
EndProject
18+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Tests", "test\Exceptionless.Tests\Exceptionless.Tests.csproj", "{7961053F-A83D-48AE-9ABC-7EA134973223}"
19+
EndProject
20+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Log4net", "src\Platforms\Exceptionless.Log4net\Exceptionless.Log4net.csproj", "{40447BEF-BE34-46C2-B05B-2DF671586AD7}"
21+
EndProject
22+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.NLog", "src\Platforms\Exceptionless.NLog\Exceptionless.NLog.csproj", "{A210FAF7-885E-44F4-85D4-F6D279EAFE82}"
23+
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.AspNetCore", "src\Platforms\Exceptionless.AspNetCore\Exceptionless.AspNetCore.csproj", "{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9}"
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.Extensions.Logging", "src\Platforms\Exceptionless.Extensions.Logging\Exceptionless.Extensions.Logging.csproj", "{9A8BB712-01DE-491C-8E33-E381DDEDDC19}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.MessagePack", "src\Platforms\Exceptionless.MessagePack\Exceptionless.MessagePack.csproj", "{F7ABD87A-2D84-4962-9A97-EC2F864CFA21}"
29+
EndProject
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.MessagePack.Tests", "test\Exceptionless.MessagePack.Tests\Exceptionless.MessagePack.Tests.csproj", "{8DB42DED-86AE-4FC9-AE98-2884A0D607AC}"
31+
EndProject
32+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{847AAE03-9F4A-4920-9E56-8AECB915E2B6}"
33+
EndProject
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Exceptionless.TestHarness", "test\Exceptionless.TestHarness\Exceptionless.TestHarness.csproj", "{485643BC-C33E-485A-80CC-DBD2E3C3E44A}"
35+
EndProject
36+
Global
37+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
38+
Debug|Any CPU = Debug|Any CPU
39+
Release|Any CPU = Release|Any CPU
40+
EndGlobalSection
41+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
42+
{C3664CAF-6DE9-4049-951F-516C10FBA012}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
43+
{C3664CAF-6DE9-4049-951F-516C10FBA012}.Debug|Any CPU.Build.0 = Debug|Any CPU
44+
{C3664CAF-6DE9-4049-951F-516C10FBA012}.Release|Any CPU.ActiveCfg = Release|Any CPU
45+
{C3664CAF-6DE9-4049-951F-516C10FBA012}.Release|Any CPU.Build.0 = Release|Any CPU
46+
{7961053F-A83D-48AE-9ABC-7EA134973223}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47+
{7961053F-A83D-48AE-9ABC-7EA134973223}.Debug|Any CPU.Build.0 = Debug|Any CPU
48+
{7961053F-A83D-48AE-9ABC-7EA134973223}.Release|Any CPU.ActiveCfg = Release|Any CPU
49+
{7961053F-A83D-48AE-9ABC-7EA134973223}.Release|Any CPU.Build.0 = Release|Any CPU
50+
{40447BEF-BE34-46C2-B05B-2DF671586AD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
51+
{40447BEF-BE34-46C2-B05B-2DF671586AD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
52+
{40447BEF-BE34-46C2-B05B-2DF671586AD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
53+
{40447BEF-BE34-46C2-B05B-2DF671586AD7}.Release|Any CPU.Build.0 = Release|Any CPU
54+
{A210FAF7-885E-44F4-85D4-F6D279EAFE82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55+
{A210FAF7-885E-44F4-85D4-F6D279EAFE82}.Debug|Any CPU.Build.0 = Debug|Any CPU
56+
{A210FAF7-885E-44F4-85D4-F6D279EAFE82}.Release|Any CPU.ActiveCfg = Release|Any CPU
57+
{A210FAF7-885E-44F4-85D4-F6D279EAFE82}.Release|Any CPU.Build.0 = Release|Any CPU
58+
{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
59+
{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
60+
{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
61+
{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9}.Release|Any CPU.Build.0 = Release|Any CPU
62+
{9A8BB712-01DE-491C-8E33-E381DDEDDC19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
63+
{9A8BB712-01DE-491C-8E33-E381DDEDDC19}.Debug|Any CPU.Build.0 = Debug|Any CPU
64+
{9A8BB712-01DE-491C-8E33-E381DDEDDC19}.Release|Any CPU.ActiveCfg = Release|Any CPU
65+
{9A8BB712-01DE-491C-8E33-E381DDEDDC19}.Release|Any CPU.Build.0 = Release|Any CPU
66+
{F7ABD87A-2D84-4962-9A97-EC2F864CFA21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67+
{F7ABD87A-2D84-4962-9A97-EC2F864CFA21}.Debug|Any CPU.Build.0 = Debug|Any CPU
68+
{F7ABD87A-2D84-4962-9A97-EC2F864CFA21}.Release|Any CPU.ActiveCfg = Release|Any CPU
69+
{F7ABD87A-2D84-4962-9A97-EC2F864CFA21}.Release|Any CPU.Build.0 = Release|Any CPU
70+
{8DB42DED-86AE-4FC9-AE98-2884A0D607AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
71+
{8DB42DED-86AE-4FC9-AE98-2884A0D607AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
72+
{8DB42DED-86AE-4FC9-AE98-2884A0D607AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
73+
{8DB42DED-86AE-4FC9-AE98-2884A0D607AC}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{485643BC-C33E-485A-80CC-DBD2E3C3E44A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{485643BC-C33E-485A-80CC-DBD2E3C3E44A}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{485643BC-C33E-485A-80CC-DBD2E3C3E44A}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{485643BC-C33E-485A-80CC-DBD2E3C3E44A}.Release|Any CPU.Build.0 = Release|Any CPU
78+
EndGlobalSection
79+
GlobalSection(SolutionProperties) = preSolution
80+
HideSolutionNode = FALSE
81+
EndGlobalSection
82+
GlobalSection(NestedProjects) = preSolution
83+
{7961053F-A83D-48AE-9ABC-7EA134973223} = {847AAE03-9F4A-4920-9E56-8AECB915E2B6}
84+
{40447BEF-BE34-46C2-B05B-2DF671586AD7} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}
85+
{A210FAF7-885E-44F4-85D4-F6D279EAFE82} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}
86+
{F949CF8F-9D5F-454B-B20A-D8F9C22B70D9} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}
87+
{9A8BB712-01DE-491C-8E33-E381DDEDDC19} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}
88+
{F7ABD87A-2D84-4962-9A97-EC2F864CFA21} = {D363E15F-621D-40E4-8C96-DEE41A7070FF}
89+
{8DB42DED-86AE-4FC9-AE98-2884A0D607AC} = {847AAE03-9F4A-4920-9E56-8AECB915E2B6}
90+
{485643BC-C33E-485A-80CC-DBD2E3C3E44A} = {847AAE03-9F4A-4920-9E56-8AECB915E2B6}
91+
EndGlobalSection
92+
GlobalSection(ExtensibilityGlobals) = postSolution
93+
SolutionGuid = {EBB2CC85-FF87-431B-865F-2F110B2A10E6}
94+
EndGlobalSection
95+
EndGlobal

‎Exceptionless.Net.ClientsOnly.sln renamed to ‎Exceptionless.Net.Windows.sln

File renamed without changes.

0 commit comments

Comments
 (0)