Skip to content

Commit 6bff7bd

Browse files
authored
Merge pull request #56 from Linq2GraphQL/fix-cpm
Switch to central package management with Directory.Packages.props
2 parents 1cb841f + 0df2736 commit 6bff7bd

24 files changed

+414
-465
lines changed

Directory.Build.props

Lines changed: 0 additions & 9 deletions
This file was deleted.

Directory.Packages.props

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<GlobalPackageReference Include="Nerdbank.GitVersioning" Version="3.7.115"/>
7+
</ItemGroup>
8+
<ItemGroup>
9+
<PackageVersion Include="BlazorMonaco" Version="3.3.0"/>
10+
<PackageVersion Include="ColorCode.HTML" Version="2.0.15"/>
11+
<PackageVersion Include="coverlet.collector" Version="6.0.4">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
</PackageVersion>
15+
<PackageVersion Include="HotChocolate.AspNetCore" Version="13.9.12"/>
16+
<PackageVersion Include="HotChocolate.Data" Version="13.9.12"/>
17+
<PackageVersion Include="HotChocolate.Types.Scalars" Version="13.9.12"/>
18+
<PackageVersion Include="Macross.Json.Extensions" Version="3.0.0"/>
19+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8"/>
20+
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8"/>
21+
<PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8"/>
22+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1"/>
23+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0"/>
24+
<PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1"/>
25+
<PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1"/>
26+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1"/>
27+
<PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1"/>
28+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="8.0.1"/>
29+
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1"/>
30+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0"/>
31+
<PackageVersion Include="Shouldly" Version="4.3.0"/>
32+
<PackageVersion Include="System.CodeDom" Version="8.0.0"/>
33+
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1"/>
34+
<PackageVersion Include="System.Text.Json" Version="8.0.5"/>
35+
<PackageVersion Include="TabBlazor" Version="0.8.1.1-alpha"/>
36+
<PackageVersion Include="Websocket.Client" Version="5.1.2"/>
37+
<PackageVersion Include="xunit" Version="2.9.3"/>
38+
<PackageVersion Include="xunit.runner.visualstudio" Version="3.0.2">
39+
<PrivateAssets>all</PrivateAssets>
40+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
41+
</PackageVersion>
42+
</ItemGroup>
43+
</Project>

Linq2GraphQL.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".items", ".items", "{7A8567FE-C13A-434E-AFA6-5A8F55F2C6B5}"
99
ProjectSection(SolutionItems) = preProject
1010
.gitignore = .gitignore
11-
Directory.Build.props = Directory.Build.props
1211
nuget.config = nuget.config
1312
README.md = README.md
1413
version.json = version.json
14+
Directory.Packages.props = Directory.Packages.props
1515
EndProjectSection
1616
EndProject
1717
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Linq2GraphQL.TestServer", "test\Linq2GraphQL.TestServer\Linq2GraphQL.TestServer.csproj", "{AD8291B6-5979-4C43-B785-EAD4FF93C564}"

docs/Linq2GraphQL.Docs/Linq2GraphQL.Docs.csproj

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

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -11,12 +11,12 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="System.Text.Json" Version="8.0.4" />
15-
<PackageReference Include="BlazorMonaco" Version="3.2.0" />
16-
<PackageReference Include="ColorCode.HTML" Version="2.0.15" />
17-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="8.0.8" />
18-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="8.0.8" PrivateAssets="all" />
19-
<PackageReference Include="TabBlazor" Version="0.8.1.1-alpha" />
14+
<PackageReference Include="System.Text.Json" />
15+
<PackageReference Include="BlazorMonaco" />
16+
<PackageReference Include="ColorCode.HTML" />
17+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" />
18+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" PrivateAssets="all" />
19+
<PackageReference Include="TabBlazor" />
2020
</ItemGroup>
2121

