Merge pull request #53 from jramgar/master

update LTS net6.0 and net8.0
Xabaril · Sep 11, 2024 · d251a3b · d251a3b
2 parents 3711334 + e73a825
commit d251a3b
Show file tree

Hide file tree

Showing 23 changed files with 167 additions and 189 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "5.0.2",
+      "version": "8.0.7",
       "commands": [
         "dotnet-ef"
       ]

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -23,23 +23,19 @@ jobs:
           - 5433:1433
     steps:
       - uses: actions/checkout@v1
-      - name: Setup .NET Core SDK 5.0.101
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.101
-      - name: Setup .NET Core SDK 3.1.301
+
+      - name: Setup .NET Core SDK 6.0.424
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.301
-      - name: Setup .NET Core SDK 5.0.101
+          dotnet-version: 6.0.424
+      - name: Setup .NET Core SDK 8.0.303
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.200
-      - name: dotnet build dotNET 3.1
-        run: dotnet build Balea.sln -c $BUILD_CONFIG --framework netcoreapp3.1
-      - name: dotnet build  dotNET 5.0
-        run: dotnet build Balea.sln -c $BUILD_CONFIG --framework net5.0
+          dotnet-version: 8.0.303
+
       - name: dotnet build  dotNET 6.0
         run: dotnet build Balea.sln -c $BUILD_CONFIG --framework net6.0
+      - name: dotnet build  dotNET 8.0
+        run: dotnet build Balea.sln -c $BUILD_CONFIG --framework net8.0        
       - name: dotnet test [FunctionalTests]
         run: dotnet test ./test/FunctionalTests/FunctionalTests.csproj -c $BUILD_CONFIG --no-build
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -19,18 +19,15 @@ jobs:
           - 5433:1433
     steps:
       - uses: actions/checkout@v1
-      - name: Setup .NET Core SDK 6.0.200
+      - name: Setup .NET Core SDK 6.0.424
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.200
-      - name: Setup .NET Core SDK 5.0.101
+          dotnet-version: 6.0.424
+      - name: Setup .NET Core SDK 8.0.303
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.101
-      - name: Setup .NET Core SDK 3.1.301
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.301
+          dotnet-version: 8.0.303
+
       - name: dotnet build
         run: dotnet build Balea.sln -c $BUILD_CONFIG
       - name: dotnet test [FunctionalTests]

diff --git a/.github/workflows/nuget-preview.yml b/.github/workflows/nuget-preview.yml
@@ -21,18 +21,16 @@ jobs:
           - 5433:1433
     steps:
       - uses: actions/checkout@v1
-      - name: Setup .NET Core SDK 6.0.200
+
+      - name: Setup .NET Core SDK 6.0.424
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.200
-      - name: Setup .NET Core SDK 5.0.101
+          dotnet-version: 6.0.424
+      - name: Setup .NET Core SDK 8.0.303
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.101
-      - name: Setup .NET Core SDK 3.1.301
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 3.1.404
+          dotnet-version: 8.0.303
+
       - name: dotnet build
         run: dotnet build Balea.sln -c $BUILD_CONFIG
       - name: dotnet test [FunctionalTests]

diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
@@ -21,18 +21,16 @@ jobs:
           - 5433:1433
     steps:
       - uses: actions/checkout@v1
-      - name: Setup .NET Core SDK 6.0.200
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 6.0.200
-      - name: Setup .NET Core SDK 5.0.101
+
+      - name: Setup .NET Core SDK 6.0.424
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 5.0.101
-      - name: Setup .NET Core SDK 3.1.301
+          dotnet-version: 6.0.424
+      - name: Setup .NET Core SDK 8.0.303
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 3.1.404
+          dotnet-version: 8.0.303
+
       - name: dotnet build
         run: dotnet build Balea.sln -c $BUILD_CONFIG
       - name: dotnet test [FunctionalTests]

diff --git a/Balea.sln b/Balea.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29519.181
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.35122.118
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{902B3EDC-5C6F-4058-8A05-DA80D4B03F97}"
 EndProject

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -7,60 +7,17 @@
     <EmbeddedFiles Include="$(GeneratedAssemblyInfoFile)"/>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Update="Duende.IdentityServer" Version="5.0.0-preview.2" />
