Skip to content

Commit 194d995

Browse files
arcenoxarcenox
committed
fix the build of .net8
1 parent 9e04b46 commit 194d995

File tree

9 files changed

+48
-42
lines changed

9 files changed

+48
-42
lines changed

‎src/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<PackageIcon>icon.jpg</PackageIcon>
1010
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
1111
<Version>8.1.0-beta</Version>
12-
<DotNetVersion>[10.0.0,11.0.0)</DotNetVersion>
13-
<LangVersion>latest</LangVersion>
12+
<DotNetVersion>[8.0.0,9.0.0)</DotNetVersion>
13+
<LangVersion>default</LangVersion>
1414
</PropertyGroup>
1515

1616
<ItemGroup>

‎src/TickerQ.Dashboard/TickerQ.Dashboard.csproj‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3+
<OutputType>Library</OutputType>
4+
<IsPackable>true</IsPackable>
35
<PackageId>TickerQ.Dashboard</PackageId>
46
<Description>Dashboard UI for visualizing and monitoring TickerQ scheduled jobs, status, and system metrics.</Description>
57
<PackageTags>$(PackageTags);dashboard;monitoring;scheduler;status;job;ui</PackageTags>
68
<PackageReadmeFile>README.md</PackageReadmeFile>
9+
<Nullable>enable</Nullable>
710
</PropertyGroup>
811

12+
<ItemGroup>
13+
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
14+
<_Parameter1>TickerQ.Tests</_Parameter1>
15+
</AssemblyAttribute>
16+
</ItemGroup>
17+
918
<ItemGroup>
1019
<None Include="README.md" Pack="true" PackagePath="" />
1120
</ItemGroup>
@@ -26,5 +35,4 @@
2635
<None Remove="wwwroot\*" />
2736
<None Remove="wwwroot\public\*" />
2837
</ItemGroup>
29-
3038
</Project>

‎src/TickerQ.EntityFrameworkCore/Infrastructure/MappingExtensions.cs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -116,26 +116,18 @@ internal static Expression<Func<SetPropertyCalls<CronTickerOccurrenceEntity<TCro
116116
setExpression = ExpressionHelper.CombineSetters(setExpression,
117117
s => s.SetProperty(x => x.RetryCount, functionContext.RetryCount));
118118

119+
119120
if (propsToUpdate.Contains(nameof(InternalFunctionContext.ReleaseLock)))
120-
<<<<<<< HEAD
121121
setExpression = ExpressionHelper.CombineSetters(setExpression,
122122
s => s.SetProperty(x => x.LockHolder, (string)null)
123123
.SetProperty(x => x.LockedAt, (DateTime?)null));
124124

125-
return setExpression;
126-
=======
127-
{
128-
setters
129-
.SetProperty(x => x.LockHolder, (string)null)
130-
.SetProperty(x => x.LockedAt, (DateTime?)null);
131-
}
132-
133125
// EXECUTION TIME
134126
if (propsToUpdate.Contains(nameof(InternalFunctionContext.ExecutionTime)))
135-
{
136-
setters.SetProperty(x => x.ExecutionTime, functionContext.ExecutionTime);
137-
}
138-
>>>>>>> 298ca68 (fix update ExecutionTime for CronTickerOccurrence (#461))
127+
setExpression = ExpressionHelper.CombineSetters(setExpression,
128+
s => s.SetProperty(x => x.ExecutionTime, functionContext.ExecutionTime));
129+
130+
return setExpression;
139131
}
140132

141133
internal static Expression<Func<SetPropertyCalls<TTimeTicker>, SetPropertyCalls<TTimeTicker>>> UpdateTimeTicker<TTimeTicker>(InternalFunctionContext functionContext, DateTime updatedAt)

‎src/TickerQ.Instrumentation.OpenTelemetry/TickerQ.Instrumentation.OpenTelemetry.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<ItemGroup>
1212
<PackageReference Include="OpenTelemetry" Version="1.7.0" />
1313
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.7.0" />
14-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
14+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" />
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetVersion)" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/TickerQ.RemoteExecutor/TickerQ.RemoteExecutor.csproj‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<IsPackable>true</IsPackable>
46
<ImplicitUsings>enable</ImplicitUsings>
57
<Nullable>enable</Nullable>
68
<PackageId>TickerQ.RemoteExecutor</PackageId>
@@ -12,5 +14,4 @@
1214
<ItemGroup>
1315
<PackageReference Include="TickerQ.Utilities" Version="$(Version)" />
1416
</ItemGroup>
15-
16-
</Project>
17+
</Project>

