Merge pull request #207 from alphacloud/releases/7.3.0

Release 7.3.0
alphacloud · Oct 28, 2021 · b0d4cf7 · b0d4cf7
2 parents 1d3debc + 7916cb8
commit b0d4cf7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 16 deletions.
diff --git a/.build/definitions.cake b/.build/definitions.cake
@@ -1,21 +1,21 @@
 // ADDINS
-#addin nuget:?package=Cake.Coveralls&version=1.0.1
+#addin nuget:?package=Cake.Coveralls&version=1.1.0
 #addin nuget:?package=Cake.FileHelpers&version=4.0.1
 #addin nuget:?package=Cake.AppVeyor&version=5.0.1
 
 // TOOLS
-#tool nuget:?package=GitReleaseManager&version=0.11.0
-#tool nuget:?package=GitVersion.CommandLine&version=5.6.8
+#tool nuget:?package=GitReleaseManager&version=0.12.1
+#tool nuget:?package=GitVersion.CommandLine&version=5.7.0
 #tool nuget:?package=coveralls.io&version=1.4.2
-#tool nuget:?package=OpenCover&version=4.7.922
-#tool nuget:?package=ReportGenerator&version=4.8.8
+#tool nuget:?package=OpenCover&version=4.7.1221
+#tool nuget:?package=ReportGenerator&version=4.8.13
 
 
 public class CodeCoverageSettings
 {
     public string ExcludeByFile { get; set; } = "*/*Designer.cs";
     public string ExcludeByAttribute { get; set; } = "*.ExcludeFromCodeCoverage*";
-    public string ExcludeFilter { get; set; } = "-[Tests*]*";
+    public string ExcludeFilter { get; set; } = "-[Tests*]*;-[*]Microsoft.CodeAnalysis*;-[*]System.Runtime.CompilerServices.*";
     public string IncludeFilter { get; set; }
 }
 

diff --git a/appveyor.yml b/appveyor.yml
@@ -21,8 +21,8 @@ environment:
     secure: SakrMxbclSjNzFQxv8sA35OhulfvNm9VqHBEOgQrebPaF/Bv7AmZRsT8/YEfSQED
 
 install:
-  - ps: ./dotnet-install.ps1 -Version 6.0.100-preview.6.21355.2 -InstallDir "C:\Program Files\dotnet"
-  - ps: dotnet tool install Cake.Tool --version 1.1.0 --global
+  - ps: ./dotnet-install.ps1 -Version 6.0.100-rc.2.21505.57 -InstallDir "C:\Program Files\dotnet"
+  - ps: dotnet tool install Cake.Tool --version 1.3.0 --global
 
 build_script:
   - ps: dotnet cake

diff --git a/src/Autofac.Extras.Quartz/Autofac.Extras.Quartz.csproj b/src/Autofac.Extras.Quartz/Autofac.Extras.Quartz.csproj
@@ -19,10 +19,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="[6.2.0, 7.0.0)" />
+    <PackageReference Include="Autofac" Version="[6.3.0, 7.0.0)" />
     <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="Quartz" Version="[3.3.3, 4.0.0)" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
 
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup Label="Common">
     <LibraryTargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0</LibraryTargetFrameworks>
-    <ApplicationTargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0;net6.0</ApplicationTargetFrameworks>
+    <ApplicationTargetFrameworks>netcoreapp3.1;net5.0;net6.0</ApplicationTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Label="Build">
@@ -32,7 +32,7 @@
     <PackageProjectUrl>https://github.com/alphacloud/Autofac.Extras.Quartz</PackageProjectUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>alphacloud quartz autofac</PackageTags>
-    <PackageReleaseNotes>https://github.com/alphacloud/Autofac.Extras.Quartz/milestone/23</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/alphacloud/Autofac.Extras.Quartz/milestone/24</PackageReleaseNotes>
     <Authors>shatl</Authors>
     <Company>Alphacloud</Company>
     <Description>Quartz.Net integration</Description>

diff --git a/src/Samples/Console/Console.csproj b/src/Samples/Console/Console.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="6.2.0" />
+    <PackageReference Include="Autofac" Version="6.3.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
     <PackageReference Include="Quartz" Version="3.3.3" />
     <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />

diff --git a/src/Tests/UnitTests/UnitTests.csproj b/src/Tests/UnitTests/UnitTests.csproj
@@ -21,10 +21,10 @@
 
   <ItemGroup>
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Autofac" Version="6.2.0" />
-    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+    <PackageReference Include="Autofac" Version="6.3.0" />
+    <PackageReference Include="FluentAssertions" Version="6.2.0" />
     <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">