From 04850099dbab2e9237c8912d1f43f43485e1c0c3 Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 20:44:04 +0000 Subject: [PATCH 01/34] Set up CI with Azure Pipelines [skip ci] --- azure-pipelines.yml | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 0000000..de7d5a0 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,33 @@ +# .NET Desktop +# Build and run tests for .NET Desktop or Windows classic desktop solutions. +# Add steps that publish symbols, save build artifacts, and more: +# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net + +trigger: +- main + +pool: + vmImage: 'windows-latest' + +variables: + solution: '**/*.sln' + buildPlatform: 'Any CPU' + buildConfiguration: 'Release' + +steps: +- task: NuGetToolInstaller@1 + +- task: NuGetCommand@2 + inputs: + restoreSolution: '$(solution)' + +- task: VSBuild@1 + inputs: + solution: '$(solution)' + platform: '$(buildPlatform)' + configuration: '$(buildConfiguration)' + +- task: VSTest@2 + inputs: + platform: '$(buildPlatform)' + configuration: '$(buildConfiguration)' From 67f6cdd6e675ae02d2708bce94a91ac91278610f Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 20:52:06 +0000 Subject: [PATCH 02/34] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index de7d5a0..8a5bc0a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -17,17 +17,7 @@ variables: steps: - task: NuGetToolInstaller@1 -- task: NuGetCommand@2 +- task: DotNetCoreCLI@2 inputs: - restoreSolution: '$(solution)' - -- task: VSBuild@1 - inputs: - solution: '$(solution)' - platform: '$(buildPlatform)' - configuration: '$(buildConfiguration)' - -- task: VSTest@2 - inputs: - platform: '$(buildPlatform)' - configuration: '$(buildConfiguration)' + command: 'build' + projects: '**/*.csproj' From c1ea93a523f2d33deb1deff8e45f687987a1a716 Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 21:01:09 +0000 Subject: [PATCH 03/34] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8a5bc0a..301ce35 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,3 +21,4 @@ steps: inputs: command: 'build' projects: '**/*.csproj' + arguments: '/unsafe' From cdd27ac18c05d2455389b99be9733bb1cde8782e Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 21:09:16 +0000 Subject: [PATCH 04/34] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 301ce35..9b70dab 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,4 +21,4 @@ steps: inputs: command: 'build' projects: '**/*.csproj' - arguments: '/unsafe' + arguments: 'unsafe' From db006565a4ff02ad09c5d62507e60c78ef7b6aeb Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 21:10:38 +0000 Subject: [PATCH 05/34] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9b70dab..848ca1e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,4 +21,4 @@ steps: inputs: command: 'build' projects: '**/*.csproj' - arguments: 'unsafe' + arguments: '-unsafe' From 189a20f2f51ef28715c054ec3711fc7d26972ef5 Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 21:12:30 +0000 Subject: [PATCH 06/34] Create dotnet-core.yml --- .github/workflows/dotnet-core.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 .github/workflows/dotnet-core.yml diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml new file mode 100644 index 0000000..509c2ed --- /dev/null +++ b/.github/workflows/dotnet-core.yml @@ -0,0 +1,25 @@ +name: .NET Core + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.301 + - name: Install dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: Test + run: dotnet test --no-restore --verbosity normal From 223c85af6ea07137aa8a0a5e74dcf60b82c14cf4 Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 21:22:21 +0000 Subject: [PATCH 07/34] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 509c2ed..1a4c94d 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,6 +20,6 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore + run: dotnet build --configuration Release --no-restore ImpostorHQ.Command - name: Test - run: dotnet test --no-restore --verbosity normal + run: dotnet test --no-restore --verbosity normal ImpostorHQ.Command From 9dc4176f02f579793c3c2e5933d624832bbe42ef Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 21:27:13 +0000 Subject: [PATCH 08/34] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 1a4c94d..2fb9cc0 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,6 +20,6 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore ImpostorHQ.Command + run: dotnet build --configuration Release --no-restore ImpostorHQ.Command/ImpostorHQ.Command.sln - name: Test - run: dotnet test --no-restore --verbosity normal ImpostorHQ.Command + run: dotnet test --no-restore --verbosity normal ImpostorHQ.Command/ImpostorHQ.Command.sln From 5de3d879fafe4c63296adb5c61027ee60884628b Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 21:54:44 +0000 Subject: [PATCH 09/34] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 2fb9cc0..a4f7c3a 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -20,6 +20,6 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore ImpostorHQ.Command/ImpostorHQ.Command.sln + run: dotnet build --configuration Release --no-restore /ImpostorHQ.Command/ImpostorHQ.Command.sln - name: Test - run: dotnet test --no-restore --verbosity normal ImpostorHQ.Command/ImpostorHQ.Command.sln + run: dotnet test --no-restore --verbosity normal /ImpostorHQ.Command/ImpostorHQ.Command.sln From 2838a414b168d1260e0cadca057ede961bcbea47 Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 22:01:42 +0000 Subject: [PATCH 10/34] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index a4f7c3a..d9d3d4b 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -18,8 +18,8 @@ jobs: with: dotnet-version: 3.1.301 - name: Install dependencies - run: dotnet restore + run: dotnet restore ./ImpostorHQ.Command/ImpostorHQ.Command.sln - name: Build - run: dotnet build --configuration Release --no-restore /ImpostorHQ.Command/ImpostorHQ.Command.sln + run: dotnet build --configuration Release --no-restore ./ImpostorHQ.Command/ImpostorHQ.Command.sln - name: Test - run: dotnet test --no-restore --verbosity normal /ImpostorHQ.Command/ImpostorHQ.Command.sln + run: dotnet test --no-restore --verbosity normal ./ImpostorHQ.Command/ImpostorHQ.Command.sln From b3f43f01f5b9c6ef9ac5bacb5484b20bd6ed9ee7 Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 23:23:23 +0000 Subject: [PATCH 11/34] Add unsafe blocks to debug build --- .../Impostor.Commands.Core/Impostor.Commands.Core.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ImpostorHQ.Command/Impostor.Commands.Core/Impostor.Commands.Core.csproj b/ImpostorHQ.Command/Impostor.Commands.Core/Impostor.Commands.Core.csproj index b3a531f..5bf0e6b 100644 --- a/ImpostorHQ.Command/Impostor.Commands.Core/Impostor.Commands.Core.csproj +++ b/ImpostorHQ.Command/Impostor.Commands.Core/Impostor.Commands.Core.csproj @@ -11,6 +11,9 @@ false true + + true + From 96492c5ed8d82599347c79f8eda6da57a70c0c20 Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 23:25:44 +0000 Subject: [PATCH 12/34] Update azure-pipelines.yml --- azure-pipelines.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 848ca1e..8a5bc0a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,4 +21,3 @@ steps: inputs: command: 'build' projects: '**/*.csproj' - arguments: '-unsafe' From 677f6ec7ade55146ae13a93b9f1b320c55582d4e Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 17:29:01 -0600 Subject: [PATCH 13/34] Update azure-pipelines.yml --- azure-pipelines.yml | 62 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 54 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 848ca1e..48c484a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,8 +1,3 @@ -# .NET Desktop -# Build and run tests for .NET Desktop or Windows classic desktop solutions. -# Add steps that publish symbols, save build artifacts, and more: -# https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net - trigger: - main @@ -15,10 +10,61 @@ variables: buildConfiguration: 'Release' steps: -- task: NuGetToolInstaller@1 - +- task: UseDotNet@2 + displayName: 'Get .NET Core 5 sdk' + inputs: + version: 5.x + - task: DotNetCoreCLI@2 + displayName: ".Net Restore" + inputs: + command: 'restore' + projects: '**/*.csproj' + arguments: '--configurations $(buildConfiguration)' + +- task: DotNetCoreCLI@2 + displayName: ".Net Build" inputs: command: 'build' projects: '**/*.csproj' - arguments: '-unsafe' + arguments: '--configurations $(buildConfiguration) --no-restore' +- task: CopyFiles@2 + inputs: + Contents: '**/Impostor.Commands.Core.dll' + TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorCommandsCore' + flattenFolders: true +- task: CopyFiles@2 + inputs: + Contents: '**/ImpostorHQ.Plugin.Fashionable.dll' + TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' + flattenFolders: true + - task: CopyFiles@2 + inputs: + Contents: '**/ImpostorHQ.Plugin.HallOfShame.dll' + TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' + flattenFolders: true +- task: CopyFiles@2 + inputs: + Contents: '**/Plugin.Test.dll' + TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' + flattenFolders: true +- task: CopyFiles@2 + inputs: + Contents: '**/LogParser.exe' + TargetFolder: '$(Build.ArtifactStagingDirectory)/LogParser' + flattenFolders: true +- task: CopyFiles@2 + inputs: + Contents: '**/ImpostorHQ.Plugin.Fashionable.Designer.exe' + TargetFolder: '$(Build.ArtifactStagingDirectory)/FashionableDesigner' + flattenFolders: true + +- publish: '$(Build.ArtifactStagingDirectory)/ImpostorCommandsCore' + artifact: ImpostorCommandsCore +- publish: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' + artifact: ImpostorHQPlugins +- publish: '$(Build.ArtifactStagingDirectory)/LogParser' + artifact: LogParser +- publish: '$(Build.ArtifactStagingDirectory)/FashionableDesigner' + artifact: FashionableDesigner + From 0d2815b4693704799bc8a7538a66142b09bc66a9 Mon Sep 17 00:00:00 2001 From: dimaguy Date: Tue, 24 Nov 2020 23:30:09 +0000 Subject: [PATCH 14/34] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index d9d3d4b..cdd4ff9 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -18,8 +18,8 @@ jobs: with: dotnet-version: 3.1.301 - name: Install dependencies - run: dotnet restore ./ImpostorHQ.Command/ImpostorHQ.Command.sln + run: dotnet restore /home/runner/work/ImpostorHQ/ImpostorHQ/ImpostorHQ.Command/ImpostorHQ.Command.sln - name: Build - run: dotnet build --configuration Release --no-restore ./ImpostorHQ.Command/ImpostorHQ.Command.sln + run: dotnet build --configuration Release --no-restore /home/runner/work/ImpostorHQ/ImpostorHQ/ImpostorHQ.Command/ImpostorHQ.Command.sln - name: Test - run: dotnet test --no-restore --verbosity normal ./ImpostorHQ.Command/ImpostorHQ.Command.sln + run: dotnet test --no-restore --verbosity normal /home/runner/work/ImpostorHQ/ImpostorHQ/ImpostorHQ.Command/ImpostorHQ.Command.sln From ff84a0b51370b3c734a464807a23f4d70b7e695a Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 17:31:24 -0600 Subject: [PATCH 15/34] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 48c484a..2e5b994 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -38,7 +38,7 @@ steps: Contents: '**/ImpostorHQ.Plugin.Fashionable.dll' TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' flattenFolders: true - - task: CopyFiles@2 +- task: CopyFiles@2 inputs: Contents: '**/ImpostorHQ.Plugin.HallOfShame.dll' TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' From 9be03b25f2612188733b3fba016f46b7af9800c4 Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 17:34:28 -0600 Subject: [PATCH 16/34] corrected typo --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2e5b994..beaa16b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,14 +20,14 @@ steps: inputs: command: 'restore' projects: '**/*.csproj' - arguments: '--configurations $(buildConfiguration)' + arguments: '--configuration $(buildConfiguration)' - task: DotNetCoreCLI@2 displayName: ".Net Build" inputs: command: 'build' projects: '**/*.csproj' - arguments: '--configurations $(buildConfiguration) --no-restore' + arguments: '--configuration $(buildConfiguration) --no-restore' - task: CopyFiles@2 inputs: Contents: '**/Impostor.Commands.Core.dll' From 9740e78bcd0edb57edd5dacb6a04ad28cdb30b86 Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 17:38:54 -0600 Subject: [PATCH 17/34] dropped .Net 5 --- azure-pipelines.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index beaa16b..86cf6ed 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,11 +10,6 @@ variables: buildConfiguration: 'Release' steps: -- task: UseDotNet@2 - displayName: 'Get .NET Core 5 sdk' - inputs: - version: 5.x - - task: DotNetCoreCLI@2 displayName: ".Net Restore" inputs: From dd3b7848ac195fc72409b3caae974f3a170e866d Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 17:51:40 -0600 Subject: [PATCH 18/34] change to build sln --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 86cf6ed..7106adb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,11 +10,12 @@ variables: buildConfiguration: 'Release' steps: + - task: DotNetCoreCLI@2 displayName: ".Net Restore" inputs: command: 'restore' - projects: '**/*.csproj' + projects: '**/*.sln' arguments: '--configuration $(buildConfiguration)' - task: DotNetCoreCLI@2 From 9415a9161cf572a6579f932dfa52604a56f476e5 Mon Sep 17 00:00:00 2001 From: Gavin Steinhoff Date: Tue, 24 Nov 2020 17:53:42 -0600 Subject: [PATCH 19/34] removed unused project --- ImpostorHQ.Command/Impostor.Command.sln | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/ImpostorHQ.Command/Impostor.Command.sln b/ImpostorHQ.Command/Impostor.Command.sln index 49f298b..20193db 100644 --- a/ImpostorHQ.Command/Impostor.Command.sln +++ b/ImpostorHQ.Command/Impostor.Command.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.30611.23 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Impostor.Commands.Core", "Impostor.Commands.Core\Impostor.Commands.Core.csproj", "{1E86A8D8-C0B4-4194-9274-C93885A6FD84}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Monitors.Tests", "Monitors.Tests\Monitors.Tests.csproj", "{EE7778C7-9863-4BBC-9DDE-4B95AF946416}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LogParser", "LogParser\LogParser.csproj", "{0D072C9E-1BDA-478A-90C3-144CD637FB40}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.Test", "Plugin.Test\Plugin.Test.csproj", "{C916DC6C-D2AD-4869-9B5E-8C79D83A14AD}" @@ -17,7 +15,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImpostorHQ.Plugin.Fashionab EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImpostorHQ.Plugin.Fashionable.Designer", "ImpostorHQ.Plugin.Fashionable.Designer\ImpostorHQ.Plugin.Fashionable.Designer.csproj", "{76E59656-C45F-4F28-A184-9CB15EE5AF73}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImpostorHQ.Plugin.HallOfShame", "ImpostorHQ.Plugin.HallOfShame\ImpostorHQ.Plugin.HallOfShame.csproj", "{6E531144-02F5-46A3-9758-D660A09EE7C0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImpostorHQ.Plugin.HallOfShame", "ImpostorHQ.Plugin.HallOfShame\ImpostorHQ.Plugin.HallOfShame.csproj", "{6E531144-02F5-46A3-9758-D660A09EE7C0}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -35,14 +33,6 @@ Global {1E86A8D8-C0B4-4194-9274-C93885A6FD84}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU {1E86A8D8-C0B4-4194-9274-C93885A6FD84}.Release|Any CPU.ActiveCfg = Release|Any CPU {1E86A8D8-C0B4-4194-9274-C93885A6FD84}.Release|Any CPU.Build.0 = Release|Any CPU - {EE7778C7-9863-4BBC-9DDE-4B95AF946416}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU - {EE7778C7-9863-4BBC-9DDE-4B95AF946416}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU - {EE7778C7-9863-4BBC-9DDE-4B95AF946416}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EE7778C7-9863-4BBC-9DDE-4B95AF946416}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EE7778C7-9863-4BBC-9DDE-4B95AF946416}.Release_Ubuntu|Any CPU.ActiveCfg = Release|Any CPU - {EE7778C7-9863-4BBC-9DDE-4B95AF946416}.Release_Ubuntu|Any CPU.Build.0 = Release|Any CPU - {EE7778C7-9863-4BBC-9DDE-4B95AF946416}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EE7778C7-9863-4BBC-9DDE-4B95AF946416}.Release|Any CPU.Build.0 = Release|Any CPU {0D072C9E-1BDA-478A-90C3-144CD637FB40}.Debug_Ubuntu|Any CPU.ActiveCfg = Debug|Any CPU {0D072C9E-1BDA-478A-90C3-144CD637FB40}.Debug_Ubuntu|Any CPU.Build.0 = Debug|Any CPU {0D072C9E-1BDA-478A-90C3-144CD637FB40}.Debug|Any CPU.ActiveCfg = Debug|Any CPU From 34346704c3c495064abe9ef61e46af412a94a6fb Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 17:56:46 -0600 Subject: [PATCH 20/34] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7106adb..dfd2892 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,7 +10,10 @@ variables: buildConfiguration: 'Release' steps: - +- task: UseDotNet@2 + displayName: 'Get .NET Core 3 sdk' + inputs: + version: 3.x - task: DotNetCoreCLI@2 displayName: ".Net Restore" inputs: From 2bb752315096c63fe4be32e801c2f5f4331d234d Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 17:57:11 -0600 Subject: [PATCH 21/34] Downgraded to .Net 3 --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index dfd2892..ed90709 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -14,6 +14,7 @@ steps: displayName: 'Get .NET Core 3 sdk' inputs: version: 3.x + - task: DotNetCoreCLI@2 displayName: ".Net Restore" inputs: From 884ac45544fa0e47d130b86892e61958416c9a4b Mon Sep 17 00:00:00 2001 From: Miguel Rodriguez Date: Tue, 24 Nov 2020 18:58:01 -0500 Subject: [PATCH 22/34] Hoping this works... ...else this is going to be *fun* --- azure-pipelines.yml | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8a5bc0a..7722a4c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,4 +20,24 @@ steps: - task: DotNetCoreCLI@2 inputs: command: 'build' - projects: '**/*.csproj' + projects: 'Impostor.Commands.Core\Impostor.Commands.Core.csproj' +- task: DotNetCoreCLI@2 + inputs: + command: 'build' + projects: 'Format.SEL\Format.SEL.csproj' +- task: DotNetCoreCLI@2 + inputs: + command: 'build' + projects: 'ImpostorHQ.Plugin.Fashionable\ImpostorHQ.Plugin.Fashionable.csproj' +- task: DotNetCoreCLI@2 + inputs: + command: 'build' + projects: 'ImpostorHQ.Plugin.HallOfShame\ImpostorHQ.Plugin.HallOfShame.csproj' + - task: DotNetCoreCLI@2 + inputs: + command: 'build' + projects: 'LogParser\LogParser.csproj' + - task: DotNetCoreCLI@2 + inputs: + command: 'build' + projects: 'Plugin.Test\Plugin.Test.csproj' From 7c108dbcd50e8f855638bfea1cbd2af09a211eb1 Mon Sep 17 00:00:00 2001 From: Miguel Rodriguez Date: Tue, 24 Nov 2020 19:01:18 -0500 Subject: [PATCH 23/34] Update azure-pipelines.yml --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7722a4c..435eb5f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,23 +21,23 @@ steps: inputs: command: 'build' projects: 'Impostor.Commands.Core\Impostor.Commands.Core.csproj' -- task: DotNetCoreCLI@2 +- task: DotNetCoreCLI@3 inputs: command: 'build' projects: 'Format.SEL\Format.SEL.csproj' -- task: DotNetCoreCLI@2 +- task: DotNetCoreCLI@4 inputs: command: 'build' projects: 'ImpostorHQ.Plugin.Fashionable\ImpostorHQ.Plugin.Fashionable.csproj' -- task: DotNetCoreCLI@2 +- task: DotNetCoreCLI@5 inputs: command: 'build' projects: 'ImpostorHQ.Plugin.HallOfShame\ImpostorHQ.Plugin.HallOfShame.csproj' - - task: DotNetCoreCLI@2 +- task: DotNetCoreCLI@6 inputs: command: 'build' projects: 'LogParser\LogParser.csproj' - - task: DotNetCoreCLI@2 +- task: DotNetCoreCLI@7 inputs: command: 'build' projects: 'Plugin.Test\Plugin.Test.csproj' From b1b2fd7f873c97d86a6543833f72fb4bf5629005 Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:04:06 -0600 Subject: [PATCH 24/34] trying Exclude --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index ed90709..0b24c19 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -19,7 +19,7 @@ steps: displayName: ".Net Restore" inputs: command: 'restore' - projects: '**/*.sln' + projects: '**/*!ImpostorHQ.Plugin.Fashionable.Designer.sln' arguments: '--configuration $(buildConfiguration)' - task: DotNetCoreCLI@2 From 90f028173fc17216cd5f4d882d2493b4bfd3a6ab Mon Sep 17 00:00:00 2001 From: dimaguy Date: Wed, 25 Nov 2020 00:07:41 +0000 Subject: [PATCH 25/34] Update azure-pipelines.yml --- azure-pipelines.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 435eb5f..78c2405 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -25,19 +25,19 @@ steps: inputs: command: 'build' projects: 'Format.SEL\Format.SEL.csproj' -- task: DotNetCoreCLI@4 +- task: DotNetCoreCLI@3 inputs: command: 'build' projects: 'ImpostorHQ.Plugin.Fashionable\ImpostorHQ.Plugin.Fashionable.csproj' -- task: DotNetCoreCLI@5 +- task: DotNetCoreCLI@3 inputs: command: 'build' projects: 'ImpostorHQ.Plugin.HallOfShame\ImpostorHQ.Plugin.HallOfShame.csproj' -- task: DotNetCoreCLI@6 +- task: DotNetCoreCLI@3 inputs: command: 'build' projects: 'LogParser\LogParser.csproj' -- task: DotNetCoreCLI@7 +- task: DotNetCoreCLI@3 inputs: command: 'build' projects: 'Plugin.Test\Plugin.Test.csproj' From 047601f4f349cba1a11d82d9273b41e046cccdbd Mon Sep 17 00:00:00 2001 From: dimaguy Date: Wed, 25 Nov 2020 00:11:13 +0000 Subject: [PATCH 26/34] Update azure-pipelines.yml --- azure-pipelines.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 78c2405..4f9c1d2 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -21,23 +21,23 @@ steps: inputs: command: 'build' projects: 'Impostor.Commands.Core\Impostor.Commands.Core.csproj' -- task: DotNetCoreCLI@3 +- task: DotNetCoreCLI@2 inputs: command: 'build' projects: 'Format.SEL\Format.SEL.csproj' -- task: DotNetCoreCLI@3 +- task: DotNetCoreCLI@2 inputs: command: 'build' projects: 'ImpostorHQ.Plugin.Fashionable\ImpostorHQ.Plugin.Fashionable.csproj' -- task: DotNetCoreCLI@3 +- task: DotNetCoreCLI@2 inputs: command: 'build' projects: 'ImpostorHQ.Plugin.HallOfShame\ImpostorHQ.Plugin.HallOfShame.csproj' -- task: DotNetCoreCLI@3 +- task: DotNetCoreCLI@2 inputs: command: 'build' projects: 'LogParser\LogParser.csproj' -- task: DotNetCoreCLI@3 +- task: DotNetCoreCLI@2 inputs: command: 'build' projects: 'Plugin.Test\Plugin.Test.csproj' From 0e36d144038a6bf1aaf668ff54c3c80ef386305d Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:11:23 -0600 Subject: [PATCH 27/34] trying Exclude --- azure-pipelines.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0b24c19..71306ed 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,23 +10,22 @@ variables: buildConfiguration: 'Release' steps: -- task: UseDotNet@2 - displayName: 'Get .NET Core 3 sdk' - inputs: - version: 3.x - - task: DotNetCoreCLI@2 displayName: ".Net Restore" inputs: command: 'restore' - projects: '**/*!ImpostorHQ.Plugin.Fashionable.Designer.sln' + projects: | + **/*.csproj + !**/ImpostorHQ.Plugin.Fashionable.Designer.csproj arguments: '--configuration $(buildConfiguration)' - task: DotNetCoreCLI@2 displayName: ".Net Build" inputs: command: 'build' - projects: '**/*.csproj' + projects: | + **/*.csproj + !**/ImpostorHQ.Plugin.Fashionable.Designer.csproj arguments: '--configuration $(buildConfiguration) --no-restore' - task: CopyFiles@2 inputs: From 40e9653946b0dcabc5820396e59d666864c980af Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:21:19 -0600 Subject: [PATCH 28/34] added Fashionable.Designer --- azure-pipelines.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 71306ed..0abda70 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -10,6 +10,15 @@ variables: buildConfiguration: 'Release' steps: +- task: NuGetCommand@2 + inputs: + command: 'restore' + restoreSolution: '**/ImpostorHQ.Plugin.Fashionable.Designer.csproj' + feedsToUse: 'select' +- task: MSBuild@1 + inputs: + solution: '**/ImpostorHQ.Plugin.Fashionable.Designer.csproj' + configuration: '$(buildConfiguration)' - task: DotNetCoreCLI@2 displayName: ".Net Restore" inputs: From c046e242f20cf3428ad0894cb09b6b31482658eb Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:22:02 -0600 Subject: [PATCH 29/34] added display names --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0abda70..87e3073 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,11 +11,13 @@ variables: steps: - task: NuGetCommand@2 + displayName: Nuget Restore inputs: command: 'restore' restoreSolution: '**/ImpostorHQ.Plugin.Fashionable.Designer.csproj' feedsToUse: 'select' - task: MSBuild@1 + displayName: MS Build inputs: solution: '**/ImpostorHQ.Plugin.Fashionable.Designer.csproj' configuration: '$(buildConfiguration)' From 64b9e4af409eb081690f1ac025939ac21a4ada94 Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:34:38 -0600 Subject: [PATCH 30/34] added quality of life stuff --- azure-pipelines.yml | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 87e3073..2d6ceb8 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,5 +1,18 @@ trigger: -- main + branches: + include: + - main + paths: + exclude: + - ImpostorHQ.Dashboard/* + +pr: + branches: + include: + - main + paths: + exclude: + - ImpostorHQ.Dashboard/* pool: vmImage: 'windows-latest' @@ -44,37 +57,49 @@ steps: TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorCommandsCore' flattenFolders: true - task: CopyFiles@2 + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: Contents: '**/ImpostorHQ.Plugin.Fashionable.dll' TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' flattenFolders: true - task: CopyFiles@2 + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: Contents: '**/ImpostorHQ.Plugin.HallOfShame.dll' TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' flattenFolders: true - task: CopyFiles@2 + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: Contents: '**/Plugin.Test.dll' TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' flattenFolders: true - task: CopyFiles@2 + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: Contents: '**/LogParser.exe' TargetFolder: '$(Build.ArtifactStagingDirectory)/LogParser' flattenFolders: true - task: CopyFiles@2 + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: Contents: '**/ImpostorHQ.Plugin.Fashionable.Designer.exe' TargetFolder: '$(Build.ArtifactStagingDirectory)/FashionableDesigner' flattenFolders: true - publish: '$(Build.ArtifactStagingDirectory)/ImpostorCommandsCore' + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) artifact: ImpostorCommandsCore + - publish: '$(Build.ArtifactStagingDirectory)/ImpostorHQPlugin' + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) artifact: ImpostorHQPlugins + - publish: '$(Build.ArtifactStagingDirectory)/LogParser' - artifact: LogParser + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) + artifact: + - publish: '$(Build.ArtifactStagingDirectory)/FashionableDesigner' + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) artifact: FashionableDesigner From fd69d07f76cf1a3060e659aa7e11447f45339079 Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:41:27 -0600 Subject: [PATCH 31/34] Delete dotnet-core.yml --- .github/workflows/dotnet-core.yml | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 .github/workflows/dotnet-core.yml diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml deleted file mode 100644 index d9d3d4b..0000000 --- a/.github/workflows/dotnet-core.yml +++ /dev/null @@ -1,25 +0,0 @@ -name: .NET Core - -on: - push: - branches: [ main ] - pull_request: - branches: [ main ] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 3.1.301 - - name: Install dependencies - run: dotnet restore ./ImpostorHQ.Command/ImpostorHQ.Command.sln - - name: Build - run: dotnet build --configuration Release --no-restore ./ImpostorHQ.Command/ImpostorHQ.Command.sln - - name: Test - run: dotnet test --no-restore --verbosity normal ./ImpostorHQ.Command/ImpostorHQ.Command.sln From ace9827f74b24739f55573933beb0a179aa3f99f Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:42:06 -0600 Subject: [PATCH 32/34] missed one copy --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 2d6ceb8..8452e03 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -52,6 +52,7 @@ steps: !**/ImpostorHQ.Plugin.Fashionable.Designer.csproj arguments: '--configuration $(buildConfiguration) --no-restore' - task: CopyFiles@2 + condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) inputs: Contents: '**/Impostor.Commands.Core.dll' TargetFolder: '$(Build.ArtifactStagingDirectory)/ImpostorCommandsCore' From 2896630274658b9f129a157d963f254d2fea47a5 Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:43:43 -0600 Subject: [PATCH 33/34] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8452e03..c4e352c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,3 +1,4 @@ +# Made by Gavin Steinhoff trigger: branches: include: From 429175342ea24e592d87a2669c8970e41dd74262 Mon Sep 17 00:00:00 2001 From: Gavin Date: Tue, 24 Nov 2020 18:45:00 -0600 Subject: [PATCH 34/34] missing artifact name --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c4e352c..d403fdb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -99,7 +99,7 @@ steps: - publish: '$(Build.ArtifactStagingDirectory)/LogParser' condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main')) - artifact: + artifact: LogParser - publish: '$(Build.ArtifactStagingDirectory)/FashionableDesigner' condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))