Update dotnet.yml

Gave up on back supporting net4
This commit is contained in:
Micheal Colhoun 2021-09-04 20:00:41 +01:00
parent 6aea4a7a0d
commit abc16b03ef
4 changed files with 16 additions and 21 deletions

View File

@ -1,36 +1,36 @@
name: CI name: CI
on: on:
workflow_dispatch:
push: push:
branches: branches:
- main - master
pull_request: pull_request:
branches: branches:
- main - master
jobs: jobs:
build: build:
env: env:
BUILD_CONFIG: 'Release' BUILD_CONFIG: 'Release'
SOLUTION: 'DarkUI.sln' SOLUTION: 'MySolution.sln'
runs-on: ubuntu-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Setup NuGet - name: Setup NuGet
uses: NuGet/setup-nuget@v1.0.5 uses: NuGet/setup-nuget@v1.0.5
- name: Restore dependencies - name: Restore dependencies
run: nuget restore $SOLUTION run: nuget restore ${SOLUTION}
- name: Setup .NET - name: Setup .NET
uses: actions/setup-dotnet@v1 uses: actions/setup-dotnet@v1
with: with:
dotnet-version: 5.0.x dotnet-version: 5.0.x
- name: Build - 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

View File

@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DarkUI", "DarkUI\DarkUI.csp
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example", "Example\Example.csproj", "{FA334815-6D78-4E9A-9F4D-6C8A58222A57}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Example", "Example\Example.csproj", "{FA334815-6D78-4E9A-9F4D-6C8A58222A57}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Example.net4", "Example\Example.net4.csproj", "{C9035F2D-CA7C-4224-946E-457CBD81EB98}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU 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}.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.ActiveCfg = Release|Any CPU
{FA334815-6D78-4E9A-9F4D-6C8A58222A57}.Release|Any CPU.Build.0 = 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 EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

View File

@ -2,11 +2,12 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<TargetFrameworks>net5.0-windows;net4</TargetFrameworks> <TargetFrameworks>net5.0-windows</TargetFrameworks>
<UseWindowsForms>true</UseWindowsForms> <UseWindowsForms>true</UseWindowsForms>
<ApplicationIcon /> <ApplicationIcon />
<StartupObject /> <StartupObject />
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
<PackageId>DarkUI.Net5</PackageId> <PackageId>DarkUI.Net5</PackageId>

View File

@ -2,7 +2,7 @@
<configuration> <configuration>
<packageSources> <packageSources>
<!--To inherit the global NuGet package sources remove the <clear/> line below --> <!--To inherit the global NuGet package sources remove the <clear/> line below -->
<clear /> <!-- <clear /> -->
<add key="github" value="https://nuget.pkg.github.com/colhountech/index.json" /> <add key="github" value="https://nuget.pkg.github.com/colhountech/index.json" />
</packageSources> </packageSources>
<packageSourceCredentials> <packageSourceCredentials>