Skip to content

Commit

Permalink
Merge pull request #65 from hmlendea/net6
Browse files Browse the repository at this point in the history
Upgraded to .NET 6
  • Loading branch information
hmlendea authored Feb 20, 2022
2 parents 7424b73 + 392f60b commit ccdb4b7
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 72 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ on:

jobs:
build:

name: Build
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 5.0.x
dotnet-version: 6.0.x
- name: Restore dependencies
run: dotnet restore
- name: Build
Expand Down
7 changes: 6 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,12 @@
"statusBarItem.hoverBackground": "#06aab2",
"statusBarItem.remoteBackground": "#047b81",
"statusBarItem.remoteForeground": "#e7e7e7",
"tab.activeBorder": "#06aab2"
"tab.activeBorder": "#06aab2",
"sash.hoverBorder": "#06aab2",
"titleBar.activeBackground": "#047b81",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#047b8199",
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.color": "#047b81"
}
14 changes: 7 additions & 7 deletions IptvPlaylistAggregator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>IptvPlaylistAggregator</RootNamespace>
</PropertyGroup>

Expand All @@ -17,14 +17,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="5.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="NuciDAL" Version="1.1.1" />
<PackageReference Include="NuciExtensions" Version="1.5.0" />
<PackageReference Include="NuciExtensions" Version="2.0.0" />
<PackageReference Include="NuciLog" Version="1.1.0.1" />
<PackageReference Include="NuciLog.Core" Version="2.3.1" />
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions UnitTests/IptvPlaylistAggregator.UnitTests.csproj
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
<RootNamespace>IptvPlaylistAggregator.UnitTests</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageReference Include="Moq" Version="4.16.1" />
<PackageReference Include="NUnit" Version="3.13.2" />
<PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
</ItemGroup>

<ItemGroup>
Expand Down
59 changes: 0 additions & 59 deletions package.sh

This file was deleted.

4 changes: 4 additions & 0 deletions release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
DOTNET_VERSION="6.0"
RELEASE_SCRIPT_URL="https://raw.githubusercontent.com/hmlendea/deployment-scripts/master/release/dotnet/${DOTNET_VERSION}.sh"
wget --quiet -O - "${RELEASE_SCRIPT_URL}" | bash /dev/stdin ${@}

0 comments on commit ccdb4b7

Please sign in to comment.