From 927f1ee6845c443c721976fbcfdf535f8b111b27 Mon Sep 17 00:00:00 2001 From: Bailey Date: Sat, 21 Jan 2023 10:30:07 -0600 Subject: [PATCH] [421] uplift to dotnet 7 (#423) * [421] uplift to dotnet 7 * update pr check --- .github/workflows/pr-check.yml | 4 ++-- .github/workflows/publish_distros_latest.yml | 2 +- .github/workflows/release.yml | 2 +- docker/Dockerfile.api | 4 ++-- docker/Dockerfile.console | 4 ++-- docker/Dockerfile.webui | 4 ++-- docs/install/source.md | 2 +- src/Api/Api.csproj | 2 +- src/Common/Common.csproj | 2 +- src/Common/Constants.cs | 3 ++- src/Conversion/Conversion.csproj | 2 +- src/Garmin/Garmin.csproj | 2 +- src/Peloton/Peloton.csproj | 2 +- src/PelotonToGarminConsole/PelotonToGarminConsole.csproj | 2 +- src/Sync/Sync.csproj | 2 +- src/UnitTests/UnitTests.csproj | 2 +- src/WebUI/WebUI.csproj | 2 +- vNextReleaseNotes.md | 6 +++--- 18 files changed, 25 insertions(+), 24 deletions(-) diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 7e5ef30ac..31d4d0715 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -12,7 +12,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - dotnet: [ '6.0'] + dotnet: [ '7.0'] os: [ubuntu-latest, windows-latest, macos-latest] steps: @@ -42,7 +42,7 @@ jobs: strategy: max-parallel: 1 matrix: - dotnet: [ '6.0' ] + dotnet: [ '7.0' ] os: [ 'win10-x64' ] python-version: [ 3.9.6 ] diff --git a/.github/workflows/publish_distros_latest.yml b/.github/workflows/publish_distros_latest.yml index 23c7d1ae4..b10ed110d 100644 --- a/.github/workflows/publish_distros_latest.yml +++ b/.github/workflows/publish_distros_latest.yml @@ -23,7 +23,7 @@ jobs: strategy: max-parallel: 1 matrix: - dotnet: [ '6.0' ] + dotnet: [ '7.0' ] #os: [ 'win10-x64', 'osx-x64' ] # osx signing issue, mac wont run the executable os: [ 'win10-x64' ] python-version: [ 3.9.6 ] diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 56cb561a7..10c3f9411 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -88,7 +88,7 @@ jobs: strategy: max-parallel: 1 matrix: - dotnet: [ '6.0' ] + dotnet: [ '7.0' ] #os: [ 'win10-x64', 'osx-x64' ] # osx signing issue, mac wont run the executable os: [ 'win10-x64' ] python-version: [ 3.9.6 ] diff --git a/docker/Dockerfile.api b/docker/Dockerfile.api index 9e6e6314d..792868113 100644 --- a/docker/Dockerfile.api +++ b/docker/Dockerfile.api @@ -1,7 +1,7 @@ ################### # CREATE FINAL LAYER ################### -FROM mcr.microsoft.com/dotnet/aspnet:6.0 as final +FROM mcr.microsoft.com/dotnet/aspnet:7.0 as final ENV PYTHONUNBUFFERED=1 RUN apt-get update \ @@ -27,7 +27,7 @@ RUN mkdir -m770 {output,data,working} ################### # BUILD LAYER ################### -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 AS build COPY . /build WORKDIR /build diff --git a/docker/Dockerfile.console b/docker/Dockerfile.console index efbe16fbd..29c9cc0c7 100644 --- a/docker/Dockerfile.console +++ b/docker/Dockerfile.console @@ -1,7 +1,7 @@ ################### # CREATE FINAL LAYER ################### -FROM mcr.microsoft.com/dotnet/aspnet:6.0 as final +FROM mcr.microsoft.com/dotnet/aspnet:7.0 as final ENV PYTHONUNBUFFERED=1 RUN apt-get update \ @@ -27,7 +27,7 @@ RUN mkdir -m770 {output,data,working} ################### # BUILD LAYER ################### -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 AS build COPY . /build WORKDIR /build diff --git a/docker/Dockerfile.webui b/docker/Dockerfile.webui index 4f7ecd21c..49b14474e 100644 --- a/docker/Dockerfile.webui +++ b/docker/Dockerfile.webui @@ -1,7 +1,7 @@ ################### # CREATE FINAL LAYER ################### -FROM mcr.microsoft.com/dotnet/aspnet:6.0 as final +FROM mcr.microsoft.com/dotnet/aspnet:7.0 as final RUN apt-get update \ && apt-get -y install bash tzdata \ @@ -17,7 +17,7 @@ WORKDIR /app ################### # BUILD LAYER ################### -FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0 AS build +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:7.0 AS build COPY . /build WORKDIR /build diff --git a/docs/install/source.md b/docs/install/source.md index 2095666cd..28d59ffdf 100644 --- a/docs/install/source.md +++ b/docs/install/source.md @@ -11,7 +11,7 @@ To compile and run P2G on your machine, follow the below steps. ## dotnet 6.0 -1. Install the latest [dotnet 6.0 SDK](https://dotnet.microsoft.com/download/dotnet/6.0) +1. Install the latest [dotnet 7.0 SDK](https://dotnet.microsoft.com/download/dotnet/7.0) 1. Clone the GitHub repository locally 1. In the local repo, find the file named `configuration.example.json`. Make a copy of it and name it `configuration.local.json`. 1. Move `configuration.local.json` into the `src/PelotongToGarminConsole` directory diff --git a/src/Api/Api.csproj b/src/Api/Api.csproj index 88811f164..1758938f7 100644 --- a/src/Api/Api.csproj +++ b/src/Api/Api.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 PelotonToGarmin.Api enable enable diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj index 4dac78977..2410023cc 100644 --- a/src/Common/Common.csproj +++ b/src/Common/Common.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 true $(NoWarn);1591 diff --git a/src/Common/Constants.cs b/src/Common/Constants.cs index c31a41cc9..4459dc7ac 100644 --- a/src/Common/Constants.cs +++ b/src/Common/Constants.cs @@ -7,6 +7,7 @@ public static class Constants public const string ConsoleAppName = "p2g_console"; public const string ApiName = "p2g_api"; public const string WebUIName = "p2g_webui"; - public const string AppVersion = "3.6.1"; + + public const string AppVersion = "4.0.0-rc"; } } diff --git a/src/Conversion/Conversion.csproj b/src/Conversion/Conversion.csproj index 2328dc1b2..44c2bcc47 100644 --- a/src/Conversion/Conversion.csproj +++ b/src/Conversion/Conversion.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 true $(NoWarn);1591 diff --git a/src/Garmin/Garmin.csproj b/src/Garmin/Garmin.csproj index 77f3e8965..553883ff4 100644 --- a/src/Garmin/Garmin.csproj +++ b/src/Garmin/Garmin.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 true $(NoWarn);1591 diff --git a/src/Peloton/Peloton.csproj b/src/Peloton/Peloton.csproj index 71b8f4d36..25110eccb 100644 --- a/src/Peloton/Peloton.csproj +++ b/src/Peloton/Peloton.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 true $(NoWarn);1591 diff --git a/src/PelotonToGarminConsole/PelotonToGarminConsole.csproj b/src/PelotonToGarminConsole/PelotonToGarminConsole.csproj index 6c88d2c50..44a05b92c 100644 --- a/src/PelotonToGarminConsole/PelotonToGarminConsole.csproj +++ b/src/PelotonToGarminConsole/PelotonToGarminConsole.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net7.0 PelotonToGarminConsole PelotonToGarminConsole win10-x64;osx-x64;linux-x64 diff --git a/src/Sync/Sync.csproj b/src/Sync/Sync.csproj index 9762bb0d9..e3a8af22e 100644 --- a/src/Sync/Sync.csproj +++ b/src/Sync/Sync.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable true $(NoWarn);1591 diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj index efbba9b40..a5b0e4505 100644 --- a/src/UnitTests/UnitTests.csproj +++ b/src/UnitTests/UnitTests.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 false diff --git a/src/WebUI/WebUI.csproj b/src/WebUI/WebUI.csproj index 64015bf35..1717f1514 100644 --- a/src/WebUI/WebUI.csproj +++ b/src/WebUI/WebUI.csproj @@ -1,7 +1,7 @@  - net6.0 + net7.0 enable enable win10-x64;osx-x64;linux-x64 diff --git a/vNextReleaseNotes.md b/vNextReleaseNotes.md index 1181d2642..d0ed915ce 100644 --- a/vNextReleaseNotes.md +++ b/vNextReleaseNotes.md @@ -1,7 +1,7 @@ [![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/philosowaffle) Buy Me A Coffee donate button --- -## Fixes +## Features + +- [#421] Uplift to dotnet 7 -- [#552] fix ArgumentNullException in SyncService when no recent workouts found -- [#548] GithubAction - workflow_dispatch boolean inputs are not actually booleans (@philjn) \ No newline at end of file