From 598f866f54a4218d5687bb9db7041a5592ca1e23 Mon Sep 17 00:00:00 2001
From: KoalaBear <animatrix84@gmail.com>
Date: Mon, 19 Sep 2022 23:11:29 +0200
Subject: [PATCH] - Upgrade to .NET 7

---
 .github/workflows/main.yml                             |  4 ++--
 README.md                                              | 10 +++++-----
 .../OpenDirectoryDownloader.GoogleDrive.csproj         |  2 +-
 .../OpenDirectoryDownloader.Shared.csproj              |  2 +-
 .../OpenDirectoryDownloader.Tests.csproj               |  2 +-
 .../OpenDirectoryDownloader.csproj                     |  3 ++-
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 9f7196a9..ebc0a7b1 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -57,7 +57,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '6.0.x'
+        dotnet-version: '7.0.x'
         include-prerelease: true
 
     - name: Get version info
@@ -74,7 +74,7 @@ jobs:
       run: dotnet test src/OpenDirectoryDownloader --configuration Release -p:Version=${{ steps.get_version.outputs.VERSION }}
 
     - name: Publish with dotnet
-      run: dotnet publish src/OpenDirectoryDownloader --configuration Release -p:Version=${{ steps.get_version.outputs.VERSION }} --framework net6.0 --runtime ${{ matrix.target }} ${{ matrix.build_args }} -p:PublishSingleFile=true --output ./OpenDirectoryDownloader-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.suffix }}
+      run: dotnet publish src/OpenDirectoryDownloader --configuration Release -p:Version=${{ steps.get_version.outputs.VERSION }} --framework net7.0 --runtime ${{ matrix.target }} ${{ matrix.build_args }} -p:PublishSingleFile=true --output ./OpenDirectoryDownloader-${{ steps.get_version.outputs.VERSION }}-${{ matrix.target }}${{ matrix.suffix }}
 
     - name: Set executable bit (linux only)
       if: ${{ matrix.os == 'ubuntu-latest' }}
diff --git a/README.md b/README.md
index 8b006046..4a7e560f 100644
--- a/README.md
+++ b/README.md
@@ -26,9 +26,9 @@ When using the self-contained releases you don't need to install the .NET (Core)
 
 ## Prerequisites
 
-When you are NOT using the self-contained releases, you need to install the latest/current Runtime version of .NET 6:
+When you are NOT using the self-contained releases, you need to install the latest/current Runtime version of .NET 7:
 
-https://dotnet.microsoft.com/download/dotnet/6.0/runtime
+https://dotnet.microsoft.com/download/dotnet/7.0/runtime
 
 ## Usage
 
@@ -177,14 +177,14 @@ It will save the URLs files onto C:\\Scans (windows), or replace with a custom f
 
 ## Building
 
-1.  Install the newest .NET 6 SDK.
+1.  Install the newest .NET 7 SDK.
 2.  `git clone https://github.com/KoalaBear84/OpenDirectoryDownloader`
 3.  `cd OpenDirectoryDownloader/OpenDirectoryDownloader`
 4.  `dotnet build .`
-5.  `cd bin/Debug/net6.0`
+5.  `cd bin/Debug/net7.0`
 6.  `./OpenDirectoryDownloader --url "https://myopendirectory.com"`
 
-For Linux (Might not be needed since .NET 6):  
+For Linux (Might not be needed since .NET 7):  
 Then, if you need to package it into a binary, you can use [warp-packer](https://github.com/dgiagio/warp#quickstart-with-net-core)
 
 When you have cloned the code, you can also run it without the SDK. For that, download the ["Runtime"](https://dotnet.microsoft.com/download) and do "`dotnet run .`" instead of build.
diff --git a/src/OpenDirectoryDownloader.GoogleDrive/OpenDirectoryDownloader.GoogleDrive.csproj b/src/OpenDirectoryDownloader.GoogleDrive/OpenDirectoryDownloader.GoogleDrive.csproj
index dc9221de..9e0b3b9a 100644
--- a/src/OpenDirectoryDownloader.GoogleDrive/OpenDirectoryDownloader.GoogleDrive.csproj
+++ b/src/OpenDirectoryDownloader.GoogleDrive/OpenDirectoryDownloader.GoogleDrive.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />
diff --git a/src/OpenDirectoryDownloader.Shared/OpenDirectoryDownloader.Shared.csproj b/src/OpenDirectoryDownloader.Shared/OpenDirectoryDownloader.Shared.csproj
index bff8701e..b38bbe5f 100644
--- a/src/OpenDirectoryDownloader.Shared/OpenDirectoryDownloader.Shared.csproj
+++ b/src/OpenDirectoryDownloader.Shared/OpenDirectoryDownloader.Shared.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
diff --git a/src/OpenDirectoryDownloader.Tests/OpenDirectoryDownloader.Tests.csproj b/src/OpenDirectoryDownloader.Tests/OpenDirectoryDownloader.Tests.csproj
index 406d95dc..296a2cc5 100644
--- a/src/OpenDirectoryDownloader.Tests/OpenDirectoryDownloader.Tests.csproj
+++ b/src/OpenDirectoryDownloader.Tests/OpenDirectoryDownloader.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
diff --git a/src/OpenDirectoryDownloader/OpenDirectoryDownloader.csproj b/src/OpenDirectoryDownloader/OpenDirectoryDownloader.csproj
index 236bf59e..7f61130e 100644
--- a/src/OpenDirectoryDownloader/OpenDirectoryDownloader.csproj
+++ b/src/OpenDirectoryDownloader/OpenDirectoryDownloader.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
+    <RuntimeIdentifiers>win-x64;linux-x64;linux-arm;linux-arm64;osx-x64</RuntimeIdentifiers>
     <LangVersion>latest</LangVersion>
     <ApplicationIcon>Resources\Application.ico</ApplicationIcon>
     <Platforms>AnyCPU;x64</Platforms>