Skip to content

Commit bdbff16

Browse files
hhvrchhvrc
committed
Seperate framework from shared props
1 parent a8a1e83 commit bdbff16

File tree

9 files changed

+186
-174
lines changed

9 files changed

+186
-174
lines changed

‎API.IntegrationTests/API.IntegrationTests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="../Framework.props" />
23
<Import Project="../Shared.props" />
34

45
<PropertyGroup>

‎API/API.csproj‎

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,50 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<Import Project="../Shared.props" />
2+
<Import Project="../Framework.props" />
3+
<Import Project="../Shared.props" />
34

4-
<PropertyGroup>
5-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6-
</PropertyGroup>
5+
<PropertyGroup>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7+
</PropertyGroup>
78

8-
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
9-
<NoWarn>1701;1702;IL2121;1591</NoWarn>
10-
</PropertyGroup>
9+
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
10+
<NoWarn>1701;1702;IL2121;1591</NoWarn>
11+
</PropertyGroup>
1112

12-
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
13-
<NoWarn>1701;1702;IL2121;1591</NoWarn>
14-
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
14+
<NoWarn>1701;1702;IL2121;1591</NoWarn>
15+
</PropertyGroup>
1516

16-
<ItemGroup>
17-
<PackageReference Include="Fluid.Core" Version="2.24.0" />
18-
<PackageReference Include="MailKit" Version="4.12.0" />
19-
</ItemGroup>
17+
<ItemGroup>
18+
<PackageReference Include="Fluid.Core" Version="2.24.0" />
19+
<PackageReference Include="MailKit" Version="4.12.0" />
20+
</ItemGroup>
2021

21-
<Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
22-
<Exec Command="git rev-parse HEAD" IgnoreExitCode="False">
23-
<Output PropertyName="SourceRevisionId" TaskParameter="ConsoleOutput" />
24-
</Exec>
25-
</Target>
22+
<Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
23+
<Exec Command="git rev-parse HEAD" IgnoreExitCode="False">
24+
<Output PropertyName="SourceRevisionId" TaskParameter="ConsoleOutput" />
25+
</Exec>
26+
</Target>
2627

27-
<Target Name="SetHash" AfterTargets="InitializeSourceControlInformation">
28-
<ItemGroup>
29-
<AssemblyAttribute Include="OpenShock.Common.Utils.GitHashAttribute">
30-
<_Parameter1>$(SourceRevisionId)</_Parameter1>
31-
</AssemblyAttribute>
32-
</ItemGroup>
33-
</Target>
34-
28+
<Target Name="SetHash" AfterTargets="InitializeSourceControlInformation">
3529
<ItemGroup>
36-
<ProjectReference Include="..\Common\Common.csproj" />
37-
<None Include="devcert.pfx" CopyToPublishDirectory="Always" />
38-
<None Update="SmtpTemplates\PasswordReset.liquid">
39-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
40-
</None>
41-
<None Update="SmtpTemplates\EmailVerification.liquid">
42-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
43-
</None>
30+
<AssemblyAttribute Include="OpenShock.Common.Utils.GitHashAttribute">
31+
<_Parameter1>$(SourceRevisionId)</_Parameter1>
32+
</AssemblyAttribute>
4433
</ItemGroup>
34+
</Target>
35+
36+
<ItemGroup>
37+
<ProjectReference Include="..\Common\Common.csproj" />
38+
<None Include="devcert.pfx" CopyToPublishDirectory="Always" />
39+
<None Update="SmtpTemplates\PasswordReset.liquid">
40+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
41+
</None>
42+
<None Update="SmtpTemplates\EmailVerification.liquid">
43+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
44+
</None>
45+
</ItemGroup>
4546

46-
<ItemGroup>
47-
<InternalsVisibleTo Include="$(AssemblyName).Tests.Integration" />
48-
</ItemGroup>
47+
<ItemGroup>
48+
<InternalsVisibleTo Include="$(AssemblyName).Tests.Integration" />
49+
</ItemGroup>
4950
</Project>

‎Common.Tests/Common.Tests.csproj‎

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../Shared.props" />
2+
<Import Project="../Framework.props" />
3+
<Import Project="../Shared.props" />
34

