Skip to content

Commit

Permalink
dotnet upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
Tommaso Stocchi committed Apr 13, 2024
1 parent 3409b0f commit 50d2b26
Show file tree
Hide file tree
Showing 20 changed files with 28 additions and 49 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<values>
<value name="mac.address" type="string">7a06f53377e5657efc009b3cba38f9421ac47da3e8ac368106d2c2978f257265</value>
</values>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<values>
<value name="StillAlive" type="qword">133574727016047149</value>
</values>
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<values>
<value name="MachineId" type="string">{7A06F533-77E5-657E-FC00-9B3CBA38F942}</value>
</values>
2 changes: 1 addition & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
"type": "coreclr",
"request": "launch",
"preLaunchTask": "frontend-bridge-to-kubernetes.compound",
"program": "${workspaceFolder}/app/frontend/KnowledgeBase.Frontend/bin/Debug/net7.0/KnowledgeBase.Frontend.dll",
"program": "${workspaceFolder}/app/frontend/KnowledgeBase.Frontend/bin/Debug/net8.0/KnowledgeBase.Frontend.dll",
"args": [],
"cwd": "${workspaceFolder}",
"stopAtEntry": false,
Expand Down
4 changes: 2 additions & 2 deletions app/backend/KnowledgeBase.DocumentProcessing/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY backend/ backend/
COPY frontend/ frontend/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions app/backend/KnowledgeBase.KnowledgeProcessing/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY backend/ backend/
COPY frontend/ frontend/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions app/backend/KnowledgeBase.SearchKnowledge/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY backend/ backend/
COPY frontend/ frontend/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
8 changes: 0 additions & 8 deletions app/backend/documentprocessingchart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ spec:
- name: http
containerPort: 80
protocol: TCP
livenessProbe:
httpGet:
path: /probe
port: http
readinessProbe:
httpGet:
path: /probe
port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
Expand Down
4 changes: 3 additions & 1 deletion app/backend/documentprocessingchart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ serviceAccount:
podAnnotations:
dapr.io/enabled: "true"
dapr.io/app-id: "document-processing"
dapr.io/app-port: "80"
dapr.io/app-port: "8080"
dapr.io/enable-app-health-check: "true"
dapr.io/app-health-check-path: "/healthz"

podSecurityContext: {}
# fsGroup: 2000
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ spec:
- name: http
containerPort: 80
protocol: TCP
livenessProbe:
httpGet:
path: /probe
port: http
readinessProbe:
httpGet:
path: /probe
port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
Expand Down
2 changes: 1 addition & 1 deletion app/backend/knowledgeprocessingchart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ serviceAccount:
podAnnotations:
dapr.io/enabled: "true"
dapr.io/app-id: "knowledge-processing"
dapr.io/app-port: "80"
dapr.io/app-port: "8080"

podSecurityContext: {}
# fsGroup: 2000
Expand Down
8 changes: 0 additions & 8 deletions app/backend/searchknowledgechart/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,6 @@ spec:
- name: http
containerPort: 80
protocol: TCP
livenessProbe:
httpGet:
path: /probe
port: http
readinessProbe:
httpGet:
path: /probe
port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
Expand Down
2 changes: 1 addition & 1 deletion app/backend/searchknowledgechart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ serviceAccount:
podAnnotations:
dapr.io/enabled: "true"
dapr.io/app-id: "search-knowledge"
dapr.io/app-port: "80"
dapr.io/app-port: "8080"

podSecurityContext: {}
# fsGroup: 2000
Expand Down
4 changes: 2 additions & 2 deletions app/frontend/KnowledgeBase.Frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.

FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
WORKDIR /app
EXPOSE 80
EXPOSE 443

FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
WORKDIR /src
COPY backend/ backend/
COPY frontend/ frontend/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,6 @@ spec:
- name: http
containerPort: 80
protocol: TCP
livenessProbe:
httpGet:
path: /
port: http
readinessProbe:
httpGet:
path: /
port: http
resources:
{{- toYaml .Values.resources | nindent 12 }}
{{- with .Values.nodeSelector }}
Expand Down
2 changes: 1 addition & 1 deletion app/frontend/knowledgebasefrontendchart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ serviceAccount:
podAnnotations:
dapr.io/enabled: "true"
dapr.io/app-id: "frontend"
dapr.io/app-port: "80"
dapr.io/app-port: "8080"

podSecurityContext: {}
# fsGroup: 2000
Expand Down

0 comments on commit 50d2b26

Please sign in to comment.