upgrade to .NET 8

NetCoreTemplates · Nov 15, 2023 · 2b460e9 · 2b460e9
1 parent 2f212c4
commit 2b460e9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 34 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,11 +13,10 @@ jobs:
       - name: checkout
         uses: actions/checkout@v3
 
-      - name: setup .net core
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '8.*'
-          dotnet-quality: 'preview'
 
       - name: build
         run: dotnet build

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -57,11 +57,10 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
 
-      - name: setup .net core
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v3
         with:
           dotnet-version: '8.*'
-          dotnet-quality: 'preview'
 
       # Build and push new docker image, skip for manual redeploy other than 'latest'
       - name: Build and push Docker image

diff --git a/MyApp.Tests/MyApp.Tests.csproj b/MyApp.Tests/MyApp.Tests.csproj
@@ -1,23 +1,23 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <DebugType>portable</DebugType>
-    <OutputType>Library</OutputType>
-  </PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <DebugType>portable</DebugType>
+        <OutputType>Library</OutputType>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\MyApp.ServiceInterface\MyApp.ServiceInterface.csproj" />
-    <ProjectReference Include="..\MyApp.ServiceModel\MyApp.ServiceModel.csproj" />
-    <ProjectReference Include="..\MyApp\MyApp.csproj" />
+    <ItemGroup>
+        <ProjectReference Include="..\MyApp.ServiceInterface\MyApp.ServiceInterface.csproj" />
+        <ProjectReference Include="..\MyApp.ServiceModel\MyApp.ServiceModel.csproj" />
+        <ProjectReference Include="..\MyApp\MyApp.csproj" />
 
-    <PackageReference Include="NUnit" Version="3.13.*" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.1.*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Include="ServiceStack" Version="6.*" />
-    <PackageReference Include="ServiceStack.Kestrel" Version="6.*" />
-  </ItemGroup>
+        <PackageReference Include="NUnit" Version="3.*" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.*" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
+        <PackageReference Include="ServiceStack" Version="6.*" />
+        <PackageReference Include="ServiceStack.Kestrel" Version="6.*" />
+    </ItemGroup>
 
 </Project>
diff --git a/MyApp/MyApp.csproj b/MyApp/MyApp.csproj
@@ -8,24 +8,22 @@
         <TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
         <PublishProfile>DefaultContainer</PublishProfile>
     </PropertyGroup>
-    
+
     <ItemGroup>
         <Using Include="MyApp" />
         <Using Include="ServiceStack" />
         <Using Include="ServiceStack.Mvc" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.0-rc.2.23480.2" />
-        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.0-rc.2.23480.2" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.0-rc.2.23480.1" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0-rc.2.23480.1" />
-        <!-- https://github.com/dotnet/aspnetcore/issues/51302#issue-1938612540 -->
-        <PackageReference Include="Microsoft.Net.Compilers.Razor.Toolset" Version="7.0.0-preview.23512.5">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Markdig" Version="0.33.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.*" />
+        <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.*" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.*" />
+        <PackageReference Include="Markdig" Version="0.33.*" />
+    </ItemGroup>
+
+    <ItemGroup>
         <PackageReference Include="ServiceStack" Version="6.*" />
         <PackageReference Include="ServiceStack.Blazor" Version="6.*" />
         <PackageReference Include="ServiceStack.Mvc" Version="6.*" />
@@ -44,9 +42,9 @@
         <Content Include="_posts\**" CopyToPublishDirectory="PreserveNewest"/>
         <Content Include="_videos\**" CopyToPublishDirectory="PreserveNewest"/>
     </ItemGroup>
-    
+
     <ItemGroup>
-      <Folder Include="App_Data\" />
+        <Folder Include="App_Data\" />
     </ItemGroup>
 
     <Target Name="tailwind" BeforeTargets="Publish">