4-
<ItemGroup>
5-
<PackageReference Include="Testcontainers.PostgreSql" Version="4.4.0" />
6-
<PackageReference Include="Testcontainers.Redis" Version="4.4.0" />
7-
<PackageReference Include="Bogus" Version="35.6.3" />
8-
<PackageReference Include="TUnit" Version="0.19.116" />
9-
</ItemGroup>
5+
<ItemGroup>
6+
<PackageReference Include="Testcontainers.PostgreSql" Version="4.4.0" />
7+
<PackageReference Include="Testcontainers.Redis" Version="4.4.0" />
8+
<PackageReference Include="Bogus" Version="35.6.3" />
9+
<PackageReference Include="TUnit" Version="0.19.116" />
10+
</ItemGroup>
1011

11-
<ItemGroup>
12-
<ProjectReference Include="..\Common\Common.csproj" />
13-
</ItemGroup>
12+
<ItemGroup>
13+
<ProjectReference Include="..\Common\Common.csproj" />
14+
</ItemGroup>
1415

15-
<ItemGroup>
16-
<None Update="Validation\DataSets\BlackList.txt">
17-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
18-
</None>
19-
<None Update="Validation\DataSets\WhiteList.txt">
20-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
21-
</None>
22-
</ItemGroup>
16+
<ItemGroup>
17+
<None Update="Validation\DataSets\BlackList.txt">
18+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
19+
</None>
20+
<None Update="Validation\DataSets\WhiteList.txt">
21+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
22+
</None>
23+
</ItemGroup>
2324
</Project>

‎Common/Common.csproj‎

Lines changed: 33 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,37 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<Import Project="../Shared.props" />
2+
<Import Project="../Framework.props" />
3+
<Import Project="../Shared.props" />
34

4-
<PropertyGroup>
5-
<OutputType>Library</OutputType>
6-
</PropertyGroup>
5+
<PropertyGroup>
6+
<OutputType>Library</OutputType>
7+
</PropertyGroup>
78

8-
<ItemGroup>
9-
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
10-
<PackageReference Include="IDisposableAnalyzers" Version="4.0.8">
11-
<PrivateAssets>all</PrivateAssets>
12-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13-
</PackageReference>
14-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
16-
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
17-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
18-
<PackageReference Include="NRedisStack" Version="1.0.0" />
19-
<PackageReference Include="OpenShock.Serialization.Flatbuffers" Version="2.0.0-preview.5" />
20-
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.11.2-beta.1" />
21-
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
22-
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
23-
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
24-
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
25-
<PackageReference Include="Redis.OM" Version="1.0.0" />
26-
<PackageReference Include="Scalar.AspNetCore" Version="2.2.7" />
27-
<PackageReference Include="Semver" Version="3.0.0" />
28-
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
29-
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
30-
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.4" />
31-
<PackageReference Include="OneOf" Version="3.0.271" />
32-
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
33-
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="8.1.1" />
34-
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="9.103.8" />
35-
</ItemGroup>
9+
<ItemGroup>
10+
<PackageReference Include="BCrypt.Net-Next" Version="4.0.3" />
11+
<PackageReference Include="IDisposableAnalyzers" Version="4.0.8">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
</PackageReference>
15+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.4" />
17+
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
18+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
19+
<PackageReference Include="NRedisStack" Version="1.0.0" />
20+
<PackageReference Include="OpenShock.Serialization.Flatbuffers" Version="2.0.0-preview.5" />
21+
<PackageReference Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.11.2-beta.1" />
22+
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" />
23+
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
24+
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
25+
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
26+
<PackageReference Include="Redis.OM" Version="1.0.0" />
27+
<PackageReference Include="Scalar.AspNetCore" Version="2.2.7" />
28+
<PackageReference Include="Semver" Version="3.0.0" />
29+
<PackageReference Include="Serilog.Sinks.Grafana.Loki" Version="8.3.0" />
30+
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
31+
<PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="9.0.4" />
32+
<PackageReference Include="OneOf" Version="3.0.271" />
33+
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
34+
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="8.1.1" />
35+
<PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="9.103.8" />
36+
</ItemGroup>
3637
</Project>

‎Cron/Cron.csproj‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<Import Project="../Shared.props" />
2+
<Import Project="../Framework.props" />
3+
<Import Project="../Shared.props" />
34

4-
<ItemGroup>
5-
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.18" />
6-
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.12" />
7-
</ItemGroup>
5+
<ItemGroup>
6+
<PackageReference Include="Hangfire.AspNetCore" Version="1.8.18" />
7+
<PackageReference Include="Hangfire.PostgreSql" Version="1.20.12" />
8+
</ItemGroup>
89

