Merge pull request #60 from hmlendea/net5

Upgrade to the framework and the dependencies
hmlendea · May 15, 2021 · 54e2457 · 54e2457
2 parents e8d4db6 + 7ae6c3e
commit 54e2457
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/IptvPlaylistAggregator.csproj b/IptvPlaylistAggregator.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <RootNamespace>IptvPlaylistAggregator</RootNamespace>
   </PropertyGroup>
 
@@ -17,16 +17,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
+    <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="Newtonsoft.Json" Version="13.0.1" />
     <PackageReference Include="NuciDAL" Version="1.1.1" />
-    <PackageReference Include="NuciExtensions" Version="1.4.1.1" />
-    <PackageReference Include="NuciLog" Version="1.1.0" />
-    <PackageReference Include="NuciLog.Core" Version="2.2.5" />
+    <PackageReference Include="NuciExtensions" Version="1.4.1.2" />
+    <PackageReference Include="NuciLog" Version="1.1.0.1" />
+    <PackageReference Include="NuciLog.Core" Version="2.3.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/package.sh b/package.sh
@@ -36,17 +36,7 @@ function dotnet-pub {
     dotnet publish -c Release -r "$ARCH" -o "$OUTPUT_DIR" --self-contained=true /p:TrimUnusedDependencies=true /p:LinkDuringPublish=true
 }
 
-function prepare {
-    echo "Adding the temporary NuGet packages"
-    dotnet add package Microsoft.Packaging.Tools.Trimming --version 1.1.0-preview1-26619-01
-    #dotnet add package ILLink.Tasks --version 0.1.5-preview-1841731 --source https://dotnet.myget.org/F/dotnet-core/api/v3/index.json
-}
-
 function cleanup {
-    echo "Removing the temporary NuGet packages"
-    dotnet remove package Microsoft.Packaging.Tools.Trimming
-    #dotnet remove package ILLink.Task
-
     echo "Cleaning build output"
     rm -rf "$PUBLISH_DIR"
 }
@@ -56,12 +46,10 @@ function build-release {
     package $1
 }
 
-prepare
-
 build-release linux-arm
 build-release linux-arm64
 build-release linux-x64
-build-release osx-x64
 build-release win-x64
+build-release osx-x64
 
 cleanup