Skip to content

Commit

Permalink
Merge pull request #149 from CSCfi/devel
Browse files Browse the repository at this point in the history
NET8 and packages upgrade. Exporter console app. TTV model update
  • Loading branch information
sarkikos authored Sep 3, 2024
2 parents 8376c7e + 7384691 commit 00ec59c
Show file tree
Hide file tree
Showing 97 changed files with 7,806 additions and 8,724 deletions.
18 changes: 16 additions & 2 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"preLaunchTask": "build",
"launchSettingsProfile": "ElasticSearchIndexer",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/aspnetcore/src/Indexer/bin/Debug/net6.0/CSC.PublicApi.Indexer.dll",
"program": "${workspaceFolder}/aspnetcore/src/Indexer/bin/Debug/net8.0/CSC.PublicApi.Indexer.dll",
"args": [],
"cwd": "${workspaceFolder}/aspnetcore/src/Indexer",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
Expand All @@ -22,12 +22,26 @@
"preLaunchTask": "build",
"launchSettingsProfile": "Api",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/aspnetcore/src/Interface/bin/Debug/net6.0/CSC.PublicApi.Interface.dll",
"program": "${workspaceFolder}/aspnetcore/src/Interface/bin/Debug/net8.0/CSC.PublicApi.Interface.dll",
"args": [],
"cwd": "${workspaceFolder}/aspnetcore/src/Interface",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": "Exporter (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"launchSettingsProfile": "Api",
// If you have changed target frameworks, make sure to update the program path.
"program": "${workspaceFolder}/aspnetcore/src/Exporter/bin/Debug/net8.0/CSC.PublicApi.Exporter.dll",
"args": [],
"cwd": "${workspaceFolder}/aspnetcore/src/Exporter",
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
"console": "internalConsole",
"stopAtEntry": false
}
]
}
6 changes: 6 additions & 0 deletions aspnetcore/PublicApi.sln
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ApiModels", "src\ApiModels\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "src\Logging\Logging.csproj", "{86D2E73C-B7BF-41F3-BC35-7E807C611CEA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Exporter", "src\Exporter\Exporter.csproj", "{74125BEC-3509-4330-B11D-B1514C15E4FB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -98,6 +100,10 @@ Global
{86D2E73C-B7BF-41F3-BC35-7E807C611CEA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{86D2E73C-B7BF-41F3-BC35-7E807C611CEA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{86D2E73C-B7BF-41F3-BC35-7E807C611CEA}.Release|Any CPU.Build.0 = Release|Any CPU
{74125BEC-3509-4330-B11D-B1514C15E4FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{74125BEC-3509-4330-B11D-B1514C15E4FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{74125BEC-3509-4330-B11D-B1514C15E4FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{74125BEC-3509-4330-B11D-B1514C15E4FB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
28 changes: 0 additions & 28 deletions aspnetcore/openshift/api/Dockerfile

This file was deleted.

4 changes: 2 additions & 2 deletions aspnetcore/openshift/api/rahti2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Builder
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build-env
WORKDIR /build

# Copy csproj and restore as distinct layers
Expand All @@ -21,7 +21,7 @@ COPY ["aspnetcore/src/Logging/","./Logging"]
RUN dotnet publish "Interface/Interface.csproj" -c Release -o out

# Runtime image
FROM mcr.microsoft.com/dotnet/aspnet:6.0
FROM mcr.microsoft.com/dotnet/aspnet:8.0
WORKDIR /app
COPY --from=build-env /build/out .
EXPOSE 8080
Expand Down
99 changes: 0 additions & 99 deletions aspnetcore/openshift/api/template-api-devel.yml

This file was deleted.

99 changes: 0 additions & 99 deletions aspnetcore/openshift/api/template-api-production.yml

This file was deleted.

Loading

0 comments on commit 00ec59c

Please sign in to comment.