From a1de0a7a12dab2a3801e1257714b6ee326426c98 Mon Sep 17 00:00:00 2001 From: Thad House Date: Mon, 31 Jan 2022 12:28:11 -0800 Subject: [PATCH] Fix CI, fix sln --- .config/dotnet-tools.json | 12 -- .github/workflows/check-clog-linux-printf.yml | 5 + .github/workflows/check-clog-linux.yml | 7 +- .../workflows/check-clog-windows-printf.yml | 5 + .github/workflows/check-clog-windows.yml | 5 + .github/workflows/codeql-analysis.yml | 5 + clog.sln | 123 ++++++------------ 7 files changed, 63 insertions(+), 99 deletions(-) delete mode 100644 .config/dotnet-tools.json diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json deleted file mode 100644 index 67510df..0000000 --- a/.config/dotnet-tools.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "version": 1, - "isRoot": true, - "tools": { - "dotnet-format": { - "version": "5.1.225507", - "commands": [ - "dotnet-format" - ] - } - } -} diff --git a/.github/workflows/check-clog-linux-printf.yml b/.github/workflows/check-clog-linux-printf.yml index 4235e92..3290f2f 100644 --- a/.github/workflows/check-clog-linux-printf.yml +++ b/.github/workflows/check-clog-linux-printf.yml @@ -18,6 +18,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Build CLOG and run Tests run: ./runTests_stdio.ps1 working-directory: ./examples diff --git a/.github/workflows/check-clog-linux.yml b/.github/workflows/check-clog-linux.yml index 93f6d2c..94fc47a 100644 --- a/.github/workflows/check-clog-linux.yml +++ b/.github/workflows/check-clog-linux.yml @@ -18,6 +18,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - run: | sudo apt-add-repository ppa:lttng/stable-2.12 sudo apt-get update @@ -27,5 +32,3 @@ jobs: run: ./runTests.ps1 working-directory: ./examples shell: pwsh - - diff --git a/.github/workflows/check-clog-windows-printf.yml b/.github/workflows/check-clog-windows-printf.yml index 2c7f3d7..c7991c4 100644 --- a/.github/workflows/check-clog-windows-printf.yml +++ b/.github/workflows/check-clog-windows-printf.yml @@ -19,6 +19,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Build CLOG and run Tests run: ./runTests_stdio.ps1 working-directory: ./examples diff --git a/.github/workflows/check-clog-windows.yml b/.github/workflows/check-clog-windows.yml index 6df8a5f..b2fd69a 100644 --- a/.github/workflows/check-clog-windows.yml +++ b/.github/workflows/check-clog-windows.yml @@ -19,6 +19,11 @@ jobs: - name: Checkout repository uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Build CLOG and run Tests run: ./runTests.ps1 working-directory: ./examples diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 993761f..6b44abf 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -26,6 +26,11 @@ jobs: fetch-depth: 2 submodules: 'recursive' + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 6.0.x + - name: Initialize CodeQL uses: github/codeql-action/init@v1 with: diff --git a/clog.sln b/clog.sln index 00aceeb..acacead 100644 --- a/clog.sln +++ b/clog.sln @@ -1,108 +1,61 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 -VisualStudioVersion = 16.0.29411.108 +VisualStudioVersion = 16.0.30114.105 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clog", "src\clog\clog.csproj", "{C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B5EB820A-552E-4B9E-8C31-6470035686CB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clogutils", "src\clogutils\clogutils.csproj", "{076A3AA5-DEB6-45AB-B834-5416178BAF44}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clog", "src\clog\clog.csproj", "{650FC714-F64F-41DD-9034-10B2326BA2A2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clog2text", "clog2text", "{C05DAADF-AA11-4B93-A0B9-CCA2849A6A06}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "clog2text", "clog2text", "{FC3C5160-7D7B-4B51-A7FD-E441EEBCFB17}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clog2text_lttng", "src\clog2text\clog2text_lttng\clog2text_lttng.csproj", "{B683F6AC-DEC3-4AFC-B156-77F303EE2986}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clog2text_windows", "src\clog2text\clog2text_windows\clog2text_windows.csproj", "{29224049-9128-4155-BB1B-E5A08386E998}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "clog2text_windows", "src\clog2text\clog2text_windows\clog2text_windows.csproj", "{1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clog2text_lttng", "src\clog2text\clog2text_lttng\clog2text_lttng.csproj", "{BDE9BAF4-DBCB-4C1E-A9B9-B5B7E3934A52}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "decoderTest", "src\decoderTest\decoderTest.csproj", "{A2079B4E-FF96-4DE5-80E8-8403A17C4347}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "clogutils", "src\clogutils\clogutils.csproj", "{3DDFDBBC-AA8A-464B-AB80-19421C2F24FB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "converters", "converters", "{FE0B277E-B292-4FF2-8C69-15EECC1A3787}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "converters", "converters", "{4E974452-B43B-441A-8451-E9F4009BDEDE}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "syslog2clog", "src\converters\syslog2clog\syslog2clog.csproj", "{E1FA7999-5C45-46B1-9E83-5467264F928E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "syslog2clog", "src\converters\syslog2clog\syslog2clog.csproj", "{239046F4-B675-4CAC-B2E5-E2A1682718EF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}.Debug|x64.Build.0 = Debug|Any CPU - {C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}.Release|Any CPU.Build.0 = Release|Any CPU - {C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}.Release|x64.ActiveCfg = Release|Any CPU - {C35AA43B-DC28-4E5B-8414-176DAB5AB2C7}.Release|x64.Build.0 = Release|Any CPU - {076A3AA5-DEB6-45AB-B834-5416178BAF44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {076A3AA5-DEB6-45AB-B834-5416178BAF44}.Debug|Any CPU.Build.0 = Debug|Any CPU - {076A3AA5-DEB6-45AB-B834-5416178BAF44}.Debug|x64.ActiveCfg = Debug|Any CPU - {076A3AA5-DEB6-45AB-B834-5416178BAF44}.Debug|x64.Build.0 = Debug|Any CPU - {076A3AA5-DEB6-45AB-B834-5416178BAF44}.Release|Any CPU.ActiveCfg = Release|Any CPU - {076A3AA5-DEB6-45AB-B834-5416178BAF44}.Release|Any CPU.Build.0 = Release|Any CPU - {076A3AA5-DEB6-45AB-B834-5416178BAF44}.Release|x64.ActiveCfg = Release|Any CPU - {076A3AA5-DEB6-45AB-B834-5416178BAF44}.Release|x64.Build.0 = Release|Any CPU - {B683F6AC-DEC3-4AFC-B156-77F303EE2986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B683F6AC-DEC3-4AFC-B156-77F303EE2986}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B683F6AC-DEC3-4AFC-B156-77F303EE2986}.Debug|x64.ActiveCfg = Debug|Any CPU - {B683F6AC-DEC3-4AFC-B156-77F303EE2986}.Debug|x64.Build.0 = Debug|Any CPU - {B683F6AC-DEC3-4AFC-B156-77F303EE2986}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B683F6AC-DEC3-4AFC-B156-77F303EE2986}.Release|Any CPU.Build.0 = Release|Any CPU - {B683F6AC-DEC3-4AFC-B156-77F303EE2986}.Release|x64.ActiveCfg = Release|Any CPU - {B683F6AC-DEC3-4AFC-B156-77F303EE2986}.Release|x64.Build.0 = Release|Any CPU - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}.Debug|x64.ActiveCfg = Debug|Any CPU - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}.Debug|x64.Build.0 = Debug|Any CPU - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}.Release|Any CPU.Build.0 = Release|Any CPU - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}.Release|x64.ActiveCfg = Release|Any CPU - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170}.Release|x64.Build.0 = Release|Any CPU - {A2079B4E-FF96-4DE5-80E8-8403A17C4347}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2079B4E-FF96-4DE5-80E8-8403A17C4347}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2079B4E-FF96-4DE5-80E8-8403A17C4347}.Debug|x64.ActiveCfg = Debug|Any CPU - {A2079B4E-FF96-4DE5-80E8-8403A17C4347}.Debug|x64.Build.0 = Debug|Any CPU - {A2079B4E-FF96-4DE5-80E8-8403A17C4347}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2079B4E-FF96-4DE5-80E8-8403A17C4347}.Release|Any CPU.Build.0 = Release|Any CPU - {A2079B4E-FF96-4DE5-80E8-8403A17C4347}.Release|x64.ActiveCfg = Release|Any CPU - {A2079B4E-FF96-4DE5-80E8-8403A17C4347}.Release|x64.Build.0 = Release|Any CPU - {E1FA7999-5C45-46B1-9E83-5467264F928E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1FA7999-5C45-46B1-9E83-5467264F928E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1FA7999-5C45-46B1-9E83-5467264F928E}.Debug|x64.ActiveCfg = Debug|Any CPU - {E1FA7999-5C45-46B1-9E83-5467264F928E}.Debug|x64.Build.0 = Debug|Any CPU - {E1FA7999-5C45-46B1-9E83-5467264F928E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1FA7999-5C45-46B1-9E83-5467264F928E}.Release|Any CPU.Build.0 = Release|Any CPU - {E1FA7999-5C45-46B1-9E83-5467264F928E}.Release|x64.ActiveCfg = Release|Any CPU - {E1FA7999-5C45-46B1-9E83-5467264F928E}.Release|x64.Build.0 = Release|Any CPU - {A8C76D37-6C7C-4617-8A05-7469C07E294D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8C76D37-6C7C-4617-8A05-7469C07E294D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8C76D37-6C7C-4617-8A05-7469C07E294D}.Debug|x64.ActiveCfg = Debug|Any CPU - {A8C76D37-6C7C-4617-8A05-7469C07E294D}.Debug|x64.Build.0 = Debug|Any CPU - {A8C76D37-6C7C-4617-8A05-7469C07E294D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8C76D37-6C7C-4617-8A05-7469C07E294D}.Release|Any CPU.Build.0 = Release|Any CPU - {A8C76D37-6C7C-4617-8A05-7469C07E294D}.Release|x64.ActiveCfg = Release|Any CPU - {A8C76D37-6C7C-4617-8A05-7469C07E294D}.Release|x64.Build.0 = Release|Any CPU - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Debug|x64.ActiveCfg = Debug|Any CPU - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Debug|x64.Build.0 = Debug|Any CPU - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Release|Any CPU.Build.0 = Release|Any CPU - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Release|x64.ActiveCfg = Release|Any CPU - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {B683F6AC-DEC3-4AFC-B156-77F303EE2986} = {C05DAADF-AA11-4B93-A0B9-CCA2849A6A06} - {1ACE842F-1CA7-49E8-8E43-2C33EAF7E170} = {C05DAADF-AA11-4B93-A0B9-CCA2849A6A06} - {E1FA7999-5C45-46B1-9E83-5467264F928E} = {FE0B277E-B292-4FF2-8C69-15EECC1A3787} - {A8C76D37-6C7C-4617-8A05-7469C07E294D} = {FE0B277E-B292-4FF2-8C69-15EECC1A3787} - {A9D4DA06-7428-4639-BFD0-69D63CCD8F3E} = {C05DAADF-AA11-4B93-A0B9-CCA2849A6A06} + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {650FC714-F64F-41DD-9034-10B2326BA2A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {650FC714-F64F-41DD-9034-10B2326BA2A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {650FC714-F64F-41DD-9034-10B2326BA2A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {650FC714-F64F-41DD-9034-10B2326BA2A2}.Release|Any CPU.Build.0 = Release|Any CPU + {29224049-9128-4155-BB1B-E5A08386E998}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {29224049-9128-4155-BB1B-E5A08386E998}.Debug|Any CPU.Build.0 = Debug|Any CPU + {29224049-9128-4155-BB1B-E5A08386E998}.Release|Any CPU.ActiveCfg = Release|Any CPU + {29224049-9128-4155-BB1B-E5A08386E998}.Release|Any CPU.Build.0 = Release|Any CPU + {BDE9BAF4-DBCB-4C1E-A9B9-B5B7E3934A52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BDE9BAF4-DBCB-4C1E-A9B9-B5B7E3934A52}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BDE9BAF4-DBCB-4C1E-A9B9-B5B7E3934A52}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BDE9BAF4-DBCB-4C1E-A9B9-B5B7E3934A52}.Release|Any CPU.Build.0 = Release|Any CPU + {3DDFDBBC-AA8A-464B-AB80-19421C2F24FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DDFDBBC-AA8A-464B-AB80-19421C2F24FB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DDFDBBC-AA8A-464B-AB80-19421C2F24FB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DDFDBBC-AA8A-464B-AB80-19421C2F24FB}.Release|Any CPU.Build.0 = Release|Any CPU + {239046F4-B675-4CAC-B2E5-E2A1682718EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {239046F4-B675-4CAC-B2E5-E2A1682718EF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {239046F4-B675-4CAC-B2E5-E2A1682718EF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {239046F4-B675-4CAC-B2E5-E2A1682718EF}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {923EC79F-9700-466D-8668-106D7BDECF0D} + GlobalSection(NestedProjects) = preSolution + {650FC714-F64F-41DD-9034-10B2326BA2A2} = {B5EB820A-552E-4B9E-8C31-6470035686CB} + {FC3C5160-7D7B-4B51-A7FD-E441EEBCFB17} = {B5EB820A-552E-4B9E-8C31-6470035686CB} + {29224049-9128-4155-BB1B-E5A08386E998} = {FC3C5160-7D7B-4B51-A7FD-E441EEBCFB17} + {BDE9BAF4-DBCB-4C1E-A9B9-B5B7E3934A52} = {FC3C5160-7D7B-4B51-A7FD-E441EEBCFB17} + {3DDFDBBC-AA8A-464B-AB80-19421C2F24FB} = {B5EB820A-552E-4B9E-8C31-6470035686CB} + {4E974452-B43B-441A-8451-E9F4009BDEDE} = {B5EB820A-552E-4B9E-8C31-6470035686CB} + {239046F4-B675-4CAC-B2E5-E2A1682718EF} = {4E974452-B43B-441A-8451-E9F4009BDEDE} EndGlobalSection EndGlobal