Merge branch 'release/8.0.0'

huorswords · Dec 7, 2023 · 7491de5 · 7491de5
2 parents 72b860e + 21394e9
commit 7491de5
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 58 deletions.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -21,6 +21,8 @@ jobs:
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: |
+            8.0.x
+            7.0.x
             6.0.x
             5.0.x
             3.1.x

diff --git a/deploy/main.yml b/deploy/main.yml
@@ -5,43 +5,13 @@ trigger:
   - main
 
 variables:
-  BuildConfiguration: "Release"
+  - name: BuildConfiguration
+    value: "Release"
 
 steps:
-  - task: UseDotNet@2
-    displayName: "Use .NET Core sdk 1.1.x"
-    inputs:
-      version: 1.1.x
-
-  - task: UseDotNet@2
-    displayName: "Use .NET Core sdk 2.x"
-    inputs:
-      version: 2.x
-
-  - task: UseDotNet@2
-    displayName: "Use .NET Core sdk 3.0.x"
-    inputs:
-      version: 3.0.x
-
-  - task: UseDotNet@2
-    displayName: "Use .NET Core sdk 3.1.x"
-    inputs:
-      version: 3.1.x
-
-  - task: UseDotNet@2
-    displayName: "Use .NET Core sdk 5.0.x"
-    inputs:
-      version: 5.0.x
-
-  - task: UseDotNet@2
-    displayName: "Use .NET Core sdk 6.0.x"
-    inputs:
-      version: 6.0.x
-
-  - task: UseDotNet@2
-    displayName: "Use .NET Core sdk 7.0.x"
-    inputs:
-      version: 7.0.x
+  - template: sdk.yaml
+    parameters:    
+      SupportedVersions: ["1.1.x", "2.x", "3.0.x", "3.1.x", "5.0.x", "6.0.x", "7.0.x", "8.0.x"]
 
   - task: DownloadSecureFile@1
     name: snkFile # The name with which to reference the secure file's path on the agent, like $(snkFile.secureFilePath)
@@ -61,18 +31,14 @@ steps:
   - task: DotNetCoreCLI@2
     displayName: "dotnet build"
     inputs:
-      projects: |
-        $(Build.SourcesDirectory)/**/*csproj
-        !$(Build.SourcesDirectory)/**/NetFrameworkv4_7_2/*.csproj
+      projects: $(Build.SourcesDirectory)/**/*csproj
       arguments: "--configuration $(BuildConfiguration)"
 
   - task: DotNetCoreCLI@2
     displayName: "dotnet test"
     inputs:
       command: test
-      projects: |
-        $(Build.SourcesDirectory)/**/*.csproj
-        !$(Build.SourcesDirectory)/**/NetFramework.v472.Tests/*.csproj
+      projects: $(Build.SourcesDirectory)/**/*.csproj
       arguments: "--configuration $(BuildConfiguration)"
 
   - task: DotNetCoreCLI@2

diff --git a/deploy/sdk.yaml b/deploy/sdk.yaml
@@ -0,0 +1,10 @@
+parameters:
+  - name: SupportedVersions
+    type: object
+
+steps:
+  - ${{ each version in parameters.SupportedVersions }}:
+    - task: UseDotNet@2
+      displayName: Use .NET Core sdk ${{ version }}
+      inputs:
+        version: ${{ version }}
diff --git a/...ensions.Logging.Log4Net.AspNetCore/Microsoft.Extensions.Logging.Log4Net.AspNetCore.csproj b/...ensions.Logging.Log4Net.AspNetCore/Microsoft.Extensions.Logging.Log4Net.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
 	</PropertyGroup>
 	<PropertyGroup>
 		<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
@@ -19,15 +19,13 @@
 		<RootNamespace>Microsoft.Extensions.Logging.Log4Net.AspNetCore</RootNamespace>
 		<AssemblyName>Microsoft.Extensions.Logging.Log4Net.AspNetCore</AssemblyName>
 		<PackageReleaseNotes>
-			#132 - Add support for ValueTuple scopes
-			#129 - Compatible with .NET 7.0
-			#xxx - Upgrade log4net library version from 2.0.13 to 2.0.15
+			#133 - Compatible with .NET 8.0
 		</PackageReleaseNotes>
 		<PackageProjectUrl>https://github.com/huorswords/Microsoft.Extensions.Logging.Log4Net.AspNetCore</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/huorswords/Microsoft.Extensions.Logging.Log4Net.AspNetCore</RepositoryUrl>
-		<Version>7.0.0</Version>
-		<AssemblyVersion>7.0.0.0</AssemblyVersion>
-		<FileVersion>7.0.0.0</FileVersion>
+		<Version>8.0.0</Version>
+		<AssemblyVersion>8.0.0.0</AssemblyVersion>
+		<FileVersion>8.0.0.0</FileVersion>
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile Condition="'$(Configuration)' == 'Release'">Microsoft.Extensions.Logging.Log4Net.AspNetCoreKey.snk</AssemblyOriginatorKeyFile>
 		<PackageLicenseExpression></PackageLicenseExpression>
@@ -38,8 +36,9 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="1.0.0" PrivateAssets="All" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+		<PackageReference Include="log4net" Version="2.0.15" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 		<PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
@@ -77,8 +76,11 @@
 		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
 	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="log4net" Version="2.0.15" />
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Include="..\..\LICENSE">

diff --git a/tests/Unit.Tests/Unit.Tests.csproj b/tests/Unit.Tests/Unit.Tests.csproj
@@ -6,7 +6,7 @@
       See: https://xunit.net/docs/why-no-netstandard
       See: https://docs.microsoft.com/en-us/dotnet/standard/net-standard
     -->
-		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net462;net47;net471;net472;net48;net481</TargetFrameworks>
+		<TargetFrameworks>netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net462;net47;net471;net472;net48;net481</TargetFrameworks>
 		<IsPackable>false</IsPackable>
 		<SignAssembly>false</SignAssembly>
 		<AssemblyOriginatorKeyFile>Microsoft.Extensions.Logging.Log4Net.AspNetCoreKey.snk</AssemblyOriginatorKeyFile>
@@ -49,7 +49,7 @@
 
 	<!-- .NET Framework versions contain no dot in the TFM. -->
 	<ItemGroup Condition="!'$(TargetFramework.Contains(`.`))'">
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework.Contains(`.`))'">
@@ -62,14 +62,14 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="xunit" Version="2.5.2" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
+		<PackageReference Include="xunit" Version="2.6.2" />
+		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
 		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="Moq" Version="4.20.69" />
+		<PackageReference Include="Moq" Version="4.20.70" />
 		<PackageReference Include="coverlet.msbuild" Version="6.0.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,8 @@ jobs: @@
             uses: actions/setup-dotnet@v1
             with:
               dotnet-version: |
+.0.x
+.0.x
 .0.x
 .0.x
 .1.x
@@ Expand Down @@