diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 13fd8db..79a0e58 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,36 +1,36 @@ name: CI - on: + workflow_dispatch: push: branches: - - main + - master pull_request: branches: - - main + - master jobs: - build: - + build: env: BUILD_CONFIG: 'Release' - SOLUTION: 'DarkUI.sln' - runs-on: ubuntu-latest + SOLUTION: 'MySolution.sln' + runs-on: windows-latest steps: - uses: actions/checkout@v2 - + - name: Setup NuGet uses: NuGet/setup-nuget@v1.0.5 - name: Restore dependencies - run: nuget restore $SOLUTION - + run: nuget restore ${SOLUTION} + - name: Setup .NET uses: actions/setup-dotnet@v1 with: dotnet-version: 5.0.x - name: Build - run: dotnet build $SOLUTION --configuration $BUILD_CONFIG --no-restore + run: dotnet build DarkUI.sln --configuration Release + + - name: Build Config + run: dotnet build ${SOLUTION} --configuration ${BUILD_CONFIG} --no-restore - - name: Run tests - run: dotnet test /p:Configuration=$env:BUILD_CONFIG --no-restore --no-build --verbosity normal diff --git a/DarkUI.sln b/DarkUI.sln index ef9ccd7..72bfac3 100644 --- a/DarkUI.sln +++ b/DarkUI.sln @@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DarkUI", "DarkUI\DarkUI.csp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example", "Example\Example.csproj", "{FA334815-6D78-4E9A-9F4D-6C8A58222A57}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.net4", "Example\Example.net4.csproj", "{C9035F2D-CA7C-4224-946E-457CBD81EB98}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -23,10 +21,6 @@ Global {FA334815-6D78-4E9A-9F4D-6C8A58222A57}.Debug|Any CPU.Build.0 = Debug|Any CPU {FA334815-6D78-4E9A-9F4D-6C8A58222A57}.Release|Any CPU.ActiveCfg = Release|Any CPU {FA334815-6D78-4E9A-9F4D-6C8A58222A57}.Release|Any CPU.Build.0 = Release|Any CPU - {C9035F2D-CA7C-4224-946E-457CBD81EB98}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9035F2D-CA7C-4224-946E-457CBD81EB98}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9035F2D-CA7C-4224-946E-457CBD81EB98}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9035F2D-CA7C-4224-946E-457CBD81EB98}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/DarkUI/DarkUI.csproj b/DarkUI/DarkUI.csproj index 51dc6b9..5c77452 100644 --- a/DarkUI/DarkUI.csproj +++ b/DarkUI/DarkUI.csproj @@ -2,11 +2,12 @@ Library - net5.0-windows;net4 + net5.0-windows true + false DarkUI.Net5 diff --git a/nuget.config b/nuget.config index 7b5df6a..767efec 100644 --- a/nuget.config +++ b/nuget.config @@ -2,7 +2,7 @@ - +