Skip to content

Commit f9536f3

Browse files
VahidNVahidN
committed
Update dependencies
1 parent 94b4c5b commit f9536f3

File tree

11 files changed

+312
-273
lines changed

11 files changed

+312
-273
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ jobs:
1212
- name: Setup .NET Core
1313
uses: actions/setup-dotnet@v1
1414
with:
15-
dotnet-version: 3.0.100-preview9-014004
15+
dotnet-version: 3.1.101
1616
- name: Build PdfRpt.Core lib
1717
run: dotnet build ./src/PdfRpt.Core/PdfRpt.Core.csproj --configuration Release

‎PdfReport.Core.sln

Lines changed: 50 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,68 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.4
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{B878A6BD-830B-4C4E-B077-F6C492D5B5E1}"
4+
VisualStudioVersion = 15.0.26124.0
5+
MinimumVisualStudioVersion = 15.0.26124.0
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{024559C4-A1C6-4E9F-942D-89B6C8ECB2C9}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8940BB5F-E6F5-4180-902E-586C25DEECA3}"
9-
ProjectSection(SolutionItems) = preProject
10-
LICENSE.md = LICENSE.md
11-
README.md = README.md
12-
EndProjectSection
8+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfRpt.Core", "src\PdfRpt.Core\PdfRpt.Core.csproj", "{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}"
139
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfRpt.Core", "src\PdfRpt.Core\PdfRpt.Core.csproj", "{948A6F42-82FE-473D-94CE-4668A126C3BF}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfRpt.Core.FunctionalTests", "src\PdfRpt.Core.FunctionalTests\PdfRpt.Core.FunctionalTests.csproj", "{32623B1B-A806-4866-ACD1-8137C6627F0C}"
1511
EndProject
16-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PdfRpt.Core.FunctionalTests", "src\PdfRpt.Core.FunctionalTests\PdfRpt.Core.FunctionalTests.csproj", "{099A85D6-E41D-4BA9-85F2-F3A714C651B8}"
17-
EndProject
18-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfRpt.Core.SampleWebApp", "PdfRpt.Core.SampleWebApp\PdfRpt.Core.SampleWebApp.csproj", "{C7C1938E-DB5E-49DB-95F7-472E1094F748}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PdfRpt.Core.SampleWebApp", "PdfRpt.Core.SampleWebApp\PdfRpt.Core.SampleWebApp.csproj", "{99A6109B-CD3D-47BF-B71A-0F05533041B9}"
1913
EndProject
2014
Global
2115
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2216
Debug|Any CPU = Debug|Any CPU
17+
Debug|x64 = Debug|x64
18+
Debug|x86 = Debug|x86
2319
Release|Any CPU = Release|Any CPU
24-
EndGlobalSection
25-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
26-
{948A6F42-82FE-473D-94CE-4668A126C3BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{948A6F42-82FE-473D-94CE-4668A126C3BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{948A6F42-82FE-473D-94CE-4668A126C3BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{948A6F42-82FE-473D-94CE-4668A126C3BF}.Release|Any CPU.Build.0 = Release|Any CPU
30-
{099A85D6-E41D-4BA9-85F2-F3A714C651B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31-
{099A85D6-E41D-4BA9-85F2-F3A714C651B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
32-
{099A85D6-E41D-4BA9-85F2-F3A714C651B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
33-
{099A85D6-E41D-4BA9-85F2-F3A714C651B8}.Release|Any CPU.Build.0 = Release|Any CPU
34-
{C7C1938E-DB5E-49DB-95F7-472E1094F748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35-
{C7C1938E-DB5E-49DB-95F7-472E1094F748}.Debug|Any CPU.Build.0 = Debug|Any CPU
36-
{C7C1938E-DB5E-49DB-95F7-472E1094F748}.Release|Any CPU.ActiveCfg = Release|Any CPU
37-
{C7C1938E-DB5E-49DB-95F7-472E1094F748}.Release|Any CPU.Build.0 = Release|Any CPU
20+
Release|x64 = Release|x64
21+
Release|x86 = Release|x86
3822
EndGlobalSection
3923
GlobalSection(SolutionProperties) = preSolution
4024
HideSolutionNode = FALSE
4125
EndGlobalSection
26+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
27+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
28+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Debug|Any CPU.Build.0 = Debug|Any CPU
29+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Debug|x64.ActiveCfg = Debug|Any CPU
30+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Debug|x64.Build.0 = Debug|Any CPU
31+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Debug|x86.ActiveCfg = Debug|Any CPU
32+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Debug|x86.Build.0 = Debug|Any CPU
33+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Release|Any CPU.ActiveCfg = Release|Any CPU
34+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Release|Any CPU.Build.0 = Release|Any CPU
35+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Release|x64.ActiveCfg = Release|Any CPU
36+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Release|x64.Build.0 = Release|Any CPU
37+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Release|x86.ActiveCfg = Release|Any CPU
38+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9}.Release|x86.Build.0 = Release|Any CPU
39+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
41+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Debug|x64.ActiveCfg = Debug|Any CPU
42+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Debug|x64.Build.0 = Debug|Any CPU
43+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Debug|x86.ActiveCfg = Debug|Any CPU
44+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Debug|x86.Build.0 = Debug|Any CPU
45+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
46+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Release|Any CPU.Build.0 = Release|Any CPU
47+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Release|x64.ActiveCfg = Release|Any CPU
48+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Release|x64.Build.0 = Release|Any CPU
49+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Release|x86.ActiveCfg = Release|Any CPU
50+
{32623B1B-A806-4866-ACD1-8137C6627F0C}.Release|x86.Build.0 = Release|Any CPU
51+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
52+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Debug|Any CPU.Build.0 = Debug|Any CPU
53+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Debug|x64.ActiveCfg = Debug|Any CPU
54+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Debug|x64.Build.0 = Debug|Any CPU
55+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Debug|x86.ActiveCfg = Debug|Any CPU
56+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Debug|x86.Build.0 = Debug|Any CPU
57+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Release|Any CPU.ActiveCfg = Release|Any CPU
58+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Release|Any CPU.Build.0 = Release|Any CPU
59+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Release|x64.ActiveCfg = Release|Any CPU
60+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Release|x64.Build.0 = Release|Any CPU
61+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Release|x86.ActiveCfg = Release|Any CPU
62+
{99A6109B-CD3D-47BF-B71A-0F05533041B9}.Release|x86.Build.0 = Release|Any CPU
63+
EndGlobalSection
4264
GlobalSection(NestedProjects) = preSolution
43-
{948A6F42-82FE-473D-94CE-4668A126C3BF} = {B878A6BD-830B-4C4E-B077-F6C492D5B5E1}
44-
{099A85D6-E41D-4BA9-85F2-F3A714C651B8} = {B878A6BD-830B-4C4E-B077-F6C492D5B5E1}
45-
{C7C1938E-DB5E-49DB-95F7-472E1094F748} = {B878A6BD-830B-4C4E-B077-F6C492D5B5E1}
65+
{A6F5FC09-BCF8-4B80-B815-50E69CDE5DB9} = {024559C4-A1C6-4E9F-942D-89B6C8ECB2C9}
66+
{32623B1B-A806-4866-ACD1-8137C6627F0C} = {024559C4-A1C6-4E9F-942D-89B6C8ECB2C9}
4667
EndGlobalSection
4768
EndGlobal

‎PdfRpt.Core.SampleWebApp/Controllers/HomeController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ namespace PdfRpt.Core.SampleWebApp.Controllers
1010
{
1111
public class HomeController : Controller
1212
{
13-
private readonly IHostingEnvironment _hostingEnvironment;
13+
private readonly IWebHostEnvironment _hostingEnvironment;
1414

1515
// only 1 thread can access the code
1616
private static readonly SemaphoreSlim _semaphoreSlim = new SemaphoreSlim(1, 1);
1717

18-
public HomeController(IHostingEnvironment hostingEnvironment)
18+
public HomeController(IWebHostEnvironment hostingEnvironment)
1919
{
2020
_hostingEnvironment = hostingEnvironment;
2121
}

‎PdfRpt.Core.SampleWebApp/PdfRpt.Core.SampleWebApp.csproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.2</TargetFramework>
3+
<TargetFramework>netcoreapp3.1</TargetFramework>
44
<NoWarn>RCS1090</NoWarn>
55
</PropertyGroup>
66
<ItemGroup>
77
<Folder Include="wwwroot\" />
88
</ItemGroup>
9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.App" />
11-
</ItemGroup>
129
<ItemGroup>
1310
<ProjectReference Include="..\src\PdfRpt.Core\PdfRpt.Core.csproj" />
1411
</ItemGroup>

‎PdfRpt.Core.SampleWebApp/Program.cs

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,20 @@
1-
using Microsoft.AspNetCore;
2-
using Microsoft.AspNetCore.Hosting;
1+
using Microsoft.AspNetCore.Hosting;
2+
using Microsoft.Extensions.Hosting;
33

44
namespace PdfRpt.Core.SampleWebApp
55
{
66
public class Program
77
{
88
public static void Main(string[] args)
99
{
10-
CreateWebHostBuilder(args).Build().Run();
10+
CreateHostBuilder(args).Build().Run();
1111
}
1212

13-
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
14-
WebHost.CreateDefaultBuilder(args)
15-
.UseStartup<Startup>();
13+
public static IHostBuilder CreateHostBuilder(string[] args) =>
14+
Host.CreateDefaultBuilder(args)
15+
.ConfigureWebHostDefaults(webBuilder =>
16+
{
17+
webBuilder.UseStartup<Startup>();
18+
});
1619
}
1720
}

‎PdfRpt.Core.SampleWebApp/Startup.cs

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,28 @@
11
using Microsoft.AspNetCore.Builder;
22
using Microsoft.AspNetCore.Hosting;
3-
using Microsoft.AspNetCore.Mvc;
3+
using Microsoft.Extensions.Configuration;
44
using Microsoft.Extensions.DependencyInjection;
5+
using Microsoft.Extensions.Hosting;
56

67
namespace PdfRpt.Core.SampleWebApp
78
{
89
public class Startup
910
{
11+
public Startup(IConfiguration configuration)
12+
{
13+
Configuration = configuration;
14+
}
15+
16+
public IConfiguration Configuration { get; }
17+
18+
// This method gets called by the runtime. Use this method to add services to the container.
1019
public void ConfigureServices(IServiceCollection services)
1120
{
12-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
21+
services.AddControllersWithViews();
1322
}
1423

15-
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
24+
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
25+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
1626
{
1727
if (env.IsDevelopment())
1828
{
@@ -21,15 +31,20 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
2131
else
2232
{
2333
app.UseExceptionHandler("/Home/Error");
34+
// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
2435
app.UseHsts();
2536
}
26-
2737
app.UseHttpsRedirection();
28-
29-
app.UseDefaultFiles();
3038
app.UseStaticFiles();
3139

32-
app.UseMvcWithDefaultRoute();
40+
app.UseRouting();
41+
42+
app.UseEndpoints(endpoints =>
43+
{
44+
endpoints.MapControllerRoute(
45+
name: "default",
46+
pattern: "{controller=Home}/{action=Index}/{id?}");
47+
});
3348
}
3449
}
3550
}

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "3.0.100-preview9-014004"
3+
"version": "3.1.101"
44
}
55
}

0 commit comments

Comments
 (0)