2222
<ItemGroup>
@@ -27,7 +27,7 @@
2727
<Target Name="BuildClientAssets" AfterTargets="ComputeFilesToPublish">
2828
<ItemGroup>
2929
<DistFiles Include="Components\Samples\**\*.razor.cs" />
30-
<ResolvedFileToPublish Include="@(DistFiles->'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
30+
<ResolvedFileToPublish Include="@(DistFiles-&gt;'%(FullPath)')" Exclude="@(ResolvedFileToPublish)">
3131
<RelativePath>wwwroot\_content\razor_samples\%(DistFiles.RecursiveDir)%(DistFiles.Filename)%(DistFiles.Extension)</RelativePath>
3232
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
3333
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>

src/Linq2GraphQL.Client.Subscriptions/Linq2GraphQL.Client.Subscriptions.csproj

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

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -20,7 +20,7 @@
2020
</ItemGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="Websocket.Client" Version="5.1.2" />
23+
<PackageReference Include="Websocket.Client" />
2424
</ItemGroup>
2525

2626
</Project>

src/Linq2GraphQL.Client/Linq2GraphQL.Client.csproj

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

33
<PropertyGroup>
44
<TargetFramework>net8.0</TargetFramework>
@@ -15,8 +15,8 @@
1515
</PropertyGroup>
1616

1717
<ItemGroup>
18-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="8.0.0" />
19-
<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
18+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
19+
<PackageReference Include="Microsoft.Extensions.Http" />
2020
</ItemGroup>
2121

2222
</Project>

src/Linq2GraphQL.Generator/Linq2GraphQL.Generator.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -20,9 +20,9 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<PackageReference Include="System.CodeDom" Version="8.0.0" />
24-
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
25-
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
23+
<PackageReference Include="System.CodeDom" />
24+
<PackageReference Include="System.CommandLine" />
25+
<PackageReference Include="Macross.Json.Extensions" />
2626
</ItemGroup>
2727

2828
<ItemGroup>

test/Linq2GraphQL.Console/Linq2GraphQL.Console.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -7,14 +7,14 @@
77

88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="System.Text.Json" Version="8.0.4" />
11-
<PackageReference Include="Websocket.Client" Version="5.1.2" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
13-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
14-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
15-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
16-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
17-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
10+
<PackageReference Include="System.Text.Json" />
11+
<PackageReference Include="Websocket.Client" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" />
13+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" />
14+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
15+
<PackageReference Include="Microsoft.Extensions.Configuration" />
16+
<PackageReference Include="Microsoft.Extensions.Logging" />
17+
<PackageReference Include="Microsoft.Extensions.Logging.Console" />
1818
</ItemGroup>
1919
<ItemGroup>
2020
<ProjectReference Include="..\..\docs\StarWars.Client\StarWars.Client.csproj" />

test/Linq2GraphQL.TestServer.Shared/Linq2GraphQL.TestServer.Shared.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="System.Text.Json" Version="8.0.4" />
11-
<PackageReference Include="HotChocolate.AspNetCore" Version="13.9.12" />
12-
<PackageReference Include="HotChocolate.Data" Version="13.9.12" />
10+
<PackageReference Include="System.Text.Json" />
11+
<PackageReference Include="HotChocolate.AspNetCore" />
12+
<PackageReference Include="HotChocolate.Data" />
1313
</ItemGroup>
1414

1515
</Project>

test/Linq2GraphQL.TestServer/Linq2GraphQL.TestServer.csproj

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
@@ -8,9 +8,9 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="System.Text.Json" Version="8.0.4" />
12-
<PackageReference Include="HotChocolate.AspNetCore" Version="13.9.12" />
13-
<PackageReference Include="HotChocolate.Data" Version="13.9.12" />
11+
<PackageReference Include="System.Text.Json" />
12+
<PackageReference Include="HotChocolate.AspNetCore" />
13+
<PackageReference Include="HotChocolate.Data" />
1414
</ItemGroup>
1515

1616
<ItemGroup>

0 commit comments

Comments
 (0)