Skip to content
This repository was archived by the owner on Jan 24, 2025. It is now read-only.

Commit 62761f5

Browse files
brockallenbrockallen
authored
Merge pull request #151 from DuendeSoftware/dom/move-dependencies-to-target-file
Move all dependencies to .targets file
2 parents 1ca3bff + 3905582 commit 62761f5

File tree

8 files changed

+75
-30
lines changed

8 files changed

+75
-30
lines changed

‎.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ jobs:
3434
with:
3535
dotnet-version: |
3636
6.0.x
37+
7.0.100-rc.2.22477.23
3738
3839
- run: dotnet --info
3940

‎Directory.Build.targets

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<Project>
2+
3+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0'">
4+
<FrameworkVersionRuntime>6.0.0</FrameworkVersionRuntime>
5+
<FrameworkVersionTesting>6.0.0</FrameworkVersionTesting>
6+
<YarpVersion>1.0.1</YarpVersion>
7+
</PropertyGroup>
8+
9+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0'">
10+
<FrameworkVersionRuntime>7.0.0-rc.2.*</FrameworkVersionRuntime>
11+
<FrameworkVersionTesting>7.0.0-rc.2.*</FrameworkVersionTesting>
12+
<YarpVersion>1.0.1</YarpVersion>
13+
</PropertyGroup>
14+
15+
<ItemGroup>
16+
<!-- build -->
17+
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
18+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
19+
20+
<!-- runtime -->
21+
<PackageReference Update="Duende.AccessTokenManagement.OpenIdConnect" Version="1.0.0" />
22+
<PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(FrameworkVersionRuntime)" />
23+
<PackageReference Update="Yarp.ReverseProxy" Version="$(YarpVersion)" />
24+
25+
<!-- testing -->
26+
<PackageReference Update="Microsoft.EntityFrameworkCore.InMemory" Version="$(FrameworkVersionTesting)" />
27+
<PackageReference Update="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(FrameworkVersionTesting)" />
28+
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="$(FrameworkVersionTesting)" />
29+
30+
<PackageReference Update="Duende.IdentityServer" Version="6.1.5" />
31+
32+
<PackageReference Update="CsQuery.NETStandard" Version="1.3.6.1" />
33+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.1" />
34+
<PackageReference Update="xunit" Version="2.4.2" />
35+
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5">
36+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
37+
<PrivateAssets>all</PrivateAssets>
38+
</PackageReference>
39+
<PackageReference Update="FluentAssertions" Version="6.7.0" />
40+
<PackageReference Update="coverlet.collector" Version="3.1.2">
41+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
42+
<PrivateAssets>all</PrivateAssets>
43+
</PackageReference>
44+
</ItemGroup>
45+
46+
<Target Name="SetAssemblyVersion" AfterTargets="MinVer">
47+
<PropertyGroup>
48+
<AssemblyVersion>$(MinVerMajor).$(MinVerMinor).$(MinVerPatch).0</AssemblyVersion>
49+
</PropertyGroup>
50+
</Target>
51+
</Project>

‎global.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"sdk": {
3-
"version": "6.0.100",
3+
"version": "7.0.100-rc.2.22477.23",
44
"rollForward": "latestMajor",
5-
"allowPrerelease": false
5+
"allowPrerelease": true
66
}
77
}

‎src/Duende.Bff.EntityFramework/Duende.Bff.EntityFramework.csproj

+2-4
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
14-
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
15-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
16-
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
14+
1715
<ProjectReference Include="..\Duende.Bff\Duende.Bff.csproj" />
1816
</ItemGroup>
1917
</Project>

‎src/Duende.Bff.Yarp/Duende.Bff.Yarp.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Yarp.ReverseProxy" Version="1.0.1" />
15-
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
16-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
14+
<PackageReference Include="Yarp.ReverseProxy" />
1715
</ItemGroup>
1816

1917
<ItemGroup>

‎src/Duende.Bff/Duende.Bff.csproj

+1-4
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@
1313
<ItemGroup>
1414
<FrameworkReference Include="Microsoft.AspNetCore.App" />
1515

16-
<PackageReference Include="MinVer" Version="4.2.0" PrivateAssets="all" />
17-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
18-
19-
<PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" Version="1.0.0" />
16+
<PackageReference Include="Duende.AccessTokenManagement.OpenIdConnect" />
2017
</ItemGroup>
2118
</Project>

‎test/Duende.Bff.EntityFramework.Tests/Duende.Bff.EntityFramework.Tests.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
44
</PropertyGroup>
55

66
<ItemGroup>
7-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
8-
<PackageReference Include="xunit" Version="2.4.2" />
9-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
7+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
8+
<PackageReference Include="xunit" />
9+
<PackageReference Include="xunit.runner.visualstudio">
1010
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1111
<PrivateAssets>all</PrivateAssets>
1212
</PackageReference>
13-
<PackageReference Include="FluentAssertions" Version="6.7.0" />
14-
<PackageReference Include="coverlet.collector" Version="3.1.2">
13+
<PackageReference Include="FluentAssertions" />
14+
<PackageReference Include="coverlet.collector">
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
<PrivateAssets>all</PrivateAssets>
1717
</PackageReference>
1818

19-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.9" />
19+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎test/Duende.Bff.Tests/Duende.Bff.Tests.csproj

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
55
</PropertyGroup>
66

77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
10-
<PackageReference Include="xunit" Version="2.4.2" />
11-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
9+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
10+
<PackageReference Include="xunit" />
11+
<PackageReference Include="xunit.runner.visualstudio">
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
<PrivateAssets>all</PrivateAssets>
1414
</PackageReference>
15-
<PackageReference Include="FluentAssertions" Version="6.7.0" />
16-
<PackageReference Include="coverlet.collector" Version="3.1.2">
15+
<PackageReference Include="FluentAssertions" />
16+
<PackageReference Include="coverlet.collector">
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
<PrivateAssets>all</PrivateAssets>
1919
</PackageReference>
20-
<PackageReference Include="CsQuery.NETStandard" Version="1.3.6.1" />
20+
<PackageReference Include="CsQuery.NETStandard" />
2121

22-
<PackageReference Include="Duende.IdentityServer" Version="6.1.5" />
23-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.9" />
24-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="6.0.9" />
22+
<PackageReference Include="Duende.IdentityServer" />
23+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" />
24+
<PackageReference Include="Microsoft.AspNetCore.TestHost" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

0 commit comments

Comments
 (0)