From c2be99307672eccf37fad72f572e052963a6cc04 Mon Sep 17 00:00:00 2001 From: Ethan Dennis Date: Tue, 23 Aug 2022 09:15:23 -0700 Subject: [PATCH] Move azdo assets into bootstrap directory --- .../bootstrap/code}/Bootcamp.sln | 112 +++++++++--------- .../bootstrap/code}/src/Attendee/Attendee.cs | 30 ++--- .../code}/src/Attendee/Attendee.csproj | 14 +-- .../code}/test/AttendeeTest/AttendeeExists.cs | 36 +++--- .../test/AttendeeTest/AttendeeTest.csproj | 52 ++++---- .../pipelines/classic/valet-classic1.json | 0 .../pipelines/classic/valet-classic2.json | 0 .../{ => bootstrap}/pipelines/readme.md | 0 .../pipelines/yml/valet-mapper-example.yml | 0 .../pipelines/yml/valet-pipeline1.yml | 0 .../pipelines/yml/valet-pipeline2.yml | 0 code/readme.md | 5 - valet/.env.local.template | 7 -- 13 files changed, 122 insertions(+), 134 deletions(-) rename {code => azure_devops/bootstrap/code}/Bootcamp.sln (98%) rename {code => azure_devops/bootstrap/code}/src/Attendee/Attendee.cs (94%) rename {code => azure_devops/bootstrap/code}/src/Attendee/Attendee.csproj (94%) rename {code => azure_devops/bootstrap/code}/test/AttendeeTest/AttendeeExists.cs (95%) rename {code => azure_devops/bootstrap/code}/test/AttendeeTest/AttendeeTest.csproj (97%) rename azure_devops/{ => bootstrap}/pipelines/classic/valet-classic1.json (100%) rename azure_devops/{ => bootstrap}/pipelines/classic/valet-classic2.json (100%) rename azure_devops/{ => bootstrap}/pipelines/readme.md (100%) rename azure_devops/{ => bootstrap}/pipelines/yml/valet-mapper-example.yml (100%) rename azure_devops/{ => bootstrap}/pipelines/yml/valet-pipeline1.yml (100%) rename azure_devops/{ => bootstrap}/pipelines/yml/valet-pipeline2.yml (100%) delete mode 100644 code/readme.md delete mode 100644 valet/.env.local.template diff --git a/code/Bootcamp.sln b/azure_devops/bootstrap/code/Bootcamp.sln similarity index 98% rename from code/Bootcamp.sln rename to azure_devops/bootstrap/code/Bootcamp.sln index 099b74f..005c7db 100644 --- a/code/Bootcamp.sln +++ b/azure_devops/bootstrap/code/Bootcamp.sln @@ -1,56 +1,56 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30114.105 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B26D43AA-4A35-4035-9E99-48EF9A3E64DD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Attendee", "src\Attendee\Attendee.csproj", "{2804EC63-670C-4970-85E4-2A63C9327FF8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{348A52EC-7046-4D1A-88DB-55B025C2BB68}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AttendeeTest", "test\AttendeeTest\AttendeeTest.csproj", "{DED76823-F195-46D4-8509-5692E3431D53}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|x64.ActiveCfg = Debug|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|x64.Build.0 = Debug|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|x86.ActiveCfg = Debug|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|x86.Build.0 = Debug|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|Any CPU.Build.0 = Release|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|x64.ActiveCfg = Release|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|x64.Build.0 = Release|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|x86.ActiveCfg = Release|Any CPU - {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|x86.Build.0 = Release|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Debug|x64.ActiveCfg = Debug|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Debug|x64.Build.0 = Debug|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Debug|x86.ActiveCfg = Debug|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Debug|x86.Build.0 = Debug|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Release|Any CPU.Build.0 = Release|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Release|x64.ActiveCfg = Release|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Release|x64.Build.0 = Release|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Release|x86.ActiveCfg = Release|Any CPU - {DED76823-F195-46D4-8509-5692E3431D53}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {2804EC63-670C-4970-85E4-2A63C9327FF8} = {B26D43AA-4A35-4035-9E99-48EF9A3E64DD} - {DED76823-F195-46D4-8509-5692E3431D53} = {348A52EC-7046-4D1A-88DB-55B025C2BB68} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30114.105 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B26D43AA-4A35-4035-9E99-48EF9A3E64DD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Attendee", "src\Attendee\Attendee.csproj", "{2804EC63-670C-4970-85E4-2A63C9327FF8}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{348A52EC-7046-4D1A-88DB-55B025C2BB68}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AttendeeTest", "test\AttendeeTest\AttendeeTest.csproj", "{DED76823-F195-46D4-8509-5692E3431D53}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|x64.ActiveCfg = Debug|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|x64.Build.0 = Debug|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|x86.ActiveCfg = Debug|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Debug|x86.Build.0 = Debug|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|Any CPU.Build.0 = Release|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|x64.ActiveCfg = Release|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|x64.Build.0 = Release|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|x86.ActiveCfg = Release|Any CPU + {2804EC63-670C-4970-85E4-2A63C9327FF8}.Release|x86.Build.0 = Release|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Debug|x64.ActiveCfg = Debug|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Debug|x64.Build.0 = Debug|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Debug|x86.ActiveCfg = Debug|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Debug|x86.Build.0 = Debug|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Release|Any CPU.Build.0 = Release|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Release|x64.ActiveCfg = Release|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Release|x64.Build.0 = Release|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Release|x86.ActiveCfg = Release|Any CPU + {DED76823-F195-46D4-8509-5692E3431D53}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {2804EC63-670C-4970-85E4-2A63C9327FF8} = {B26D43AA-4A35-4035-9E99-48EF9A3E64DD} + {DED76823-F195-46D4-8509-5692E3431D53} = {348A52EC-7046-4D1A-88DB-55B025C2BB68} + EndGlobalSection +EndGlobal diff --git a/code/src/Attendee/Attendee.cs b/azure_devops/bootstrap/code/src/Attendee/Attendee.cs similarity index 94% rename from code/src/Attendee/Attendee.cs rename to azure_devops/bootstrap/code/src/Attendee/Attendee.cs index 37e4c52..5fd4008 100644 --- a/code/src/Attendee/Attendee.cs +++ b/azure_devops/bootstrap/code/src/Attendee/Attendee.cs @@ -1,15 +1,15 @@ -using System; - -namespace Attendees -{ - public class Attendee - { - public bool AddAttendee(string added) - { - if (added == "exists") - return true; - - return false; - } - } -} +using System; + +namespace Attendees +{ + public class Attendee + { + public bool AddAttendee(string added) + { + if (added == "exists") + return true; + + return false; + } + } +} diff --git a/code/src/Attendee/Attendee.csproj b/azure_devops/bootstrap/code/src/Attendee/Attendee.csproj similarity index 94% rename from code/src/Attendee/Attendee.csproj rename to azure_devops/bootstrap/code/src/Attendee/Attendee.csproj index 563e6f9..f208d30 100644 --- a/code/src/Attendee/Attendee.csproj +++ b/azure_devops/bootstrap/code/src/Attendee/Attendee.csproj @@ -1,7 +1,7 @@ - - - - net5.0 - - - + + + + net5.0 + + + diff --git a/code/test/AttendeeTest/AttendeeExists.cs b/azure_devops/bootstrap/code/test/AttendeeTest/AttendeeExists.cs similarity index 95% rename from code/test/AttendeeTest/AttendeeExists.cs rename to azure_devops/bootstrap/code/test/AttendeeTest/AttendeeExists.cs index 70e3b6d..12134ca 100644 --- a/code/test/AttendeeTest/AttendeeExists.cs +++ b/azure_devops/bootstrap/code/test/AttendeeTest/AttendeeExists.cs @@ -1,18 +1,18 @@ -using System; -using Xunit; -using Xunit.Extensions; -using Attendees; - -namespace AttendeeTest -{ - public class AttendeeTest - { - [Fact] - public void AttendeeExistsReturnTrue() - { - Attendee attendee = new Attendee(); - bool doesExist = attendee.AddAttendee("doesnotexist"); - Assert.False(doesExist, "The attendee does not exist"); - } - } -} +using System; +using Xunit; +using Xunit.Extensions; +using Attendees; + +namespace AttendeeTest +{ + public class AttendeeTest + { + [Fact] + public void AttendeeExistsReturnTrue() + { + Attendee attendee = new Attendee(); + bool doesExist = attendee.AddAttendee("doesnotexist"); + Assert.False(doesExist, "The attendee does not exist"); + } + } +} diff --git a/code/test/AttendeeTest/AttendeeTest.csproj b/azure_devops/bootstrap/code/test/AttendeeTest/AttendeeTest.csproj similarity index 97% rename from code/test/AttendeeTest/AttendeeTest.csproj rename to azure_devops/bootstrap/code/test/AttendeeTest/AttendeeTest.csproj index 8b41439..8f533dd 100644 --- a/code/test/AttendeeTest/AttendeeTest.csproj +++ b/azure_devops/bootstrap/code/test/AttendeeTest/AttendeeTest.csproj @@ -1,26 +1,26 @@ - - - - net5.0 - - false - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - + + + + net5.0 + + false + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + diff --git a/azure_devops/pipelines/classic/valet-classic1.json b/azure_devops/bootstrap/pipelines/classic/valet-classic1.json similarity index 100% rename from azure_devops/pipelines/classic/valet-classic1.json rename to azure_devops/bootstrap/pipelines/classic/valet-classic1.json diff --git a/azure_devops/pipelines/classic/valet-classic2.json b/azure_devops/bootstrap/pipelines/classic/valet-classic2.json similarity index 100% rename from azure_devops/pipelines/classic/valet-classic2.json rename to azure_devops/bootstrap/pipelines/classic/valet-classic2.json diff --git a/azure_devops/pipelines/readme.md b/azure_devops/bootstrap/pipelines/readme.md similarity index 100% rename from azure_devops/pipelines/readme.md rename to azure_devops/bootstrap/pipelines/readme.md diff --git a/azure_devops/pipelines/yml/valet-mapper-example.yml b/azure_devops/bootstrap/pipelines/yml/valet-mapper-example.yml similarity index 100% rename from azure_devops/pipelines/yml/valet-mapper-example.yml rename to azure_devops/bootstrap/pipelines/yml/valet-mapper-example.yml diff --git a/azure_devops/pipelines/yml/valet-pipeline1.yml b/azure_devops/bootstrap/pipelines/yml/valet-pipeline1.yml similarity index 100% rename from azure_devops/pipelines/yml/valet-pipeline1.yml rename to azure_devops/bootstrap/pipelines/yml/valet-pipeline1.yml diff --git a/azure_devops/pipelines/yml/valet-pipeline2.yml b/azure_devops/bootstrap/pipelines/yml/valet-pipeline2.yml similarity index 100% rename from azure_devops/pipelines/yml/valet-pipeline2.yml rename to azure_devops/bootstrap/pipelines/yml/valet-pipeline2.yml diff --git a/code/readme.md b/code/readme.md deleted file mode 100644 index d58f7e7..0000000 --- a/code/readme.md +++ /dev/null @@ -1,5 +0,0 @@ -# code folder -This folder contains a dotnet core application used for building puproses with the CI/CD selected. - -### Note any file added to this folder or sub folders will get migrated to the Azure DevOps instance when the GitHub Action runs to create and bootstrap the Azure DevOps project - diff --git a/valet/.env.local.template b/valet/.env.local.template deleted file mode 100644 index ce4ca6f..0000000 --- a/valet/.env.local.template +++ /dev/null @@ -1,7 +0,0 @@ -GITHUB_ACCESS_TOKEN= -GITHUB_INSTANCE_URL= - -AZURE_DEVOPS_PROJECT= -AZURE_DEVOPS_ORGANIZATION= -AZURE_DEVOPS_INSTANCE_URL= -AZURE_DEVOPS_ACCESS_TOKEN=