-    <PackageReference Update="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="$(NetCoreVersion3)"/>
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(NetCoreVersion3)" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(NetCoreVersion3)" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(NetCoreVersion3)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(NetCoreVersion3)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(NetCoreVersion3)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(NetCoreVersion3)">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Antlr4.Runtime" Version="4.6.6" />
-    <PackageReference Update="Antlr4.CodeGenerator" Version="4.6.6">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Update="Duende.IdentityServer" Version="5.0.0-preview.2" />
-    <PackageReference Update="Serilog.AspNetCore" Version="3.4.0" />
-    <PackageReference Update="Microsoft.Extensions.Options" Version="5.0.0"/>
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="$(NetCoreVersion5)" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="$(NetCoreVersion5)" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(NetCoreVersion5)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(NetCoreVersion5)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="$(NetCoreVersion5)" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="$(NetCoreVersion5)">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Update="Antlr4.Runtime" Version="4.6.6" />
-    <PackageReference Update="Antlr4.CodeGenerator" Version="4.6.6">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
-    <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Update="Duende.IdentityServer" Version="6.0.4" />
-    <PackageReference Update="Serilog.AspNetCore" Version="5.0.0" />
+    <PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Update="Duende.IdentityServer" Version="6.3.9" />
+    <PackageReference Update="Serilog.AspNetCore" Version="6.1.0" />
     <PackageReference Update="Microsoft.Extensions.Options" Version="6.0.0"/>
-    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.2" />
-    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.2" />
-    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="6.0.2">
+    <PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.32" />
+    <PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.32" />
+    <PackageReference Update="Microsoft.AspNetCore.TestHost" Version="6.0.32" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="6.0.32" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.32" />
+    <PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="6.0.32">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -71,18 +28,40 @@
     </PackageReference>
   </ItemGroup>
 
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+		<PackageReference Update="Newtonsoft.Json" Version="13.0.3" />
+		<PackageReference Update="Duende.IdentityServer" Version="7.0.5" />
+		<PackageReference Update="Serilog.AspNetCore" Version="8.0.1" />
+		<PackageReference Update="Microsoft.Extensions.Options" Version="8.0.2"/>
+		<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="8.0.7" />
+		<PackageReference Update="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.7" />
+		<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="8.0.7" />
+		<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="8.0.7" />
+		<PackageReference Update="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
+		<PackageReference Update="Microsoft.EntityFrameworkCore.Design" Version="8.0.7" >
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+		<PackageReference Update="Antlr4.Runtime" Version="4.6.6" />
+		<PackageReference Update="Antlr4.CodeGenerator" Version="4.6.6">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageReference>
+	</ItemGroup>	
+
+
   <ItemGroup Label="Testing Dependencies">
-    <PackageReference Update="AutoFixture.Xunit2" Version="4.15.0" />
-    <PackageReference Update="Acheve.TestHost" Version="3.0.0" />
-    <PackageReference Update="FluentAssertions" Version="5.10.3" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Update="Respawn" Version="4.0.0" />
-    <PackageReference Update="xunit" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Update="AutoFixture.Xunit2" Version="4.18.1" />
+    <PackageReference Update="Acheve.TestHost" Version="4.0.0" />
+    <PackageReference Update="FluentAssertions" Version="6.12.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageReference Update="Respawn" Version="6.2.1" />
+    <PackageReference Update="xunit" Version="2.9.0" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Update="coverlet.collector" Version="3.0.0">
+    <PackageReference Update="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ For project documentation, please visit [readthedocs](https://balea.readthedocs.
 
 ## How to build
 
