Skip to content

Commit 1644ed5

Browse files
cd21hcd21h
authored
Merge pull request #258 from alphacloud/release/8.1.0
Release 8.1.0
2 parents c5df96c + a2c0722 commit 1644ed5

File tree

7 files changed

+27
-21
lines changed

7 files changed

+27
-21
lines changed

‎.build/definitions.cake

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// TOOLS
77
#tool nuget:?package=GitReleaseManager&version=0.12.1
88
#tool nuget:?package=GitVersion.CommandLine&version=5.7.0
9-
#tool nuget:?package=coveralls.io&version=1.4.2
9+
#tool nuget:?package=coveralls.net&version=4.0.1
1010
#tool nuget:?package=OpenCover&version=4.7.1221
1111
#tool nuget:?package=ReportGenerator&version=4.8.13
1212

@@ -86,8 +86,11 @@ public class RepositoryInfo {
8686
return new RepositoryInfo {
8787
IsPullRequest = buildSystem.AppVeyor.Environment.PullRequest.IsPullRequest,
8888
IsDevelopBranch = StringComparer.OrdinalIgnoreCase.Equals("develop", buildSystem.AppVeyor.Environment.Repository.Branch),
89-
IsReleaseBranch = buildSystem.AppVeyor.Environment.Repository.Branch.IndexOf("releases/", StringComparison.OrdinalIgnoreCase) >= 0
90-
|| buildSystem.AppVeyor.Environment.Repository.Branch.IndexOf("hotfixes/", StringComparison.OrdinalIgnoreCase) >= 0,
89+
IsReleaseBranch = buildSystem.AppVeyor.Environment.Repository.Branch.IndexOf("release/", StringComparison.OrdinalIgnoreCase) >= 0
90+
|| buildSystem.AppVeyor.Environment.Repository.Branch.IndexOf("releases/", StringComparison.OrdinalIgnoreCase) >= 0
91+
|| buildSystem.AppVeyor.Environment.Repository.Branch.IndexOf("hotfix/", StringComparison.OrdinalIgnoreCase) >= 0
92+
|| buildSystem.AppVeyor.Environment.Repository.Branch.IndexOf("hotfixes/", StringComparison.OrdinalIgnoreCase) >= 0
93+
,
9194
IsTagged = buildSystem.AppVeyor.Environment.Repository.Tag.IsTag,
9295
IsMain = StringComparer.OrdinalIgnoreCase.Equals($"{settings.RepoOwner}/{settings.RepoName}", buildSystem.AppVeyor.Environment.Repository.Name),
9396
};

‎.build/tasks.cake

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,10 @@ Task("UploadCoverage")
144144
.WithCriteria<BuildInfo>((ctx, build) => !build.IsLocal)
145145
.Does<BuildInfo>(build =>
146146
{
147-
CoverallsIo(build.Paths.TestCoverageOutputFile);
147+
CoverallsNet(build.Paths.TestCoverageOutputFile, CoverallsNetReportType.OpenCover, new CoverallsNetSettings()
148+
{
149+
RepoTokenVariable = "COVERALLS_REPO_TOKEN"
150+
});
148151
});
149152

150153
Task("RunUnitTests")

‎appveyor.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ environment:
1414
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1515
# Disable sending usage data to Microsoft
1616
DOTNET_CLI_TELEMETRY_OPTOUT: true
17-
coveralls_repo_token:
18-
secure: PuEgFAkWtmyKy5qZYyYdJCSqdL6IZmGzm6fxQfKbOX0T63KQXMbON0azijNuQBC/
17+
COVERALLS_REPO_TOKEN:
18+
secure: lnqi85UfPll4Gyb1pKU4hktQa3UI+eg8F5aS/5uDj5Ja1vU7VW1ZGoeds2IPWB/m
1919
CAKE_SETTINGS_SKIPVERIFICATION: true
2020
GITHUB_TOKEN:
2121
secure: SakrMxbclSjNzFQxv8sA35OhulfvNm9VqHBEOgQrebPaF/Bv7AmZRsT8/YEfSQED
2222

2323
install:
2424
- ps: dotnet tool install Cake.Tool --version 1.3.0 --global
25-
- ps: ./dotnet-install.ps1 -Version 7.0.100-preview.4.22252.9 -InstallDir "C:\Program Files\dotnet"
25+
- ps: dotnet tool install coveralls.net --version 4.0.1 --global
2626

2727
build_script:
2828
- ps: dotnet cake

‎src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<PackageProjectUrl>https://github.com/alphacloud/Autofac.Extras.Quartz</PackageProjectUrl>
3434
<RepositoryType>git</RepositoryType>
3535
<PackageTags>alphacloud quartz autofac</PackageTags>
36-
<PackageReleaseNotes>https://github.com/alphacloud/Autofac.Extras.Quartz/milestone/26</PackageReleaseNotes>
36+
<PackageReleaseNotes>https://github.com/alphacloud/Autofac.Extras.Quartz/milestone/27</PackageReleaseNotes>
3737
<Authors>shatl</Authors>
3838
<Company>Alphacloud</Company>
3939
<Description>Quartz.Net integration</Description>

‎src/Lib/Autofac.Extras.Quartz/Autofac.Extras.Quartz.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
</ItemGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Autofac" Version="[6.4.0, 7.0.0)" />
23-
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
24-
<PackageReference Include="Quartz" Version="[3.4.0, 4.0.0)" />
22+
<PackageReference Include="Autofac" Version="[6.5.0, 7.0.0)" />
23+
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
24+
<PackageReference Include="Quartz" Version="[3.5.0, 4.0.0)" />
2525
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">
2626
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2727
<PrivateAssets>all</PrivateAssets>

‎src/Samples/Console/Console.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Autofac" Version="6.4.0" />
20-
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
21-
<PackageReference Include="Quartz" Version="3.4.0" />
22-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
19+
<PackageReference Include="Autofac" Version="6.5.0" />
20+
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
21+
<PackageReference Include="Quartz" Version="3.5.0" />
22+
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
2323
</ItemGroup>
2424

2525
<ItemGroup>

‎src/Tests/UnitTests/UnitTests.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
24-
<PackageReference Include="Autofac" Version="6.4.0" />
25-
<PackageReference Include="FluentAssertions" Version="6.7.0" />
26-
<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" />
27-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
28-
<PackageReference Include="Moq" Version="4.18.1" />
29-
<PackageReference Include="xunit" Version="2.4.1" />
24+
<PackageReference Include="Autofac" Version="6.5.0" />
25+
<PackageReference Include="FluentAssertions" Version="6.9.0" />
26+
<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
27+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
28+
<PackageReference Include="Moq" Version="4.18.4" />
29+
<PackageReference Include="xunit" Version="2.4.2" />
3030
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
3131
<PrivateAssets>all</PrivateAssets>
3232
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

0 commit comments

Comments
 (0)