Skip to content

Commit fcf462b

Browse files
authored
Merge pull request #55 from DarkXoro/master
Updated to 5.0
2 parents bf69d3c + 32ecac3 commit fcf462b

File tree

66 files changed

+60
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+60
-108
lines changed

AutoHistory.sln

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26228.4
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30907.101
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EEF95A1B-E224-4488-91ED-4CC4EC3CEEE3}"
77
EndProject
@@ -18,9 +18,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
1818
README.md = README.md
1919
EndProjectSection
2020
EndProject
21-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{DAEF4300-2306-4680-A609-86F2F9E4513A}"
21+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{1C12ACF7-CF58-460C-8EF3-2349D8E62AC1}"
2222
EndProject
23-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore2.2.MVC.EF.Blogs", "samples\AspNetCore2.2.MVC.EF.Blogs\AspNetCore2.2.MVC.EF.Blogs.csproj", "{AB1074C0-4529-44F0-B837-07E34AB9B321}"
23+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCore5.0.MVC.EF.Blogs", "samples\AspNetCore5.0.MVC.EF.Blogs\AspNetCore5.0.MVC.EF.Blogs.csproj", "{01180CD5-4F4E-4C51-9478-00090C03FE73}"
2424
EndProject
2525
Global
2626
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -36,18 +36,18 @@ Global
3636
{2F6C239E-9F05-4654-936B-CFBB00412E4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
3737
{2F6C239E-9F05-4654-936B-CFBB00412E4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
3838
{2F6C239E-9F05-4654-936B-CFBB00412E4B}.Release|Any CPU.Build.0 = Release|Any CPU
39-
{AB1074C0-4529-44F0-B837-07E34AB9B321}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40-
{AB1074C0-4529-44F0-B837-07E34AB9B321}.Debug|Any CPU.Build.0 = Debug|Any CPU
41-
{AB1074C0-4529-44F0-B837-07E34AB9B321}.Release|Any CPU.ActiveCfg = Release|Any CPU
42-
{AB1074C0-4529-44F0-B837-07E34AB9B321}.Release|Any CPU.Build.0 = Release|Any CPU
39+
{01180CD5-4F4E-4C51-9478-00090C03FE73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
40+
{01180CD5-4F4E-4C51-9478-00090C03FE73}.Debug|Any CPU.Build.0 = Debug|Any CPU
41+
{01180CD5-4F4E-4C51-9478-00090C03FE73}.Release|Any CPU.ActiveCfg = Release|Any CPU
42+
{01180CD5-4F4E-4C51-9478-00090C03FE73}.Release|Any CPU.Build.0 = Release|Any CPU
4343
EndGlobalSection
4444
GlobalSection(SolutionProperties) = preSolution
4545
HideSolutionNode = FALSE
4646
EndGlobalSection
4747
GlobalSection(NestedProjects) = preSolution
4848
{5927DE0F-FA62-4B71-8AAF-2B3DDC405E34} = {EEF95A1B-E224-4488-91ED-4CC4EC3CEEE3}
4949
{2F6C239E-9F05-4654-936B-CFBB00412E4B} = {504C6707-0D9C-4FA7-861D-B1A97AF39E32}
50-
{AB1074C0-4529-44F0-B837-07E34AB9B321} = {DAEF4300-2306-4680-A609-86F2F9E4513A}
50+
{01180CD5-4F4E-4C51-9478-00090C03FE73} = {1C12ACF7-CF58-460C-8EF3-2349D8E62AC1}
5151
EndGlobalSection
5252
GlobalSection(ExtensibilityGlobals) = postSolution
5353
SolutionGuid = {ED8B7FB1-308D-49C1-8124-E03D7D6E6D85}

samples/AspNetCore2.2.MVC.EF.Blogs/AspNetCore2.2.MVC.EF.Blogs.csproj renamed to samples/AspNetCore5.0.MVC.EF.Blogs/AspNetCore5.0.MVC.EF.Blogs.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
5-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
4+
<TargetFramework>netcoreapp5.0</TargetFramework>
5+
<!--<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>-->
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.3" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
1010
</ItemGroup>
1111

1212
<ItemGroup>

samples/AspNetCore2.2.MVC.EF.Blogs/Controllers/BlogsController.cs renamed to samples/AspNetCore5.0.MVC.EF.Blogs/Controllers/BlogsController.cs

File renamed without changes.

samples/AspNetCore2.2.MVC.EF.Blogs/Migrations/20181226223513_Initial.Designer.cs renamed to samples/AspNetCore5.0.MVC.EF.Blogs/Migrations/20181226223513_Initial.Designer.cs

File renamed without changes.

samples/AspNetCore2.2.MVC.EF.Blogs/Migrations/20181226223513_Initial.cs renamed to samples/AspNetCore5.0.MVC.EF.Blogs/Migrations/20181226223513_Initial.cs

File renamed without changes.

samples/AspNetCore2.2.MVC.EF.Blogs/Migrations/BloggingContextModelSnapshot.cs renamed to samples/AspNetCore5.0.MVC.EF.Blogs/Migrations/BloggingContextModelSnapshot.cs

File renamed without changes.

samples/AspNetCore2.2.MVC.EF.Blogs/Models/ErrorViewModel.cs renamed to samples/AspNetCore5.0.MVC.EF.Blogs/Models/ErrorViewModel.cs

File renamed without changes.
File renamed without changes.

samples/AspNetCore2.2.MVC.EF.Blogs/Program.cs renamed to samples/AspNetCore5.0.MVC.EF.Blogs/Program.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,14 @@ public class Program
77
{
88
public static void Main(string[] args)
99
{
10+
CreateHostBuilder(args).Build().Run();
11+
}
12+
13+
public static IHostBuilder CreateHostBuilder(string[] args) =>
1014
Host.CreateDefaultBuilder(args)
1115
.ConfigureWebHostDefaults(webBuilder =>
1216
{
13-
webBuilder.ConfigureKestrel(serverOptions =>
14-
{
15-
// Set properties and call methods on options
16-
})
17-
.UseStartup<Startup>();
17+
webBuilder.UseStartup<Startup>();
1818
});
19-
}
2019
}
2120
}

samples/AspNetCore2.2.MVC.EF.Blogs/Properties/launchSettings.json renamed to samples/AspNetCore5.0.MVC.EF.Blogs/Properties/launchSettings.json

File renamed without changes.

0 commit comments

Comments
 (0)