9-
<ItemGroup>
10-
<ProjectReference Include="..\Common\Common.csproj" />
11-
</ItemGroup>
10+
<ItemGroup>
11+
<ProjectReference Include="..\Common\Common.csproj" />
12+
</ItemGroup>
1213

13-
<ItemGroup>
14-
<None Update="devcert.pfx">
15-
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
16-
</None>
17-
</ItemGroup>
14+
<ItemGroup>
15+
<None Update="devcert.pfx">
16+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
17+
</None>
18+
</ItemGroup>
1819
</Project>

‎Framework.props‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<PropertyGroup>
3+
<TargetFramework>net9.0</TargetFramework>
4+
</PropertyGroup>
5+
</Project>

‎LiveControlGateway/LiveControlGateway.csproj‎

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
2-
<Import Project="../Shared.props" />
3-
4-
<PropertyGroup>
5-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6-
</PropertyGroup>
2+
<Import Project="../Framework.props" />
3+
<Import Project="../Shared.props" />
4+
5+
<PropertyGroup>
6+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
7+
</PropertyGroup>
78

8-
<Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
9-
<Exec Command="git rev-parse HEAD" IgnoreExitCode="False">
10-
<Output PropertyName="SourceRevisionId" TaskParameter="ConsoleOutput" />
11-
</Exec>
12-
</Target>
9+
<Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
10+
<Exec Command="git rev-parse HEAD" IgnoreExitCode="False">
11+
<Output PropertyName="SourceRevisionId" TaskParameter="ConsoleOutput" />
12+
</Exec>
13+
</Target>
1314

14-
<Target Name="SetHash" AfterTargets="InitializeSourceControlInformation">
15-
<ItemGroup>
16-
<AssemblyAttribute Include="OpenShock.Common.Utils.GitHashAttribute">
17-
<_Parameter1>$(SourceRevisionId)</_Parameter1>
18-
</AssemblyAttribute>
19-
</ItemGroup>
20-
</Target>
21-
15+
<Target Name="SetHash" AfterTargets="InitializeSourceControlInformation">
2216
<ItemGroup>
23-
<ProjectReference Include="..\Common\Common.csproj" />
24-
<FlatSharpSchema Include="Serialization\**\*.fbs" />
17+
<AssemblyAttribute Include="OpenShock.Common.Utils.GitHashAttribute">
18+
<_Parameter1>$(SourceRevisionId)</_Parameter1>
19+
</AssemblyAttribute>
2520
</ItemGroup>
21+
</Target>
22+
23+
<ItemGroup>
24+
<ProjectReference Include="..\Common\Common.csproj" />
25+
<FlatSharpSchema Include="Serialization\**\*.fbs" />
26+
</ItemGroup>
2627

27-
<ItemGroup>
28-
<None Update="devcert.pfx">
29-
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
30-
</None>
31-
</ItemGroup>
28+
<ItemGroup>
29+
<None Update="devcert.pfx">
30+
<CopyToPublishDirectory>Always</CopyToPublishDirectory>
31+
</None>
32+
</ItemGroup>
3233
</Project>

‎MigrationHelper/MigrationHelper.csproj‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<Import Project="../Shared.props" />
2+
<Import Project="../Framework.props" />
3+
<Import Project="../Shared.props" />
34

4-
<PropertyGroup>
5-
<OutputType>Exe</OutputType>
6-
</PropertyGroup>
5+
<PropertyGroup>
6+
<OutputType>Exe</OutputType>
7+
</PropertyGroup>
78

8-
<ItemGroup>
9-
<ProjectReference Include="..\Common\Common.csproj" />
10-
</ItemGroup>
9+
<ItemGroup>
10+
<ProjectReference Include="..\Common\Common.csproj" />
11+
</ItemGroup>
1112

12-
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
14-
<PrivateAssets>all</PrivateAssets>
15-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16-
</PackageReference>
17-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
</PackageReference>
21-
</ItemGroup>
13+
<ItemGroup>
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
15+
<PrivateAssets>all</PrivateAssets>
16+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
17+
</PackageReference>
18+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.4">
19+
<PrivateAssets>all</PrivateAssets>
20+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
21+
</PackageReference>
22+
</ItemGroup>
2223
</Project>

0 commit comments

Comments
 (0)