diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 74852074..6ed0c09a 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -30,7 +30,7 @@ jobs: env: Configuration: Release - Solution_Path: Daybreak.sln + Solution_Path: Daybreak.slnx Test_Project_Path: Daybreak.Tests\Daybreak.Tests.csproj Wpf_Project_Path: Daybreak\Daybreak.csproj Actions_Allow_Unsecure_Commands: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 91ddc0ab..26b4ebaf 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -12,6 +12,7 @@ on: pull_request: branches: - master + - release/* jobs: @@ -24,7 +25,7 @@ jobs: runs-on: windows-latest env: - Solution_Path: Daybreak.sln + Solution_Path: Daybreak.slnx Test_Project_Path: Daybreak.Tests\Daybreak.Tests.csproj Wpf_Project_Path: Daybreak\Daybreak.csproj Actions_Allow_Unsecure_Commands: true diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 646d7936..77dc7cab 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -38,7 +38,7 @@ jobs: env: Configuration: Release - Solution_Path: Daybreak.sln + Solution_Path: Daybreak.slnx Test_Project_Path: Daybreak.Tests\Daybreak.Tests.csproj Wpf_Project_Path: Daybreak\Daybreak.csproj Actions_Allow_Unsecure_Commands: true diff --git a/.github/workflows/version_check.yaml b/.github/workflows/version_check.yaml index 3ff0a496..8dc04c71 100644 --- a/.github/workflows/version_check.yaml +++ b/.github/workflows/version_check.yaml @@ -20,7 +20,7 @@ jobs: env: Configuration: Release - Solution_Path: Daybreak.sln + Solution_Path: Daybreak.slnx Actions_Allow_Unsecure_Commands: true steps: diff --git a/Daybreak.Shared/Daybreak.Shared.csproj b/Daybreak.Shared/Daybreak.Shared.csproj index 93a03ec7..532fe57d 100644 --- a/Daybreak.Shared/Daybreak.Shared.csproj +++ b/Daybreak.Shared/Daybreak.Shared.csproj @@ -6,6 +6,7 @@ true preview True + AnyCPU;x86 diff --git a/Daybreak.sln b/Daybreak.sln deleted file mode 100644 index 4a775119..00000000 --- a/Daybreak.sln +++ /dev/null @@ -1,133 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.2.32616.157 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak", "Daybreak\Daybreak.csproj", "{AA45C2B1-8BD0-466C-9271-699F168905AF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak.Tests", "Daybreak.Tests\Daybreak.Tests.csproj", "{C911C1C2-6566-419C-89C7-F802EB3FE709}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Pipelines", "Pipelines", "{067BF93F-E5B2-4E99-886E-039C04F35EAB}" - ProjectSection(SolutionItems) = preProject - .github\workflows\cd.yaml = .github\workflows\cd.yaml - .github\workflows\ci.yaml = .github\workflows\ci.yaml - .github\workflows\codeql-analysis.yml = .github\workflows\codeql-analysis.yml - .github\dependabot.yml = .github\dependabot.yml - .github\workflows\version_check.yaml = .github\workflows\version_check.yaml - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak.Installer", "Daybreak.Installer\Daybreak.Installer.csproj", "{4E2BB805-135D-4F02-8C53-3D8B6876D323}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{41AE8C5D-25E1-4B08-8D65-868552421A63}" - ProjectSection(SolutionItems) = preProject - Scripts\BuildRelease.ps1 = Scripts\BuildRelease.ps1 - Scripts\CompareVersions.ps1 = Scripts\CompareVersions.ps1 - Scripts\GetBuildVersion.ps1 = Scripts\GetBuildVersion.ps1 - Scripts\PushFilesToBlobStorage.ps1 = Scripts\PushFilesToBlobStorage.ps1 - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{0E30DDA0-2111-4E6C-851E-01DC34124FC2}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - .github\CODEOWNERS = .github\CODEOWNERS - Directory.Build.props = Directory.Build.props - Directory.Packages.props = Directory.Packages.props - README.md = README.md - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Daybreak.7ZipExtractor", "Daybreak.7ZipExtractor\Daybreak.7ZipExtractor.csproj", "{CA60F9AC-A496-4DB6-970E-ECE73B051C05}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daybreak.API", "Daybreak.API\Daybreak.API.csproj", "{38546C66-D14D-47B3-9F13-3CC439C271E6}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Daybreak.Shared", "Daybreak.Shared\Daybreak.Shared.csproj", "{B09BC4ED-E9F4-4A4B-B66B-50C307594B02}" -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(ProjectConfigurationPlatforms) = postSolution - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.ActiveCfg = Debug|x64 - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x64.Build.0 = Debug|x64 - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x86.ActiveCfg = Debug|x86 - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Debug|x86.Build.0 = Debug|x86 - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|Any CPU.Build.0 = Release|Any CPU - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.ActiveCfg = Release|x64 - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x64.Build.0 = Release|x64 - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x86.ActiveCfg = Release|x86 - {AA45C2B1-8BD0-466C-9271-699F168905AF}.Release|x86.Build.0 = Release|x86 - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x64.ActiveCfg = Debug|x64 - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x64.Build.0 = Debug|x64 - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x86.ActiveCfg = Debug|x86 - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Debug|x86.Build.0 = Debug|x86 - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|Any CPU.Build.0 = Release|Any CPU - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x64.ActiveCfg = Release|x64 - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x64.Build.0 = Release|x64 - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x86.ActiveCfg = Release|x86 - {C911C1C2-6566-419C-89C7-F802EB3FE709}.Release|x86.Build.0 = Release|x86 - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x64.ActiveCfg = Debug|x86 - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x64.Build.0 = Debug|x86 - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x86.ActiveCfg = Debug|x86 - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Debug|x86.Build.0 = Debug|x86 - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|Any CPU.Build.0 = Release|Any CPU - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x64.ActiveCfg = Release|x64 - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x64.Build.0 = Release|x64 - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x86.ActiveCfg = Release|x86 - {4E2BB805-135D-4F02-8C53-3D8B6876D323}.Release|x86.Build.0 = Release|x86 - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Debug|x64.ActiveCfg = Debug|x64 - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Debug|x64.Build.0 = Debug|x64 - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Debug|x86.ActiveCfg = Debug|x64 - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Debug|x86.Build.0 = Debug|x64 - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Release|Any CPU.Build.0 = Release|Any CPU - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Release|x64.ActiveCfg = Release|Any CPU - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Release|x64.Build.0 = Release|Any CPU - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Release|x86.ActiveCfg = Release|x64 - {CA60F9AC-A496-4DB6-970E-ECE73B051C05}.Release|x86.Build.0 = Release|x64 - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Debug|x64.ActiveCfg = Debug|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Debug|x64.Build.0 = Debug|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Debug|x86.ActiveCfg = Debug|x86 - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Debug|x86.Build.0 = Debug|x86 - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Release|Any CPU.Build.0 = Release|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Release|x64.ActiveCfg = Release|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Release|x64.Build.0 = Release|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Release|x86.ActiveCfg = Release|Any CPU - {38546C66-D14D-47B3-9F13-3CC439C271E6}.Release|x86.Build.0 = Release|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Debug|x64.ActiveCfg = Debug|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Debug|x64.Build.0 = Debug|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Debug|x86.ActiveCfg = Debug|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Debug|x86.Build.0 = Debug|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Release|Any CPU.Build.0 = Release|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Release|x64.ActiveCfg = Release|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Release|x64.Build.0 = Release|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Release|x86.ActiveCfg = Release|Any CPU - {B09BC4ED-E9F4-4A4B-B66B-50C307594B02}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {CCD52E16-A28A-4B8E-AD8F-F035E31570BC} - EndGlobalSection -EndGlobal diff --git a/Daybreak.slnx b/Daybreak.slnx new file mode 100644 index 00000000..63d871c1 --- /dev/null +++ b/Daybreak.slnx @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +