Skip to content

Commit

Permalink
- Upgrade to .NET 7
Browse files Browse the repository at this point in the history
  • Loading branch information
KoalaBear84 committed Sep 19, 2022
1 parent 9695640 commit 598f866
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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' }}
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<ApplicationIcon />
<OutputType>Library</OutputType>
<StartupObject />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net7.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
3 changes: 2 additions & 1 deletion src/OpenDirectoryDownloader/OpenDirectoryDownloader.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 598f866

Please sign in to comment.