-Balea is built against the latest NET Core 3.
+Balea is built against the latest NET Core 6 and .Net Core 8.
 
 - [Install](https://www.microsoft.com/net/download/core#/current) the [required](https://github.com/Xabaril/Balea/blob/master/global.json) .NET Core SDK
 - Run [build.ps1](https://github.com/Xabaril/Balea/blob/master/build.ps1) in the root of the repo.

diff --git a/build.ps1 b/build.ps1
@@ -37,23 +37,23 @@ Write-Output "Starting docker containers"
 
 exec { & docker-compose -f build\docker-compose-infrastructure.yml up -d }
 
-Write-Output "Running functional tests [NETCOREAPP3.1]"
+Write-Output "Running functional tests [NET6.0]"
 
 try {
 
   Push-Location -Path .\test\FunctionalTests
-  exec { & dotnet test --framework netcoreapp3.1}
+  exec { & dotnet test --framework net6.0}
 }
 finally {
   Pop-Location
 }
 
-Write-Output "Running functional tests [NET5.0]"
+Write-Output "Running functional tests [NET8.0]"
 
 try {
 
   Push-Location -Path .\test\FunctionalTests
-  exec { & dotnet test --framework net5.0}
+  exec { & dotnet test --framework net8.0}
 }
 finally {
   Pop-Location

diff --git a/build.sh b/build.sh
@@ -20,11 +20,11 @@ dotnet build -c Release --version-suffix "$buildSuffix"  -v q /nologo
 echo "Starting docker containers"
 docker-compose -f build/docker-compose-infrastructure.yml up -d
 
-echo "Runing functional tests [NETCOREAPP3.1]"
-dotnet test --framework netcoreapp3.1 ./test/FunctionalTests/FunctionalTests.csproj
+echo "Runing functional tests [NET6.0]"
+dotnet test --framework net6.0 ./test/FunctionalTests/FunctionalTests.csproj
 
-echo "Runing functional tests [NET5.0]"
-dotnet test --framework net5.0 ./test/FunctionalTests/FunctionalTests.csproj
+echo "Runing functional tests [NET8.0]"
+dotnet test --framework net8.0 ./test/FunctionalTests/FunctionalTests.csproj
 
 echo "Finalizing docker containers"
 docker-compose -f build/docker-compose-infrastructure.yml down
diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,11 +1,11 @@
 #Docker file for Contoso University configuration demo.
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0  AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0  AS build
 WORKDIR /src
 COPY ./NuGet.config ./NuGet.config
 COPY ./Directory.Build.props ./Directory.Build.props

diff --git a/build/DockerfileEfCore b/build/DockerfileEfCore
@@ -1,11 +1,11 @@
 #Docker file for Contoso University configuration demo.
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM  mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM  mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY ./NuGet.config ./NuGet.config
 COPY ./Directory.Build.props ./Directory.Build.props

diff --git a/build/dependencies.props b/build/dependencies.props
@@ -1,19 +1,17 @@
 <Project>
   <PropertyGroup Label="SDK Versions">
     <NetStandardTargetVersion21>netstandard2.1</NetStandardTargetVersion21>
-    <NetCoreTargetVersion>netcoreapp3.1;net5.0;net6.0</NetCoreTargetVersion>
+    <NetCoreTargetVersion>net6.0;net8.0</NetCoreTargetVersion>
     <LangVersion>preview</LangVersion>
     <RazorLangVersion>3.0</RazorLangVersion>
   </PropertyGroup>
 
   <PropertyGroup Label="Balea Versions">
-    <Balea>7.2.0$(VersionSuffix)</Balea>
+    <Balea>8.0.0$(VersionSuffix)</Balea>
   </PropertyGroup>
 
   <PropertyGroup Label="Package Dependencies">
-    <NetCoreVersion3>3.1.10</NetCoreVersion3>
-    <NetCoreVersion5>5.0.1</NetCoreVersion5>
-    <MicrosoftSourceLinkGithub>1.1.1</MicrosoftSourceLinkGithub>
+    <MicrosoftSourceLinkGithub>8.0.0</MicrosoftSourceLinkGithub>
   </PropertyGroup>
 
 </Project>
diff --git a/global.json b/global.json
@@ -5,6 +5,6 @@
     "samples"
   ],
   "sdk": {
-    "version": "6.0.200"
+    "version": "8.0.303"
   }
 }
diff --git a/install-sdk.ps1 b/install-sdk.ps1
@@ -1,8 +1,5 @@
-$SdkVersion = "3.1.404"
+$SdkVersion = "6.0.424"
 & "./dotnet-install.ps1" -Version $SdkVersion
 
-$SdkVersion = "5.0.101"
-& "./dotnet-install.ps1" -Version $SdkVersion
-
-$SdkVersion = "6.0.200"
+$SdkVersion = "8.0.303"
 & "./dotnet-install.ps1" -Version $SdkVersion
diff --git a/install-sdk.sh b/install-sdk.sh
@@ -1,9 +1,8 @@
 #!/bin/bash
 
-SdkVersion="3.1.404"
-./dotnet-install.sh -Version $SdkVersion
-SdkVersion="5.0.101"
+
+SdkVersion="6.0.424"
 ./dotnet-install.sh -Version $SdkVersion
-SdkVersion="6.0.200"
+SdkVersion="8.0.303"
 ./dotnet-install.sh -Version $SdkVersion
 export PATH="$PATH:$HOME/.dotnet"