[421] uplift to dotnet 7 (#423)

* [421] uplift to dotnet 7 * update pr check
philosowaffle · Feb 17, 2023 · 71a01cb · 71a01cb
1 parent d097b45
commit 71a01cb
Show file tree

Hide file tree

Showing 18 changed files with 23 additions and 35 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<PackageId>PelotonToGarmin.Api</PackageId>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

diff --git a/src/Common/Common.csproj b/src/Common/Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>

diff --git 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.4.0-rc";
+
+		public const string AppVersion = "4.0.0-rc";
 	}
 }
diff --git a/src/Conversion/Conversion.csproj b/src/Conversion/Conversion.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>

diff --git a/src/Garmin/Garmin.csproj b/src/Garmin/Garmin.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>

diff --git a/src/Peloton/Peloton.csproj b/src/Peloton/Peloton.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>

diff --git a/src/PelotonToGarminConsole/PelotonToGarminConsole.csproj b/src/PelotonToGarminConsole/PelotonToGarminConsole.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <AssemblyName>PelotonToGarminConsole</AssemblyName>
     <RootNamespace>PelotonToGarminConsole</RootNamespace>
     <RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>

diff --git a/src/Sync/Sync.csproj b/src/Sync/Sync.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
 	<GenerateDocumentationFile>true</GenerateDocumentationFile>
 	<NoWarn>$(NoWarn);1591</NoWarn>

diff --git a/src/UnitTests/UnitTests.csproj b/src/UnitTests/UnitTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>

diff --git a/src/WebUI/WebUI.csproj b/src/WebUI/WebUI.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
 	<RuntimeIdentifiers>win10-x64;osx-x64;linux-x64</RuntimeIdentifiers>

diff --git a/vNextReleaseNotes.md b/vNextReleaseNotes.md
@@ -3,18 +3,5 @@
 
 ## Features
 
-- [#432] General Support for Garmin accounts protected by Two Step Verification
-	- WebUI - New setting added to enable 2FA
-	- Console (manual) - New setting added to enable 2FA
-	- Headless (automatic sync) - Does not support 2FA
-	- GitHub Action - Does not support 2FA
-- [#438] On startup log path to config file being used
+- [#421] Uplift to dotnet 7
 
-## Fixes
-
-- [#430] Fixed where error thrown for classes with `*` in the title 
-
-## Housekeeping
-
-- [#434] Dependency Bumps
-- [#435] More Dependency Bumps