diff --git a/.github/workflows/dotnet-core-pull-request.yml b/.github/workflows/dotnet-core-pull-request.yml index b1c8251..f78cb37 100644 --- a/.github/workflows/dotnet-core-pull-request.yml +++ b/.github/workflows/dotnet-core-pull-request.yml @@ -13,7 +13,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Install dependencies run: dotnet restore - name: Build diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index 0c1ee1a..857d443 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -1,4 +1,4 @@ -name: .NET 6 & 7 +name: .NET 8 on: push: @@ -13,7 +13,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: Install dependencies run: dotnet restore - name: Build diff --git a/.github/workflows/master_core-admin-demo.yml b/.github/workflows/master_core-admin-demo.yml index 0fa9580..730277d 100644 --- a/.github/workflows/master_core-admin-demo.yml +++ b/.github/workflows/master_core-admin-demo.yml @@ -18,7 +18,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v3 with: - dotnet-version: 7.0.x + dotnet-version: 8.0.x - name: dotnet publish run: dotnet publish src\DotNetEd.CoreAdmin.DemoAppDotNet6\DotNetEd.CoreAdmin.DemoAppDotNet6.csproj -c Release -o "${{env.DOTNET_ROOT}}\myapp" --framework net7.0 diff --git a/DotNetEd.CoreAdmin.sln b/DotNetEd.CoreAdmin.sln index e334f7a..1fb4af0 100644 --- a/DotNetEd.CoreAdmin.sln +++ b/DotNetEd.CoreAdmin.sln @@ -14,10 +14,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig .github\workflows\dotnet-core-pull-request.yml = .github\workflows\dotnet-core-pull-request.yml .github\workflows\dotnet-core.yml = .github\workflows\dotnet-core.yml + .github\workflows\master_core-admin-demo.yml = .github\workflows\master_core-admin-demo.yml README.md = README.md EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetEd.CoreAdmin.DemoAppDotNet6", "src\DotNetEd.CoreAdmin.DemoAppDotNet6\DotNetEd.CoreAdmin.DemoAppDotNet6.csproj", "{A3A57016-920D-4173-B054-891E42769923}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetEd.CoreAdmin.DemoAppDotNet8", "src\DotNetEd.CoreAdmin.DemoAppDotNet8\DotNetEd.CoreAdmin.DemoAppDotNet8.csproj", "{6C4638AD-33BA-4FFD-8608-45F081F17467}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -37,10 +38,10 @@ Global {DEFCA510-EDB9-4D6C-8DF6-D006504C2046}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEFCA510-EDB9-4D6C-8DF6-D006504C2046}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEFCA510-EDB9-4D6C-8DF6-D006504C2046}.Release|Any CPU.Build.0 = Release|Any CPU - {A3A57016-920D-4173-B054-891E42769923}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A3A57016-920D-4173-B054-891E42769923}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A3A57016-920D-4173-B054-891E42769923}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A3A57016-920D-4173-B054-891E42769923}.Release|Any CPU.Build.0 = Release|Any CPU + {6C4638AD-33BA-4FFD-8608-45F081F17467}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C4638AD-33BA-4FFD-8608-45F081F17467}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C4638AD-33BA-4FFD-8608-45F081F17467}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C4638AD-33BA-4FFD-8608-45F081F17467}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/DemoAssets/ed-100.png b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/DemoAssets/ed-100.png similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/DemoAssets/ed-100.png rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/DemoAssets/ed-100.png diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/DotNetEd.CoreAdmin.DemoAppDotNet6.csproj b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/DotNetEd.CoreAdmin.DemoAppDotNet8.csproj similarity index 61% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/DotNetEd.CoreAdmin.DemoAppDotNet6.csproj rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/DotNetEd.CoreAdmin.DemoAppDotNet8.csproj index bbc1d29..45e1087 100644 --- a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/DotNetEd.CoreAdmin.DemoAppDotNet6.csproj +++ b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/DotNetEd.CoreAdmin.DemoAppDotNet8.csproj @@ -1,7 +1,7 @@  - net7.0 + net8.0 enable enable @@ -17,10 +17,9 @@ - - + - + diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/ErrorViewModel.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/ErrorViewModel.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/ErrorViewModel.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/ErrorViewModel.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestAutogeneratedKeyEntity.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestAutogeneratedKeyEntity.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestAutogeneratedKeyEntity.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestAutogeneratedKeyEntity.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestChildEntity.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestChildEntity.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestChildEntity.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestChildEntity.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestDbContext.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestDbContext.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestDbContext.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestDbContext.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestEntity.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestEntity.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestEntity.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestEntity.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestEntityWithImage.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestEntityWithImage.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestEntityWithImage.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestEntityWithImage.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestParentEntity.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestParentEntity.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Models/TestParentEntity.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Models/TestParentEntity.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Error.cshtml b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Error.cshtml similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Error.cshtml rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Error.cshtml diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Error.cshtml.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Error.cshtml.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Error.cshtml.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Error.cshtml.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Index.cshtml b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Index.cshtml similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Index.cshtml rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Index.cshtml diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Index.cshtml.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Index.cshtml.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Index.cshtml.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Index.cshtml.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Privacy.cshtml b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Privacy.cshtml similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Privacy.cshtml rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Privacy.cshtml diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Privacy.cshtml.cs b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Privacy.cshtml.cs similarity index 100% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Privacy.cshtml.cs rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Privacy.cshtml.cs diff --git a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Shared/_Layout.cshtml b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Shared/_Layout.cshtml similarity index 92% rename from src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Shared/_Layout.cshtml rename to src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Shared/_Layout.cshtml index ebb3314..42ecd57 100644 --- a/src/DotNetEd.CoreAdmin.DemoAppDotNet6/Pages/Shared/_Layout.cshtml +++ b/src/DotNetEd.CoreAdmin.DemoAppDotNet8/Pages/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - DotNetEd.CoreAdmin.DemoAppDotNet6 + @ViewData["Title"] - DotNetEd.CoreAdmin.DemoAppDotNet8 @@ -12,7 +12,7 @@