This commit is contained in:
@@ -41,13 +41,11 @@ namespace rmutr_report.Controllers
|
||||
continue;
|
||||
}
|
||||
|
||||
if (agencyReport.start_date != null && agencyReport.end_date != null)
|
||||
{
|
||||
agencyReport.startdate = agencyReport.start_date?.ToString("dd MMMM yyyy",
|
||||
CultureInfo.CreateSpecificCulture("th-TH")) ?? "";
|
||||
agencyReport.enddate = agencyReport.end_date?.ToString("dd MMMM yyyy",
|
||||
CultureInfo.CreateSpecificCulture("th-TH")) ?? "";
|
||||
}
|
||||
agencyReport.startdate = agencyReport.start_date?.ToString("dd MMMM yyyy",
|
||||
CultureInfo.CreateSpecificCulture("th-TH")) ?? "";
|
||||
|
||||
agencyReport.enddate = agencyReport.end_date?.ToString("dd MMMM yyyy",
|
||||
CultureInfo.CreateSpecificCulture("th-TH")) ?? "";
|
||||
|
||||
agencyReport.bool_11_1_text = agencyReport.bool_11_1 == true ? "X" : "";
|
||||
agencyReport.bool_11_2_text = agencyReport.bool_11_2 == true ? "X" : "";
|
||||
|
||||
@@ -1,21 +1,17 @@
|
||||
FROM registry.71dev.com/dotnetsdk:5.0 as build-env
|
||||
FROM registry.71dev.com/dotnetsdk:8.0 as build-env
|
||||
WORKDIR /source
|
||||
COPY . .
|
||||
RUN dotnet restore --configfile nuget.config --disable-parallel
|
||||
RUN dotnet build
|
||||
RUN dotnet publish -o /publish --configuration Release;
|
||||
|
||||
FROM registry.71dev.com/dotnetsdk:5.0
|
||||
COPY . .
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update && apt-get install -y --no-install-recommends apt-utils
|
||||
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 libx11-dev
|
||||
RUN DEBIAN_FRONTEND=noninteractive rm -rf /var/lib/apt/lists/*
|
||||
RUN dotnet restore --configfile nuget.config
|
||||
RUN dotnet publish -o /publish --configuration Release
|
||||
FROM registry.71dev.com/dotnetaspnet:8.0
|
||||
WORKDIR /app
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get update
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends apt-utils
|
||||
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-unauthenticated libc6-dev libgdiplus libx11-dev
|
||||
RUN DEBIAN_FRONTEND=noninteractive rm -rf /var/lib/apt/lists/*
|
||||
COPY --from=build-env /publish .
|
||||
RUN mkdir -p /usr/local/share/fonts/fonts/sarabun
|
||||
COPY Fonts/* /usr/local/share/fonts/sarabun/
|
||||
RUN chmod 644 /usr/local/share/fonts/sarabun/*
|
||||
WORKDIR /app
|
||||
COPY --from=build-env /publish .
|
||||
ENV ASPNETCORE_URLS http://*:8080
|
||||
ENTRYPOINT ["dotnet", "rmutr_report.dll"]
|
||||
93
Program.cs
93
Program.cs
@@ -1,26 +1,73 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using Microsoft.AspNetCore.HttpOverrides;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using rmutr_report.Models;
|
||||
using IPNetwork = Microsoft.AspNetCore.HttpOverrides.IPNetwork;
|
||||
|
||||
namespace rmutr_report
|
||||
var builder = WebApplication.CreateBuilder(args);
|
||||
|
||||
var configuration = builder.Configuration;
|
||||
var setting = new Setting
|
||||
{
|
||||
public class Program
|
||||
{
|
||||
public static void Main(string[] args)
|
||||
{
|
||||
CreateHostBuilder(args).Build().Run();
|
||||
}
|
||||
report_path = configuration["Settings:ReportPath"]
|
||||
};
|
||||
builder.Services.AddSingleton(setting);
|
||||
|
||||
public static IHostBuilder CreateHostBuilder(string[] args) =>
|
||||
Host.CreateDefaultBuilder(args)
|
||||
.ConfigureWebHostDefaults(webBuilder =>
|
||||
{
|
||||
webBuilder.UseStartup<Startup>();
|
||||
});
|
||||
}
|
||||
}
|
||||
builder.Services.AddControllers();
|
||||
|
||||
builder.Services.AddCors(options =>
|
||||
{
|
||||
options.AddPolicy("AllowAllOrigins", policy =>
|
||||
{
|
||||
policy.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod();
|
||||
});
|
||||
});
|
||||
|
||||
builder.Services.AddSwaggerGen(c =>
|
||||
{
|
||||
c.SwaggerDoc("reports", new OpenApiInfo { Title = "Reports API", Version = "v1" });
|
||||
c.SwaggerDoc("graph", new OpenApiInfo { Title = "Graph API", Version = "v1" });
|
||||
|
||||
var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
|
||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
||||
c.IncludeXmlComments(xmlPath);
|
||||
c.EnableAnnotations();
|
||||
});
|
||||
|
||||
var app = builder.Build();
|
||||
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions
|
||||
{
|
||||
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto,
|
||||
KnownNetworks = { new IPNetwork(IPAddress.Any, 0) }
|
||||
});
|
||||
|
||||
app.UseSwagger(c =>
|
||||
{
|
||||
c.RouteTemplate = "swagger/{documentName}/swagger.json";
|
||||
c.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
|
||||
{
|
||||
if (!httpReq.Headers.ContainsKey("X-Forwarded-Host")) return;
|
||||
|
||||
var serverUrl = $"{httpReq.Headers["X-Scheme"]}://" +
|
||||
$"{httpReq.Headers["X-Forwarded-Host"]}" +
|
||||
$"{httpReq.Headers["X-Forwarded-Prefix"]}";
|
||||
swaggerDoc.Servers = new List<OpenApiServer> { new OpenApiServer { Url = serverUrl } };
|
||||
});
|
||||
});
|
||||
|
||||
app.UseSwaggerUI(c =>
|
||||
{
|
||||
c.SwaggerEndpoint("reports/swagger.json", "Reports API v1");
|
||||
c.SwaggerEndpoint("graph/swagger.json", "Graph API v1");
|
||||
c.DefaultModelExpandDepth(0);
|
||||
c.DefaultModelsExpandDepth(-1);
|
||||
});
|
||||
|
||||
app.UseRouting();
|
||||
app.UseAuthorization();
|
||||
app.UseCors("AllowAllOrigins");
|
||||
app.MapControllers();
|
||||
|
||||
app.Run();
|
||||
|
||||
108
Startup.cs
108
Startup.cs
@@ -1,108 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using System.Threading.Tasks;
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.HttpOverrides;
|
||||
using Microsoft.AspNetCore.HttpsPolicy;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.Extensions.Configuration;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using rmutr_report.Models;
|
||||
|
||||
namespace rmutr_report
|
||||
{
|
||||
public class Startup
|
||||
{
|
||||
public Startup(IConfiguration configuration)
|
||||
{
|
||||
Configuration = configuration;
|
||||
}
|
||||
|
||||
public IConfiguration Configuration { get; }
|
||||
|
||||
public void ConfigureServices(IServiceCollection services)
|
||||
{
|
||||
var _setting = new Setting()
|
||||
{
|
||||
report_path = Configuration["Settings:ReportPath"]
|
||||
|
||||
};
|
||||
services.AddSingleton(_setting);
|
||||
services.AddControllers();
|
||||
|
||||
services.AddSwaggerGen(c =>
|
||||
{
|
||||
c.SwaggerDoc("reports", new OpenApiInfo {Title = "Reports API", Version = "v1"});
|
||||
c.SwaggerDoc("graph", new OpenApiInfo {Title = "Graph API", Version = "v1"});
|
||||
var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
|
||||
var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
|
||||
c.IncludeXmlComments(xmlPath);
|
||||
c.EnableAnnotations();
|
||||
// c.MapType(typeof(TimeSpan?), () => new OpenApiSchema
|
||||
// {
|
||||
// Type = "string",
|
||||
// Example = new OpenApiString("09:30:00")
|
||||
// });
|
||||
});
|
||||
|
||||
services.AddCors(options =>
|
||||
{
|
||||
options.AddPolicy(name: "AllowAllOrigins",
|
||||
builder =>
|
||||
{
|
||||
builder.AllowAnyOrigin().AllowAnyHeader().AllowAnyMethod();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
|
||||
{
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions
|
||||
{
|
||||
ForwardedHeaders = ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto,
|
||||
KnownNetworks =
|
||||
{
|
||||
new IPNetwork(IPAddress.Any, 0)
|
||||
}
|
||||
});
|
||||
app.UseSwagger(c => {
|
||||
c.RouteTemplate = "swagger/{documentName}/swagger.json";
|
||||
c.PreSerializeFilters.Add((swaggerDoc, httpReq) =>
|
||||
{
|
||||
if (!httpReq.Headers.ContainsKey("X-Forwarded-Host")) return;
|
||||
|
||||
var serverUrl = $"{httpReq.Headers["X-Scheme"]}://" +
|
||||
$"{httpReq.Headers["X-Forwarded-Host"]}" +
|
||||
$"{httpReq.Headers["X-Forwarded-Prefix"]}";
|
||||
swaggerDoc.Servers = new List<OpenApiServer> { new OpenApiServer { Url =serverUrl}};// $"{httpReq.Scheme}://{httpReq.Host.Value}{swaggerBasePath}" } };
|
||||
});
|
||||
});
|
||||
|
||||
//Swagger interface
|
||||
app.UseSwaggerUI(c =>
|
||||
{
|
||||
c.SwaggerEndpoint("reports/swagger.json", "Reports API v1");
|
||||
c.SwaggerEndpoint("graph/swagger.json", "Graph API v1");
|
||||
|
||||
c.DefaultModelExpandDepth(0);
|
||||
c.DefaultModelsExpandDepth(-1);
|
||||
});
|
||||
|
||||
app.UseRouting();
|
||||
|
||||
app.UseAuthorization();
|
||||
|
||||
app.UseCors("AllowAllOrigins");
|
||||
|
||||
app.UseEndpoints(endpoints => { endpoints.MapControllers(); });
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -13,7 +13,7 @@ using System.Reflection;
|
||||
[assembly: System.Reflection.AssemblyCompanyAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
|
||||
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+5d4509b1212d43e4ea9c021b187c170190388683")]
|
||||
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+cf506ae3f9ddfecd4d1e616c243ad7948b25c574")]
|
||||
[assembly: System.Reflection.AssemblyProductAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyTitleAttribute("rmutr_report")]
|
||||
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
|
||||
|
||||
@@ -1 +1 @@
|
||||
6ffb467cbcc797d875fec3519df4124b8526a4290a549c4b38f1bfeae9491bb7
|
||||
2690d040a721ccefcd35beb632059033776a50ca9c0a9ff0d24946a4dbca42db
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"version": 2,
|
||||
"dgSpecHash": "6ekrfiFS4e8=",
|
||||
"dgSpecHash": "Pwr9kjekdTc=",
|
||||
"success": true,
|
||||
"projectFilePath": "D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj",
|
||||
"expectedPackageFiles": [
|
||||
@@ -13,11 +13,13 @@
|
||||
"C:\\Users\\USER\\.nuget\\packages\\fastreport.compat\\2021.2.0\\fastreport.compat.2021.2.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\fastreport.core\\2021.3.0\\fastreport.core.2021.3.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\fastreport.datavisualization\\2021.2.0\\fastreport.datavisualization.2021.2.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.bcl.asyncinterfaces\\8.0.0\\microsoft.bcl.asyncinterfaces.8.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\2.9.4\\microsoft.codeanalysis.analyzers.2.9.4.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.common\\3.3.1\\microsoft.codeanalysis.common.3.3.1.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.csharp\\3.3.1\\microsoft.codeanalysis.csharp.3.3.1.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.visualbasic\\3.3.1\\microsoft.codeanalysis.visualbasic.3.3.1.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\humanizer.core\\2.14.1\\humanizer.core.2.14.1.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.analyzers\\3.11.0\\microsoft.codeanalysis.analyzers.3.11.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.common\\4.14.0\\microsoft.codeanalysis.common.4.14.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.csharp\\4.14.0\\microsoft.codeanalysis.csharp.4.14.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.csharp.workspaces\\4.14.0\\microsoft.codeanalysis.csharp.workspaces.4.14.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.visualbasic\\4.14.0\\microsoft.codeanalysis.visualbasic.4.14.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.codeanalysis.workspaces.common\\4.14.0\\microsoft.codeanalysis.workspaces.common.4.14.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.csharp\\4.7.0\\microsoft.csharp.4.7.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.apidescription.server\\6.0.5\\microsoft.extensions.apidescription.server.6.0.5.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.configuration\\8.0.0\\microsoft.extensions.configuration.8.0.0.nupkg.sha512",
|
||||
@@ -29,10 +31,10 @@
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.filesystemglobbing\\8.0.0\\microsoft.extensions.filesystemglobbing.8.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.extensions.primitives\\8.0.0\\microsoft.extensions.primitives.8.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.io.recyclablememorystream\\3.0.0\\microsoft.io.recyclablememorystream.3.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.netcore.platforms\\3.1.9\\microsoft.netcore.platforms.3.1.9.nupkg.sha512",
|
||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\microsoft.netcore.platforms\\2.0.0\\microsoft.netcore.platforms.2.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.openapi\\1.2.3\\microsoft.openapi.1.2.3.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.win32.registry\\4.4.0\\microsoft.win32.registry.4.4.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.win32.systemevents\\4.7.0\\microsoft.win32.systemevents.4.7.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\microsoft.win32.systemevents\\7.0.0\\microsoft.win32.systemevents.7.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
|
||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.win-arm64.runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.win-arm64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
|
||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\runtime.win-x64.runtime.native.system.data.sqlclient.sni\\4.4.0\\runtime.win-x64.runtime.native.system.data.sqlclient.sni.4.4.0.nupkg.sha512",
|
||||
@@ -42,25 +44,28 @@
|
||||
"C:\\Users\\USER\\.nuget\\packages\\swashbuckle.aspnetcore.swagger\\6.5.0\\swashbuckle.aspnetcore.swagger.6.5.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\swashbuckle.aspnetcore.swaggergen\\6.5.0\\swashbuckle.aspnetcore.swaggergen.6.5.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\swashbuckle.aspnetcore.swaggerui\\6.5.0\\swashbuckle.aspnetcore.swaggerui.6.5.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.buffers\\4.5.1\\system.buffers.4.5.1.nupkg.sha512",
|
||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.collections.immutable\\1.5.0\\system.collections.immutable.1.5.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.collections.immutable\\9.0.0\\system.collections.immutable.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.componentmodel.annotations\\5.0.0\\system.componentmodel.annotations.5.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.composition\\9.0.0\\system.composition.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.composition.attributedmodel\\9.0.0\\system.composition.attributedmodel.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.composition.convention\\9.0.0\\system.composition.convention.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.composition.hosting\\9.0.0\\system.composition.hosting.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.composition.runtime\\9.0.0\\system.composition.runtime.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.composition.typedparts\\9.0.0\\system.composition.typedparts.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.data.sqlclient\\4.4.3\\system.data.sqlclient.4.4.3.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.drawing.common\\4.7.3\\system.drawing.common.4.7.3.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.drawing.common\\7.0.0\\system.drawing.common.7.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.formats.asn1\\8.0.0\\system.formats.asn1.8.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.io.packaging\\4.7.0\\system.io.packaging.4.7.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.memory\\4.5.5\\system.memory.4.5.5.nupkg.sha512",
|
||||
"C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder\\system.reflection.metadata\\1.6.0\\system.reflection.metadata.1.6.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.runtime.compilerservices.unsafe\\6.0.0\\system.runtime.compilerservices.unsafe.6.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.io.pipelines\\9.0.0\\system.io.pipelines.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.reflection.metadata\\9.0.0\\system.reflection.metadata.9.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.security.accesscontrol\\4.4.0\\system.security.accesscontrol.4.4.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.security.cryptography.cng\\5.0.0\\system.security.cryptography.cng.5.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.security.cryptography.pkcs\\8.0.0\\system.security.cryptography.pkcs.8.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.security.permissions\\4.4.0\\system.security.permissions.4.4.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.security.principal.windows\\4.4.0\\system.security.principal.windows.4.4.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.text.encoding.codepages\\8.0.0\\system.text.encoding.codepages.8.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.text.encodings.web\\8.0.0\\system.text.encodings.web.8.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.text.json\\8.0.0\\system.text.json.8.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.threading.tasks.extensions\\4.5.4\\system.threading.tasks.extensions.4.5.4.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.threading.channels\\7.0.0\\system.threading.channels.7.0.0.nupkg.sha512",
|
||||
"C:\\Users\\USER\\.nuget\\packages\\system.windows.extensions\\4.6.0\\system.windows.extensions.4.6.0.nupkg.sha512"
|
||||
],
|
||||
"logs": []
|
||||
|
||||
@@ -1 +1 @@
|
||||
"restore":{"projectUniqueName":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"D:\\RiderProjects\\rmutr_report\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"],"originalTargetFrameworks":["net5.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net5.0":{"targetAlias":"net5.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net5.0":{"targetAlias":"net5.0","dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"EPPlus":{"target":"Package","version":"[7.2.2, )"},"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\\8.0.407\\RuntimeIdentifierGraph.json"}}
|
||||
"restore":{"projectUniqueName":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","projectName":"rmutr_report","projectPath":"D:\\RiderProjects\\rmutr_report\\rmutr_report.csproj","outputPath":"D:\\RiderProjects\\rmutr_report\\obj\\","projectStyle":"PackageReference","fallbackFolders":["C:\\Program Files\\dotnet\\sdk\\NuGetFallbackFolder"],"originalTargetFrameworks":["net8.0"],"sources":{"https://api.nuget.org/v3/index.json":{},"https://nuget.71dev.com/v3/index.json":{}},"frameworks":{"net8.0":{"targetAlias":"net8.0","projectReferences":{}}},"warningProperties":{"warnAsError":["NU1605"]},"restoreAuditProperties":{"enableAudit":"true","auditLevel":"low","auditMode":"direct"}}"frameworks":{"net8.0":{"targetAlias":"net8.0","dependencies":{"ClosedXML":{"target":"Package","version":"[0.96.0, )"},"EPPlus":{"target":"Package","version":"[7.2.2, )"},"FastReport.Core":{"target":"Package","version":"[2021.3.0, )"},"Microsoft.CodeAnalysis.CSharp":{"target":"Package","version":"[4.14.0, )"},"Microsoft.CodeAnalysis.CSharp.Workspaces":{"target":"Package","version":"[4.14.0, )"},"Microsoft.CodeAnalysis.Common":{"target":"Package","version":"[4.14.0, )"},"Microsoft.CodeAnalysis.VisualBasic":{"target":"Package","version":"[4.14.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\\8.0.407/PortableRuntimeIdentifierGraph.json"}}
|
||||
@@ -1 +1 @@
|
||||
17503066076533612
|
||||
17544609987254415
|
||||
@@ -1 +1 @@
|
||||
17503066076533612
|
||||
17544609997186963
|
||||
@@ -23,15 +23,15 @@
|
||||
"C:\\Program Files (x86)\\NuGet\\Config\\nuget.config"
|
||||
],
|
||||
"originalTargetFrameworks": [
|
||||
"net5.0"
|
||||
"net8.0"
|
||||
],
|
||||
"sources": {
|
||||
"https://api.nuget.org/v3/index.json": {},
|
||||
"https://nuget.71dev.com/v3/index.json": {}
|
||||
},
|
||||
"frameworks": {
|
||||
"net5.0": {
|
||||
"targetAlias": "net5.0",
|
||||
"net8.0": {
|
||||
"targetAlias": "net8.0",
|
||||
"projectReferences": {}
|
||||
}
|
||||
},
|
||||
@@ -47,8 +47,8 @@
|
||||
}
|
||||
},
|
||||
"frameworks": {
|
||||
"net5.0": {
|
||||
"targetAlias": "net5.0",
|
||||
"net8.0": {
|
||||
"targetAlias": "net8.0",
|
||||
"dependencies": {
|
||||
"ClosedXML": {
|
||||
"target": "Package",
|
||||
@@ -62,6 +62,22 @@
|
||||
"target": "Package",
|
||||
"version": "[2021.3.0, )"
|
||||
},
|
||||
"Microsoft.CodeAnalysis.CSharp": {
|
||||
"target": "Package",
|
||||
"version": "[4.14.0, )"
|
||||
},
|
||||
"Microsoft.CodeAnalysis.CSharp.Workspaces": {
|
||||
"target": "Package",
|
||||
"version": "[4.14.0, )"
|
||||
},
|
||||
"Microsoft.CodeAnalysis.Common": {
|
||||
"target": "Package",
|
||||
"version": "[4.14.0, )"
|
||||
},
|
||||
"Microsoft.CodeAnalysis.VisualBasic": {
|
||||
"target": "Package",
|
||||
"version": "[4.14.0, )"
|
||||
},
|
||||
"Swashbuckle.AspNetCore": {
|
||||
"target": "Package",
|
||||
"version": "[6.5.0, )"
|
||||
@@ -90,7 +106,7 @@
|
||||
"privateAssets": "all"
|
||||
}
|
||||
},
|
||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.407\\RuntimeIdentifierGraph.json"
|
||||
"runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\8.0.407/PortableRuntimeIdentifierGraph.json"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\USER\.nuget\packages\;C:\Program Files\dotnet\sdk\NuGetFallbackFolder</NuGetPackageFolders>
|
||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion>
|
||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<SourceRoot Include="C:\Users\USER\.nuget\packages\" />
|
||||
@@ -16,10 +16,11 @@
|
||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.props')" />
|
||||
<Import Project="$(NuGetPackageRoot)swashbuckle.aspnetcore\6.5.0\build\Swashbuckle.AspNetCore.props" Condition="Exists('$(NuGetPackageRoot)swashbuckle.aspnetcore\6.5.0\build\Swashbuckle.AspNetCore.props')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.11.0\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.11.0\buildTransitive\Microsoft.CodeAnalysis.Analyzers.props')" />
|
||||
<Import Project="$(NuGetPackageRoot)fastreport.core\2021.3.0\buildTransitive\FastReport.Core.props" Condition="Exists('$(NuGetPackageRoot)fastreport.core\2021.3.0\buildTransitive\FastReport.Core.props')" />
|
||||
</ImportGroup>
|
||||
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\USER\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server>
|
||||
<PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\USER\.nuget\packages\microsoft.codeanalysis.analyzers\2.9.4</PkgMicrosoft_CodeAnalysis_Analyzers>
|
||||
<PkgMicrosoft_CodeAnalysis_Analyzers Condition=" '$(PkgMicrosoft_CodeAnalysis_Analyzers)' == '' ">C:\Users\USER\.nuget\packages\microsoft.codeanalysis.analyzers\3.11.0</PkgMicrosoft_CodeAnalysis_Analyzers>
|
||||
</PropertyGroup>
|
||||
</Project>
|
||||
@@ -1,19 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8" standalone="no"?>
|
||||
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||
<Import Project="$(NuGetPackageRoot)system.text.encodings.web\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets" Condition="Exists('$(NuGetPackageRoot)system.text.encodings.web\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encodings.Web.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.text.json\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Json.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.text.encoding.codepages\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encoding.CodePages.targets" Condition="Exists('$(NuGetPackageRoot)system.text.encoding.codepages\8.0.0\buildTransitive\netcoreapp2.0\System.Text.Encoding.CodePages.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.formats.asn1\8.0.0\buildTransitive\netcoreapp2.0\System.Formats.Asn1.targets" Condition="Exists('$(NuGetPackageRoot)system.formats.asn1\8.0.0\buildTransitive\netcoreapp2.0\System.Formats.Asn1.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.security.cryptography.pkcs\8.0.0\buildTransitive\netcoreapp2.0\System.Security.Cryptography.Pkcs.targets" Condition="Exists('$(NuGetPackageRoot)system.security.cryptography.pkcs\8.0.0\buildTransitive\netcoreapp2.0\System.Security.Cryptography.Pkcs.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)system.text.json\8.0.0\buildTransitive\net6.0\System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)system.text.json\8.0.0\buildTransitive\net6.0\System.Text.Json.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.apidescription.server\6.0.5\build\Microsoft.Extensions.ApiDescription.Server.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.primitives\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Primitives.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.primitives\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Primitives.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.filesystemglobbing\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileSystemGlobbing.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.filesystemglobbing\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileSystemGlobbing.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.fileproviders.abstractions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileProviders.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.fileproviders.abstractions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileProviders.Abstractions.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.fileproviders.physical\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileProviders.Physical.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.fileproviders.physical\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.FileProviders.Physical.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.abstractions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.Abstractions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.abstractions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.Abstractions.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.fileextensions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.FileExtensions.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.fileextensions\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.FileExtensions.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.extensions.configuration.json\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.Json.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.extensions.configuration.json\8.0.0\buildTransitive\netcoreapp2.0\Microsoft.Extensions.Configuration.Json.targets')" />
|
||||
<Import Project="$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.11.0\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets" Condition="Exists('$(NuGetPackageRoot)microsoft.codeanalysis.analyzers\3.11.0\buildTransitive\Microsoft.CodeAnalysis.Analyzers.targets')" />
|
||||
</ImportGroup>
|
||||
</Project>
|
||||
@@ -1,9 +1,9 @@
|
||||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net5.0</TargetFramework>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<TargetFramework>net8.0</TargetFramework>
|
||||
<Nullable>enable</Nullable>
|
||||
<ImplicitUsings>enable</ImplicitUsings>
|
||||
<GenerateDocumentationFile>true</GenerateDocumentationFile>
|
||||
<NoWarn>$(NoWarn);1591</NoWarn>
|
||||
</PropertyGroup>
|
||||
@@ -11,6 +11,10 @@
|
||||
<PackageReference Include="ClosedXML" Version="0.96.0" />
|
||||
<PackageReference Include="EPPlus" Version="7.2.2" />
|
||||
<PackageReference Include="FastReport.Core" Version="2021.3.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.14.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.14.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
|
||||
<PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
Reference in New Issue
Block a user