Compare commits
11 Commits
latest
...
28a34ee269
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
28a34ee269 | ||
|
|
8eaf796ac4 | ||
|
|
e39ab67be8 | ||
|
|
9f0a9c41aa | ||
|
|
2b2461f8b3 | ||
|
|
557e2dd8f5 | ||
|
|
6e74a37a4d | ||
|
|
dd7524e9a1 | ||
|
|
cba2b7b99e | ||
|
|
8dc85bc2cf | ||
|
|
58ebed2c04 |
35
.drone.yml
Normal file
35
.drone.yml
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
kind: pipeline
|
||||||
|
type: docker
|
||||||
|
name: default
|
||||||
|
|
||||||
|
|
||||||
|
globals:
|
||||||
|
- &docker_creds
|
||||||
|
username:
|
||||||
|
from_secret: gitea_username
|
||||||
|
password:
|
||||||
|
from_secret: gitea_password
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: API # building the API docker image
|
||||||
|
pull: if-not-exists
|
||||||
|
image: plugins/docker
|
||||||
|
settings:
|
||||||
|
dockerfile: Dockerfile.dev
|
||||||
|
repo: gitea.71dev.com/KamonwanTaengsuk/rmutr_report
|
||||||
|
tags: latest
|
||||||
|
registry: "gitea.71dev.com"
|
||||||
|
#dry_run: true
|
||||||
|
debug: false
|
||||||
|
<<: *docker_creds
|
||||||
|
- name: deploy
|
||||||
|
pull: if-not-exists
|
||||||
|
image: sinlead/drone-kubectl
|
||||||
|
settings:
|
||||||
|
kubernetes_server: "https://202.129.205.205:6443"
|
||||||
|
kubernetes_cert:
|
||||||
|
from_secret: kube_ca_certificate
|
||||||
|
kubernetes_token:
|
||||||
|
from_secret: kube_token
|
||||||
|
commands:
|
||||||
|
- kubectl --insecure-skip-tls-verify --namespace=rmutr rollout restart deployment/rmutr-report
|
||||||
@@ -33,6 +33,7 @@ namespace rmutr_report.Controllers
|
|||||||
{
|
{
|
||||||
foreach (var x in budget_reports)
|
foreach (var x in budget_reports)
|
||||||
{
|
{
|
||||||
|
|
||||||
int sum1 = budget_reports.Sum(g => int.Parse(g.salaya));
|
int sum1 = budget_reports.Sum(g => int.Parse(g.salaya));
|
||||||
x.sum1 = sum1;
|
x.sum1 = sum1;
|
||||||
int sum2 = budget_reports.Sum(g => int.Parse(g.bophitphimuk));
|
int sum2 = budget_reports.Sum(g => int.Parse(g.bophitphimuk));
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as build-env
|
FROM registry.71dev.com/dotnetsdk:5.0 as build-env
|
||||||
WORKDIR /source
|
WORKDIR /source
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN dotnet restore --configfile nuget.config --disable-parallel
|
RUN dotnet restore --configfile nuget.config --disable-parallel
|
||||||
RUN dotnet build
|
RUN dotnet build
|
||||||
RUN dotnet publish -o /publish --configuration Release;
|
RUN dotnet publish -o /publish --configuration Release;
|
||||||
|
|
||||||
FROM mcr.microsoft.com/dotnet/aspnet:3.1
|
FROM registry.71dev.com/dotnetsdk:5.0
|
||||||
COPY . .
|
COPY . .
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends apt-utils
|
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends apt-utils
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y fontconfig
|
RUN apk add --no-cache fontconfig
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libc6-dev
|
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libc6-dev
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libgdiplus
|
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libgdiplus
|
||||||
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libx11-dev
|
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libx11-dev
|
||||||
@@ -20,4 +20,4 @@ RUN fc-cache -fv
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
COPY --from=build-env /publish .
|
COPY --from=build-env /publish .
|
||||||
ENV ASPNETCORE_URLS http://*:8080
|
ENV ASPNETCORE_URLS http://*:8080
|
||||||
ENTRYPOINT ["dotnet", "rmutr_report.dll"]
|
ENTRYPOINT ["dotnet", "rmutr_report.dll"]
|
||||||
Binary file not shown.
Binary file not shown.
@@ -1,27 +1,27 @@
|
|||||||
pipelines:
|
#pipelines:
|
||||||
branches:
|
# branches:
|
||||||
master:
|
# master:
|
||||||
- step:
|
# - step:
|
||||||
runs-on:
|
# runs-on:
|
||||||
- self.hosted
|
# - self.hosted
|
||||||
- linux
|
# - linux
|
||||||
- 8x
|
# - 8x
|
||||||
size: 8x
|
# size: 8x
|
||||||
services:
|
# services:
|
||||||
- docker
|
# - docker
|
||||||
caches:
|
# caches:
|
||||||
- docker
|
# - docker
|
||||||
script: # Modify the commands below to build your repository.
|
# script: # Modify the commands below to build your repository.
|
||||||
- docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
|
# - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
|
||||||
- docker build -f Dockerfile.dev -t registry.71dev.com/rmutr_report:latest .
|
# - docker build -f Dockerfile.dev -t registry.71dev.com/rmutr_report:latest .
|
||||||
- docker push registry.71dev.com/rmutr_report:latest
|
# - docker push registry.71dev.com/rmutr_report:latest
|
||||||
- step:
|
# - step:
|
||||||
name: Deploy to kubernates
|
# name: Deploy to kubernates
|
||||||
image: atlassian/pipelines-kubectl
|
# image: atlassian/pipelines-kubectl
|
||||||
script:
|
# script:
|
||||||
- echo $KUBE_CONFIG_DELL | base64 -d > kubeconfig
|
# - echo $KUBE_CONFIG_DELL | base64 -d > kubeconfig
|
||||||
- kubectl --insecure-skip-tls-verify --kubeconfig=kubeconfig rollout restart deployment/rmutr-report -n rmutr
|
# - kubectl --insecure-skip-tls-verify --kubeconfig=kubeconfig rollout restart deployment/rmutr-report -n rmutr
|
||||||
definitions:
|
#definitions:
|
||||||
services:
|
# services:
|
||||||
docker:
|
# docker:
|
||||||
memory: 14336
|
# memory: 14336
|
||||||
Binary file not shown.
Binary file not shown.
@@ -7,4 +7,4 @@ build_property.InvariantGlobalization =
|
|||||||
build_property.PlatformNeutralAssembly =
|
build_property.PlatformNeutralAssembly =
|
||||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||||
build_property.RootNamespace = rmutr_report
|
build_property.RootNamespace = rmutr_report
|
||||||
build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\
|
build_property.ProjectDir = C:\Users\USER\RiderProjects\rmutr_report\
|
||||||
|
|||||||
Binary file not shown.
@@ -1 +1 @@
|
|||||||
46314eaf8986a1d57ba3dc517059d914c26f9b2b
|
6791f979674f8208d0ae6e1ffdc73e601bb071c9
|
||||||
|
|||||||
@@ -85,3 +85,90 @@ C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.xml
|
|||||||
C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.pdb
|
C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.pdb
|
||||||
C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.genruntimeconfig.cache
|
C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\rmutr_report.genruntimeconfig.cache
|
||||||
C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\ref\rmutr_report.dll
|
C:\Users\USER\Documents\rmutr_report\obj\Debug\net5.0\ref\rmutr_report.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\appsettings.Development.json
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\appsettings.json
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\nuget.config
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.exe
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.deps.json
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.runtimeconfig.json
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.runtimeconfig.dev.json
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.pdb
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\rmutr_report.xml
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ClosedXML.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\DocumentFormat.OpenXml.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ExcelNumberFormat.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\FastReport.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.CSharp.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.CodeAnalysis.VisualBasic.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\Microsoft.OpenApi.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Annotations.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.Swagger.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.SwaggerGen.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\Swashbuckle.AspNetCore.SwaggerUI.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\System.Data.SqlClient.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\System.IO.Packaging.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.CSharp.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\cs\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\de\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\es\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\fr\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\it\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ja\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ko\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\pl\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\pt-BR\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\ru\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\tr\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hans\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\zh-Hant\Microsoft.CodeAnalysis.VisualBasic.resources.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\any\lib\netcoreapp3.0\FastReport.Compat.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\any\lib\netcoreapp3.0\FastReport.DataVisualization.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\win-arm64\native\sni.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\win-x64\native\sni.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\win-x86\native\sni.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\unix\lib\netstandard2.0\System.Data.SqlClient.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\bin\Debug\net5.0\runtimes\win\lib\netstandard2.0\System.Data.SqlClient.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.csproj.AssemblyReference.cache
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.GeneratedMSBuildEditorConfig.editorconfig
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.AssemblyInfoInputs.cache
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.AssemblyInfo.cs
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.csproj.CoreCompileInputs.cache
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.MvcApplicationPartsAssemblyInfo.cs
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.MvcApplicationPartsAssemblyInfo.cache
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\scopedcss\bundle\rmutr_report.styles.css
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\staticwebassets\rmutr_report.StaticWebAssets.Manifest.cache
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.RazorTargetAssemblyInfo.cache
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.csproj.CopyComplete
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\refint\rmutr_report.dll
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.xml
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.pdb
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\rmutr_report.genruntimeconfig.cache
|
||||||
|
C:\Users\USER\RiderProjects\rmutr_report\obj\Debug\net5.0\ref\rmutr_report.dll
|
||||||
|
|||||||
Binary file not shown.
@@ -1 +1 @@
|
|||||||
1d39a36735b2d72fa7731390686302bd2991a9b8
|
25bc6a5eaedb2db86355a587eb0689ad31009d02
|
||||||
|
|||||||
Binary file not shown.
@@ -1,3 +1,3 @@
|
|||||||
is_global = true
|
is_global = true
|
||||||
build_property.RootNamespace = rmutr_report
|
build_property.RootNamespace = rmutr_report
|
||||||
build_property.ProjectDir = C:\Users\USER\Documents\rmutr_report\
|
build_property.ProjectDir = C:\Users\USER\RiderProjects\rmutr_report\
|
||||||
|
|||||||
Binary file not shown.
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"version": 3,
|
"version": 3,
|
||||||
"targets": {
|
"targets": {
|
||||||
".NETCoreApp,Version=v3.1": {
|
"net5.0": {
|
||||||
"ClosedXML/0.96.0": {
|
"ClosedXML/0.96.0": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
@@ -446,12 +446,12 @@
|
|||||||
"Swashbuckle.AspNetCore.SwaggerGen": "6.5.0"
|
"Swashbuckle.AspNetCore.SwaggerGen": "6.5.0"
|
||||||
},
|
},
|
||||||
"compile": {
|
"compile": {
|
||||||
"lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.dll": {
|
"lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": {
|
||||||
"related": ".pdb;.xml"
|
"related": ".pdb;.xml"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtime": {
|
"runtime": {
|
||||||
"lib/netcoreapp3.0/Swashbuckle.AspNetCore.Annotations.dll": {
|
"lib/net5.0/Swashbuckle.AspNetCore.Annotations.dll": {
|
||||||
"related": ".pdb;.xml"
|
"related": ".pdb;.xml"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -462,12 +462,12 @@
|
|||||||
"Microsoft.OpenApi": "1.2.3"
|
"Microsoft.OpenApi": "1.2.3"
|
||||||
},
|
},
|
||||||
"compile": {
|
"compile": {
|
||||||
"lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {
|
"lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": {
|
||||||
"related": ".pdb;.xml"
|
"related": ".pdb;.xml"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtime": {
|
"runtime": {
|
||||||
"lib/netcoreapp3.0/Swashbuckle.AspNetCore.Swagger.dll": {
|
"lib/net5.0/Swashbuckle.AspNetCore.Swagger.dll": {
|
||||||
"related": ".pdb;.xml"
|
"related": ".pdb;.xml"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -481,12 +481,12 @@
|
|||||||
"Swashbuckle.AspNetCore.Swagger": "6.5.0"
|
"Swashbuckle.AspNetCore.Swagger": "6.5.0"
|
||||||
},
|
},
|
||||||
"compile": {
|
"compile": {
|
||||||
"lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
|
"lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
|
||||||
"related": ".pdb;.xml"
|
"related": ".pdb;.xml"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtime": {
|
"runtime": {
|
||||||
"lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
|
"lib/net5.0/Swashbuckle.AspNetCore.SwaggerGen.dll": {
|
||||||
"related": ".pdb;.xml"
|
"related": ".pdb;.xml"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -494,12 +494,12 @@
|
|||||||
"Swashbuckle.AspNetCore.SwaggerUI/6.5.0": {
|
"Swashbuckle.AspNetCore.SwaggerUI/6.5.0": {
|
||||||
"type": "package",
|
"type": "package",
|
||||||
"compile": {
|
"compile": {
|
||||||
"lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
|
"lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
|
||||||
"related": ".pdb;.xml"
|
"related": ".pdb;.xml"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"runtime": {
|
"runtime": {
|
||||||
"lib/netcoreapp3.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
|
"lib/net5.0/Swashbuckle.AspNetCore.SwaggerUI.dll": {
|
||||||
"related": ".pdb;.xml"
|
"related": ".pdb;.xml"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2136,7 +2136,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"projectFileDependencyGroups": {
|
"projectFileDependencyGroups": {
|
||||||
".NETCoreApp,Version=v3.1": [
|
"net5.0": [
|
||||||
"ClosedXML >= 0.96.0",
|
"ClosedXML >= 0.96.0",
|
||||||
"FastReport.Core >= 2021.3.0",
|
"FastReport.Core >= 2021.3.0",
|
||||||
"Swashbuckle.AspNetCore >= 6.5.0",
|
"Swashbuckle.AspNetCore >= 6.5.0",
|
||||||
@@ -2149,27 +2149,27 @@
|
|||||||
"project": {
|
"project": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
|
"projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
|
||||||
"projectName": "rmutr_report",
|
"projectName": "rmutr_report",
|
||||||
"projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
|
"projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
|
||||||
"packagesPath": "C:\\Users\\USER\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\USER\\.nuget\\packages\\",
|
||||||
"outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\",
|
"outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config",
|
"C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config",
|
||||||
"C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
|
||||||
],
|
],
|
||||||
"originalTargetFrameworks": [
|
"originalTargetFrameworks": [
|
||||||
"netcoreapp3.1"
|
"net5.0"
|
||||||
],
|
],
|
||||||
"sources": {
|
"sources": {
|
||||||
"https://api.nuget.org/v3/index.json": {},
|
"https://api.nuget.org/v3/index.json": {},
|
||||||
"https://nuget.71dev.com/v3/index.json": {}
|
"https://nuget.71dev.com/v3/index.json": {}
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp3.1": {
|
"net5.0": {
|
||||||
"targetAlias": "netcoreapp3.1",
|
"targetAlias": "net5.0",
|
||||||
"projectReferences": {}
|
"projectReferences": {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -2180,8 +2180,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp3.1": {
|
"net5.0": {
|
||||||
"targetAlias": "netcoreapp3.1",
|
"targetAlias": "net5.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ClosedXML": {
|
"ClosedXML": {
|
||||||
"target": "Package",
|
"target": "Package",
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
{
|
{
|
||||||
"version": 2,
|
"version": 2,
|
||||||
"dgSpecHash": "AcjdXi5x9A0nxsTWB+2PnbaIBtEgf/xXjiH70whPTOKfE3hLR7xlfQsZ/JREuaGE/sSzaWLOjWThFS4rkZ0mog==",
|
"dgSpecHash": "hE1gzfQgC+4GgyoQuRqmEmX/hadpdQNNAtzoJP3ojRoJ0s4QtHzCqAzsknxDVb7FYfcX4JoJw8yCmPluWoUxgg==",
|
||||||
"success": true,
|
"success": true,
|
||||||
"projectFilePath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
|
"projectFilePath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
|
||||||
"expectedPackageFiles": [
|
"expectedPackageFiles": [
|
||||||
"C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512",
|
"C:\\Users\\USER\\.nuget\\packages\\closedxml\\0.96.0\\closedxml.0.96.0.nupkg.sha512",
|
||||||
"C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512",
|
"C:\\Users\\USER\\.nuget\\packages\\documentformat.openxml\\2.16.0\\documentformat.openxml.2.16.0.nupkg.sha512",
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
"restore":{"projectUniqueName":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\Documents\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["netcoreapp3.1"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"netcoreapp3.1":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"netcoreapp3.1":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}}
|
"restore":{"projectUniqueName":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\","projectStyle":"PackageReference","originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]}}"frameworks":{"net5.0":{"dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Swashbuckle.AspNetCore":{"target":"Package","version":"[6.5.0, )"},"Swashbuckle.AspNetCore.Annotations":{"target":"Package","version":"[6.5.0, )"}},"imports":["net461","net462","net47","net471","net472","net48","net481"],"assetTargetFallback":true,"warn":true,"frameworkReferences":{"Microsoft.AspNetCore.App":{"privateAssets":"none"},"Microsoft.NETCore.App":{"privateAssets":"all"}},"runtimeIdentifierGraphPath":"C:\\Program Files\\dotnet\\sdk\\6.0.407\\RuntimeIdentifierGraph.json"}}
|
||||||
@@ -1 +1 @@
|
|||||||
16910345832467615
|
16911390038740016
|
||||||
@@ -1,33 +1,33 @@
|
|||||||
{
|
{
|
||||||
"format": 1,
|
"format": 1,
|
||||||
"restore": {
|
"restore": {
|
||||||
"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": {}
|
"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {}
|
||||||
},
|
},
|
||||||
"projects": {
|
"projects": {
|
||||||
"C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj": {
|
"C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
|
"projectUniqueName": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
|
||||||
"projectName": "rmutr_report",
|
"projectName": "rmutr_report",
|
||||||
"projectPath": "C:\\Users\\USER\\Documents\\rmutr_report\\rmutr_report.csproj",
|
"projectPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
|
||||||
"packagesPath": "C:\\Users\\USER\\.nuget\\packages\\",
|
"packagesPath": "C:\\Users\\USER\\.nuget\\packages\\",
|
||||||
"outputPath": "C:\\Users\\USER\\Documents\\rmutr_report\\obj\\",
|
"outputPath": "C:\\Users\\USER\\RiderProjects\\rmutr_report\\obj\\",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\USER\\Documents\\rmutr_report\\NuGet.Config",
|
"C:\\Users\\USER\\RiderProjects\\rmutr_report\\NuGet.Config",
|
||||||
"C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
"C:\\Users\\USER\\AppData\\Roaming\\NuGet\\NuGet.Config",
|
||||||
"C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
|
"C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
|
||||||
],
|
],
|
||||||
"originalTargetFrameworks": [
|
"originalTargetFrameworks": [
|
||||||
"netcoreapp3.1"
|
"net5.0"
|
||||||
],
|
],
|
||||||
"sources": {
|
"sources": {
|
||||||
"https://api.nuget.org/v3/index.json": {},
|
"https://api.nuget.org/v3/index.json": {},
|
||||||
"https://nuget.71dev.com/v3/index.json": {}
|
"https://nuget.71dev.com/v3/index.json": {}
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp3.1": {
|
"net5.0": {
|
||||||
"targetAlias": "netcoreapp3.1",
|
"targetAlias": "net5.0",
|
||||||
"projectReferences": {}
|
"projectReferences": {}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -38,8 +38,8 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"frameworks": {
|
"frameworks": {
|
||||||
"netcoreapp3.1": {
|
"net5.0": {
|
||||||
"targetAlias": "netcoreapp3.1",
|
"targetAlias": "net5.0",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"ClosedXML": {
|
"ClosedXML": {
|
||||||
"target": "Package",
|
"target": "Package",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
<TargetFramework>net5.0</TargetFramework>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||||
|
|||||||
Reference in New Issue
Block a user