Merge pull request #28 from taylorbobaylor/upgrade-framework

Upgrade framework

Dockerfile

@@ -1,22 +1,19 @@
-#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
-
-FROM mcr.microsoft.com/dotnet/aspnet:5.0-buster-slim AS base
+FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:5.0-buster-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
+
+# Install Node.js
+RUN curl -fsSL https://deb.nodesource.com/setup_18.x | bash - \
+    && apt-get install -y \
+        nodejs \
+    && rm -rf /var/lib/apt/lists/*
+
 WORKDIR /src
 COPY ["TrailerDownloader/TrailerDownloader.csproj", "TrailerDownloader/"]
 RUN dotnet restore "TrailerDownloader/TrailerDownloader.csproj"
-
-# Setup NodeJs
-RUN apt-get update && \
-apt-get install -y wget && \
-apt-get install -y gnupg2 && \
-wget -qO- https://deb.nodesource.com/setup_10.x | bash - && \
-apt-get install -y build-essential nodejs
-
 COPY . .
 WORKDIR "/src/TrailerDownloader"
 RUN dotnet build "TrailerDownloader.csproj" -c Release -o /app/build
@@ -27,4 +24,4 @@ RUN dotnet publish "TrailerDownloader.csproj" -c Release -o /app/publish
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
-ENTRYPOINT ["dotnet", "TrailerDownloader.dll"]
+ENTRYPOINT ["dotnet", "TrailerDownloader.dll"]

TrailerDownloader.sln

@@ -8,6 +8,7 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7AF2D005-877F-43C4-8D04-741F18487B93}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
+		Dockerfile = Dockerfile
 	EndProjectSection
 EndProject
 Global

TrailerDownloader/ClientApp/angular.json

@@ -125,5 +125,8 @@
         }
       }
     }},
-  "defaultProject": "TrailerDownloader-Frontend"
+  "defaultProject": "TrailerDownloader-Frontend",
+  "cli": {
+    "analytics": false
+  }
 }