‎src/TickerQ.SDK/TickerQ.SDK.csproj‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4+
<OutputType>Library</OutputType>
5+
<IsPackable>true</IsPackable>
46
<ImplicitUsings>enable</ImplicitUsings>
57
<AssemblyName>TickerQ.SDK</AssemblyName>
68
<PackageId>TickerQ.SDK</PackageId>
@@ -13,4 +15,4 @@
1315
<PackageReference Include="TickerQ.Utilities" Version="$(Version)" />
1416
</ItemGroup>
1517

16-
</Project>
18+
</Project>

‎src/TickerQ.Utilities/TickerQ.Utilities.csproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11

22
<Project Sdk="Microsoft.NET.Sdk">
33

4-
<PropertyGroup>
5-
<PackageId>TickerQ.Utilities</PackageId>
4+
<PropertyGroup>
5+
<PackageId>TickerQ.Utilities</PackageId>
66
<Description>Simple utilities for queuing and executing cron/time-based jobs in the background.</Description>
7-
<PackageReadmeFile>README.md</PackageReadmeFile>
8-
</PropertyGroup>
7+
<PackageReadmeFile>README.md</PackageReadmeFile>
8+
</PropertyGroup>
99

10-
<ItemGroup>
11-
<None Include="README.md" Pack="true" PackagePath="" />
12-
</ItemGroup>
10+
<ItemGroup>
11+
<None Include="README.md" Pack="true" PackagePath="" />
12+
</ItemGroup>
1313

14-
<ItemGroup>
15-
<FrameworkReference Include="Microsoft.AspNetCore.App" />
16-
</ItemGroup>
17-
18-
<ItemGroup>
14+
<ItemGroup>
15+
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetVersion)" />
16+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetVersion)" />
17+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(DotNetVersion)" />
18+
<PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="$(DotNetVersion)" />
19+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(DotNetVersion)" />
1920
<PackageReference Include="NCrontab" Version="[3.3.0,)" />
20-
</ItemGroup>
21-
21+
</ItemGroup>
2222
</Project>

‎src/TickerQ/TickerQ.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<Description>A lightweight, developer-friendly library for queuing and executing cron and time-based jobs in the background.</Description>
55
<PackageTags>$(PackageTags);background-jobs;task-scheduling</PackageTags>
66
<PackageId>TickerQ</PackageId>
7+
<LangVersion>latest</LangVersion>
78
<PackageReadmeFile>README.md</PackageReadmeFile>
89
</PropertyGroup>
910

@@ -13,6 +14,7 @@
1314

1415
<ItemGroup>
1516
<PackageReference Include="TickerQ.Utilities" Version="$(Version)" />
17+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="$(DotNetVersion)" />
1618
</ItemGroup>
1719

1820
<Target Name="CopyAnalyzer" AfterTargets="Build">
@@ -24,5 +26,4 @@
2426
Pack="true"
2527
PackagePath="analyzers/dotnet/cs" />
2628
</ItemGroup>
27-
2829
</Project>

‎tests/TickerQ.Tests/TickerQ.Tests.csproj‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net9.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<IsPackable>false</IsPackable>
@@ -10,6 +10,7 @@
1010
<ItemGroup>
1111
<PackageReference Include="coverlet.collector" Version="6.0.4" />
1212
<PackageReference Include="FluentAssertions" Version="8.4.0" />
13+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
1314
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1415
<PackageReference Include="NSubstitute" Version="5.3.0" />
1516
<PackageReference Include="xunit" Version="2.9.3" />
@@ -21,8 +22,9 @@
2122
</ItemGroup>
2223

2324
<ItemGroup>
24-
<ProjectReference Include="..\..\src\TickerQ.Utilities\TickerQ.Utilities.csproj" />
25-
<ProjectReference Include="..\..\src\TickerQ\TickerQ.csproj" />
25+
<ProjectReference Include="..\..\src\TickerQ.Dashboard\TickerQ.Dashboard.csproj" />
26+
<ProjectReference Include="..\..\src\TickerQ.Utilities\TickerQ.Utilities.csproj" />
27+
<ProjectReference Include="..\..\src\TickerQ\TickerQ.csproj" />
2628
</ItemGroup>
2729

2830
</Project>

0 commit comments

Comments
 (0)