Skip to content

Commit 7748bc3

Browse files
michaelstaibmichaelstaib
authoredNov 11, 2021
Rework Packaging Build Scripts (#4406)
·
16.0.0-p.112.2.0-preview.21
1 parent 20dbae3 commit 7748bc3

30 files changed

+117
-78
lines changed
 

‎LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 ChilliCream (Michael & Rafael Staib)
3+
Copyright (c) 2021 ChilliCream Inc. (Michael & Rafael Staib)
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎init.cmd

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
#!/usr/bin/env bash
2-
31
cd website
42
yarn
53
cd ..
6-
./build.sh restore
4+
./build.cmd restore

‎src/Directory.Build.props

+17-5
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,22 @@
66
<NoWarn>$(NoWarn);CS0436;RS0026;RS0027;RS0041</NoWarn>
77
</PropertyGroup>
88

9+
<PropertyGroup Condition="'$(Configuration)' == 'Release'">
10+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
11+
<NoWarn>$(NoWarn);CS1591</NoWarn>
12+
</PropertyGroup>
13+
914
<PropertyGroup>
1015
<Product>Hot Chocolate</Product>
1116
<Authors>ChilliCream authors and contributors</Authors>
12-
<Company>ChilliCream</Company>
13-
<Copyright>Copyright &#169; 2021 ChilliCream (Michael &amp; Rafael Staib)</Copyright>
14-
<PackageLicenseUrl>https://github.com/ChilliCream/hotchocolate/blob/main/LICENSE</PackageLicenseUrl>
17+
<Company>ChilliCream Inc.</Company>
18+
<Copyright>Copyright &#169; 2021 ChilliCream Inc.</Copyright>
19+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
1520
<PackageProjectUrl>https://chillicream.com</PackageProjectUrl>
1621
<PackageReleaseNotes>Release notes: https://github.com/ChilliCream/hotchocolate/releases/$(PackageVersion)</PackageReleaseNotes>
1722
<PackageTags>GraphQL ChilliCream</PackageTags>
1823
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
19-
<PackageIconUrl>https://chillicream.com/resources/hotchocolate-signet.png</PackageIconUrl>
24+
<PackageIcon>hotchocolate-signet.png</PackageIcon>
2025
</PropertyGroup>
2126

2227
<PropertyGroup>
@@ -39,7 +44,14 @@
3944
</PropertyGroup>
4045

4146
<ItemGroup>
42-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
47+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.0" PrivateAssets="All"/>
48+
</ItemGroup>
49+
50+
<ItemGroup>
51+
<None Include="$(MSBuildThisFileDirectory)..\website\static\resources\greendonut-signet.png" Pack="true" PackagePath="greendonut-signet.png" Visible="false" />
52+
<None Include="$(MSBuildThisFileDirectory)..\website\static\resources\hotchocolate-signet.png" Pack="true" PackagePath="hotchocolate-signet.png" Visible="false" />
53+
<None Include="$(MSBuildThisFileDirectory)..\website\static\resources\strawberryshake-signet.png" Pack="true" PackagePath="strawberryshake-signet.png" Visible="false" />
54+
<None Include="$(MSBuildThisFileDirectory)..\LICEN*" Pack="true" PackagePath="" Visible="false" />
4355
</ItemGroup>
4456

4557
<!-- PublicApiAnalyzers -->

‎src/GreenDonut/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<PropertyGroup>
55
<PackageTags>DataLoader Batching Caching GraphQL ChilliCream Facebook</PackageTags>
6-
<PackageIconUrl>https://chillicream.com/resources/greendonut-signet.png</PackageIconUrl>
6+
<PackageIcon>greendonut-signet.png</PackageIcon>
77
</PropertyGroup>
88

99
</Project>

‎src/HotChocolate/Analyzers/Directory.Build.props

+24-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,28 @@
11
<Project>
22

3-
<PropertyGroup>
4-
<Product>Hot Chocolate</Product>
5-
<Authors>ChilliCream authors and contributors</Authors>
6-
<Company>ChilliCream</Company>
7-
<Copyright>Copyright &#169; 2021 ChilliCream (Michael &amp; Rafael Staib)</Copyright>
8-
<PackageLicenseUrl>https://github.com/ChilliCream/hotchocolate/blob/master/LICENSE</PackageLicenseUrl>
9-
<PackageProjectUrl>https://chillicream.com</PackageProjectUrl>
10-
<PackageReleaseNotes>Release notes: https://github.com/ChilliCream/hotchocolate/releases/$(PackageVersion)</PackageReleaseNotes>
11-
<PackageTags>GraphQL ChilliCream</PackageTags>
12-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
13-
<PackageIconUrl>https://chillicream.com/resources/hotchocolate-signet.png</PackageIconUrl>
14-
</PropertyGroup>
3+
<PropertyGroup>
4+
<Product>Hot Chocolate</Product>
5+
<Authors>ChilliCream authors and contributors</Authors>
6+
<Company>ChilliCream</Company>
7+
<Copyright>Copyright &#169; 2021 ChilliCream (Michael &amp; Rafael Staib)</Copyright>
8+
<PackageLicenseFile>LICENSE</PackageLicenseFile>
9+
<PackageProjectUrl>https://chillicream.com</PackageProjectUrl>
10+
<PackageReleaseNotes>Release notes: https://github.com/ChilliCream/hotchocolate/releases/$(PackageVersion)</PackageReleaseNotes>
11+
<PackageTags>GraphQL ChilliCream</PackageTags>
12+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
13+
<PackageIcon>hotchocolate-signet.png</PackageIcon>
14+
</PropertyGroup>
1515

16-
<PropertyGroup>
17-
<LangVersion>latest</LangVersion>
18-
<Nullable>enable</Nullable>
19-
</PropertyGroup>
16+
<PropertyGroup>
17+
<LangVersion>latest</LangVersion>
18+
<Nullable>enable</Nullable>
19+
</PropertyGroup>
2020

21-
</Project>
21+
<ItemGroup>
22+
<None Include="$(MSBuildThisFileDirectory)..\..\..\website\static\resources\greendonut-signet.png" Pack="true" PackagePath="greendonut-signet.png" Visible="false" />
23+
<None Include="$(MSBuildThisFileDirectory)..\..\..\website\static\resources\hotchocolate-signet.png" Pack="true" PackagePath="hotchocolate-signet.png" Visible="false" />
24+
<None Include="$(MSBuildThisFileDirectory)..\..\..\website\static\resources\strawberryshake-signet.png" Pack="true" PackagePath="strawberryshake-signet.png" Visible="false" />
25+
<None Include="$(MSBuildThisFileDirectory)..\..\..\LICEN*" Pack="true" PackagePath="" Visible="false" />
26+
</ItemGroup>
27+
28+
</Project>

‎src/HotChocolate/Analyzers/src/Analyzers/HotChocolate.Analyzers.csproj

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

33
<PropertyGroup>
4+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild> <!-- Generates a package at build -->
45
<IncludeBuildOutput>false</IncludeBuildOutput>
56
<IsPackable>true</IsPackable>
67
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
@@ -17,18 +18,21 @@
1718
<ItemGroup>
1819
<ProjectReference Include="..\..\..\CodeGeneration\src\CodeGeneration.Neo4J\HotChocolate.CodeGeneration.Neo4J.csproj" />
1920
<ProjectReference Include="..\..\..\CodeGeneration\src\CodeGeneration\HotChocolate.CodeGeneration.csproj" />
20-
<ProjectReference Include="..\..\..\Core\src\Types\HotChocolate.Types.csproj" />
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="DotNet.Glob" Version="3.1.2" PrivateAssets="all" GeneratePathProperty="true" />
24+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
2525
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
2626
<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2">
2727
<PrivateAssets>all</PrivateAssets>
2828
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2929
</PackageReference>
3030
</ItemGroup>
3131

32+
<ItemGroup>
33+
<PackageReference Include="DotNet.Glob" Version="3.1.2" PrivateAssets="all" GeneratePathProperty="true" />
34+
</ItemGroup>
35+
3236
<ItemGroup>
3337
<None Include="$(OutputPath)\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
3438
</ItemGroup>

‎src/HotChocolate/Analyzers/src/Directory.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
33

44
<PropertyGroup>
5+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
56
<TargetFramework>netstandard2.0</TargetFramework>
67
</PropertyGroup>
78

‎src/HotChocolate/AspNetCore/src/AspNetCore/HotChocolate.AspNetCore.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,8 @@
3333
</Compile>
3434
</ItemGroup>
3535

36+
<ItemGroup>
37+
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.AspNetCore.props" Pack="true" PackagePath="build/HotChocolate.AspNetCore.props" Visible="false" />
38+
</ItemGroup>
39+
3640
</Project>

‎src/HotChocolate/AspNetCore/src/MSBuild/HotChocolate.AspNetCore.props

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<Project>
2+
<ItemGroup>
3+
<Using Include="HotChocolate" />
4+
<Using Include="HotChocolate.Types" />
5+
<Using Include="HotChocolate.Types.Relay" />
6+
<Using Include="GreenDonut" />
7+
</ItemGroup>
8+
</Project>

‎src/HotChocolate/AzureFunctions/src/HotChocolate.AzureFunctions/HotChocolate.AzureFunctions.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,8 @@
1717
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
1818
</ItemGroup>
1919

20+
<ItemGroup>
21+
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.AzureFunctions.props" Pack="true" PackagePath="build/HotChocolate.AzureFunctions.props" Visible="false" />
22+
</ItemGroup>
23+
2024
</Project>

‎src/HotChocolate/AzureFunctions/src/MSBuild/HotChocolate.AzureFunctions.props

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<Project>
2+
<ItemGroup>
3+
<Using Include="HotChocolate" />
4+
<Using Include="HotChocolate.AzureFunctions" />
5+
<Using Include="HotChocolate.Types" />
6+
<Using Include="HotChocolate.Types.Relay" />
7+
<Using Include="GreenDonut" />
8+
</ItemGroup>
9+
</Project>

‎src/HotChocolate/CodeGeneration/Directory.Build.props

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,9 @@
11
<Project>
22

3-
<!--<PropertyGroup>
4-
<Product>Hot Chocolate</Product>
5-
<Authors>ChilliCream authors and contributors</Authors>
6-
<Company>ChilliCream</Company>
7-
<Copyright>Copyright &#169; 2021 ChilliCream (Michael &amp; Rafael Staib)</Copyright>
8-
<PackageLicenseUrl>https://github.com/ChilliCream/hotchocolate/blob/master/LICENSE</PackageLicenseUrl>
9-
<PackageProjectUrl>https://chillicream.com</PackageProjectUrl>
10-
<PackageReleaseNotes>Release notes: https://github.com/ChilliCream/hotchocolate/releases/$(PackageVersion)</PackageReleaseNotes>
11-
<PackageTags>GraphQL ChilliCream</PackageTags>
12-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
13-
<PackageIconUrl>https://chillicream.com/resources/hotchocolate-signet.png</PackageIconUrl>
14-
</PropertyGroup>-->
3+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
4+
<Import Project="$([MSBuild]::GetPathOfFileAbove('Nullable.props', '$(MSBuildThisFileDirectory)..\'))" />
155

166
<PropertyGroup>
17-
<LangVersion>latest</LangVersion>
187
<Nullable>enable</Nullable>
198
</PropertyGroup>
209

‎src/HotChocolate/CodeGeneration/src/CodeGeneration.Neo4J/HotChocolate.CodeGeneration.Neo4J.csproj

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

33
<PropertyGroup>
4-
<IncludeBuildOutput>false</IncludeBuildOutput>
54
<IsPackable>false</IsPackable>
6-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
7-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
85
</PropertyGroup>
96

107
<PropertyGroup>
11-
<!-- <PackageId>HotChocolate.CodeGeneration.Neo4J</PackageId> -->
128
<AssemblyName>HotChocolate.CodeGeneration.Neo4J</AssemblyName>
139
<RootNamespace>HotChocolate.CodeGeneration.Neo4J</RootNamespace>
1410
<Description>Contains source generators for Neo4J.</Description>
@@ -22,4 +18,8 @@
2218
<ProjectReference Include="..\CodeGeneration\HotChocolate.CodeGeneration.csproj" />
2319
</ItemGroup>
2420

21+
<PropertyGroup>
22+
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
23+
</PropertyGroup>
24+
2525
</Project>

‎src/HotChocolate/CodeGeneration/src/CodeGeneration.Neo4J/PublicAPI.Shipped.txt

-1
This file was deleted.

‎src/HotChocolate/CodeGeneration/src/CodeGeneration.Neo4J/PublicAPI.Unshipped.txt

Whitespace-only changes.

‎src/HotChocolate/CodeGeneration/src/CodeGeneration/HotChocolate.CodeGeneration.csproj

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

33
<PropertyGroup>
4-
<IncludeBuildOutput>false</IncludeBuildOutput>
54
<IsPackable>false</IsPackable>
6-
<SuppressDependenciesWhenPacking>true</SuppressDependenciesWhenPacking>
7-
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
85
</PropertyGroup>
96

107
<PropertyGroup>
11-
<!-- <PackageId>HotChocolate.CodeGeneration</PackageId> -->
128
<AssemblyName>HotChocolate.CodeGeneration</AssemblyName>
139
<RootNamespace>HotChocolate.CodeGeneration</RootNamespace>
1410
<Description>Contains source generators for Hot Chocolate.</Description>
@@ -26,4 +22,8 @@
2622
</PackageReference>
2723
</ItemGroup>
2824

25+
<PropertyGroup>
26+
<AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
27+
</PropertyGroup>
28+
2929
</Project>

‎src/HotChocolate/CodeGeneration/src/CodeGeneration/PublicAPI.Shipped.txt

-1
This file was deleted.

‎src/HotChocolate/CodeGeneration/src/CodeGeneration/PublicAPI.Unshipped.txt

Whitespace-only changes.

‎src/HotChocolate/CodeGeneration/src/Directory.Build.props

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
33

44
<PropertyGroup>
5+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
56
<TargetFramework>netstandard2.0</TargetFramework>
67
</PropertyGroup>
78

‎src/HotChocolate/CodeGeneration/test/CodeGeneration.Neo4J.Tests/__snapshots__/Neo4JCodeGeneratorTests.Works.snap

+4-4
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
"SourceFiles": [
33
{
44
"Name": "CompanyName.Neo4J.Foo.cs",
5-
"Source": "namespace CompanyName.Neo4J\n{\n [global::System.CodeDom.Compiler.GeneratedCode(\"HotChocolate\", \"1.0.0.0\")]\n public partial class Foo\n {\n public global::System.String Title\n {\n get;\n set;\n }\n\n public global::System.Int32 Year\n {\n get;\n set;\n }\n\n public global::System.Double ImdbRating\n {\n get;\n set;\n }\n\n public global::CompanyName.Neo4J.Baz Baz\n {\n get;\n set;\n }\n\n public global::System.String Quox\n {\n get;\n set;\n }\n }\n}"
5+
"Source": "namespace CompanyName.Neo4J\n{\n [global::System.CodeDom.Compiler.GeneratedCode(\"HotChocolate\", \"0.0.0.0\")]\n public partial class Foo\n {\n public global::System.String Title\n {\n get;\n set;\n }\n\n public global::System.Int32 Year\n {\n get;\n set;\n }\n\n public global::System.Double ImdbRating\n {\n get;\n set;\n }\n\n public global::CompanyName.Neo4J.Baz Baz\n {\n get;\n set;\n }\n\n public global::System.String Quox\n {\n get;\n set;\n }\n }\n}"
66
},
77
{
88
"Name": "CompanyName.Neo4J.Actor.cs",
9-
"Source": "namespace CompanyName.Neo4J\n{\n [global::System.CodeDom.Compiler.GeneratedCode(\"HotChocolate\", \"1.0.0.0\")]\n public partial class Actor\n {\n public global::System.String Name\n {\n get;\n set;\n }\n }\n}"
9+
"Source": "namespace CompanyName.Neo4J\n{\n [global::System.CodeDom.Compiler.GeneratedCode(\"HotChocolate\", \"0.0.0.0\")]\n public partial class Actor\n {\n public global::System.String Name\n {\n get;\n set;\n }\n }\n}"
1010
},
1111
{
1212
"Name": "CompanyName.Neo4J.Baz.cs",
13-
"Source": "namespace CompanyName.Neo4J\n{\n [global::System.CodeDom.Compiler.GeneratedCode(\"HotChocolate\", \"1.0.0.0\")]\n public partial class Baz\n {\n public global::System.String Foo\n {\n get;\n set;\n }\n }\n}"
13+
"Source": "namespace CompanyName.Neo4J\n{\n [global::System.CodeDom.Compiler.GeneratedCode(\"HotChocolate\", \"0.0.0.0\")]\n public partial class Baz\n {\n public global::System.String Foo\n {\n get;\n set;\n }\n }\n}"
1414
},
1515
{
1616
"Name": "CompanyName.Neo4J.Query.cs",
1717
"Source": "namespace CompanyName.Neo4J\n{\n [global::HotChocolate.Types.ExtendObjectType(\"Query\")]\n public partial class Query\n {\n [global::HotChocolate.GraphQLNameAttribute(\"bars\")]\n [global::HotChocolate.Data.Neo4J.UseNeo4JDatabaseAttribute(databaseName: \"Neo4JDatabase\")]\n [global::HotChocolate.Data.UseProjectionAttribute]\n [global::HotChocolate.Data.UseFilteringAttribute]\n [global::HotChocolate.Data.UseSortingAttribute]\n public global::HotChocolate.Data.Neo4J.Execution.Neo4JExecutable<Foo> GetBars([global::HotChocolate.ScopedServiceAttribute] global::Neo4j.Driver.IAsyncSession session) => new(session);\n [global::HotChocolate.GraphQLNameAttribute(\"actors\")]\n [global::HotChocolate.Data.Neo4J.UseNeo4JDatabaseAttribute(databaseName: \"Neo4JDatabase\")]\n [global::HotChocolate.Data.UseProjectionAttribute]\n [global::HotChocolate.Data.UseFilteringAttribute]\n [global::HotChocolate.Data.UseSortingAttribute]\n public global::HotChocolate.Data.Neo4J.Execution.Neo4JExecutable<Actor> GetActors([global::HotChocolate.ScopedServiceAttribute] global::Neo4j.Driver.IAsyncSession session) => new(session);\n [global::HotChocolate.GraphQLNameAttribute(\"bazs\")]\n [global::HotChocolate.Data.Neo4J.UseNeo4JDatabaseAttribute(databaseName: \"Neo4JDatabase\")]\n [global::HotChocolate.Data.UseProjectionAttribute]\n [global::HotChocolate.Data.UseFilteringAttribute]\n [global::HotChocolate.Data.UseSortingAttribute]\n public global::HotChocolate.Data.Neo4J.Execution.Neo4JExecutable<Baz> GetBazs([global::HotChocolate.ScopedServiceAttribute] global::Neo4j.Driver.IAsyncSession session) => new(session);\n }\n}"
1818
},
1919
{
2020
"Name": "Microsoft.Extensions.DependencyInjection.MyNeo4JRequestExecutorBuilderExtensions.cs",
21-
"Source": "namespace Microsoft.Extensions.DependencyInjection\n{\n [global::System.CodeDom.Compiler.GeneratedCode(\"HotChocolate\", \"1.0.0.0\")]\n public static partial class MyNeo4JRequestExecutorBuilderExtensions\n {\n public static global::HotChocolate.Execution.Configuration.IRequestExecutorBuilder AddMyNeo4JTypes(this global::HotChocolate.Execution.Configuration.IRequestExecutorBuilder builder)\n {\n global::Microsoft.Extensions.DependencyInjection.SchemaRequestExecutorBuilderExtensions.AddTypeExtension<global::CompanyName.Neo4J.Query>(builder);\n global::HotChocolate.Data.Neo4J.Neo4JDataRequestBuilderExtensions.AddNeo4JFiltering(builder);\n global::HotChocolate.Data.Neo4J.Neo4JDataRequestBuilderExtensions.AddNeo4JSorting(builder);\n global::HotChocolate.Data.Neo4J.Neo4JDataRequestBuilderExtensions.AddNeo4JProjections(builder);\n return builder;\n }\n }\n}"
21+
"Source": "namespace Microsoft.Extensions.DependencyInjection\n{\n [global::System.CodeDom.Compiler.GeneratedCode(\"HotChocolate\", \"0.0.0.0\")]\n public static partial class MyNeo4JRequestExecutorBuilderExtensions\n {\n public static global::HotChocolate.Execution.Configuration.IRequestExecutorBuilder AddMyNeo4JTypes(this global::HotChocolate.Execution.Configuration.IRequestExecutorBuilder builder)\n {\n global::Microsoft.Extensions.DependencyInjection.SchemaRequestExecutorBuilderExtensions.AddTypeExtension<global::CompanyName.Neo4J.Query>(builder);\n global::HotChocolate.Data.Neo4J.Neo4JDataRequestBuilderExtensions.AddNeo4JFiltering(builder);\n global::HotChocolate.Data.Neo4J.Neo4JDataRequestBuilderExtensions.AddNeo4JSorting(builder);\n global::HotChocolate.Data.Neo4J.Neo4JDataRequestBuilderExtensions.AddNeo4JProjections(builder);\n return builder;\n }\n }\n}"
2222
}
2323
]
2424
}

‎src/HotChocolate/Data/src/Data/HotChocolate.Data.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@
2929
</Compile>
3030
</ItemGroup>
3131

32+
<ItemGroup>
33+
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.Data.props" Pack="true" PackagePath="build/HotChocolate.Data.props" Visible="false" />
34+
</ItemGroup>
35+
3236
</Project>

‎src/HotChocolate/Data/src/EntityFramework/HotChocolate.Data.EntityFramework.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,8 @@
3737
</Compile>
3838
</ItemGroup>
3939

40+
<ItemGroup>
41+
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.Data.props" Pack="true" PackagePath="build/HotChocolate.Data.EntityFramework.props" Visible="false" />
42+
</ItemGroup>
43+
4044
</Project>

‎src/HotChocolate/Data/src/MSBuild/HotChocolate.Data.props

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<Project>
2+
<ItemGroup>
3+
<Using Include="HotChocolate.Data" />
4+
</ItemGroup>
5+
</Project>

‎src/HotChocolate/Directory.Build.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)..\'))" />
33

44
<PropertyGroup>
5-
<PackageIconUrl>https://chillicream.com/resources/hotchocolate-signet.png</PackageIconUrl>
5+
<PackageIcon>hotchocolate-signet.png</PackageIcon>
66
</PropertyGroup>
77

88
</Project>

‎src/StrawberryShake/Client/src/Razor/StrawberryShake.Razor.csproj

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,8 @@
66
<RootNamespace>StrawberryShake.Razor</RootNamespace>
77
<Nullable>enable</Nullable>
88
<Description>Provides razor components for using StrawberryShake.</Description>
9-
<TargetFrameworks>net6.0</TargetFrameworks>
10-
<TargetFramework>net6.0</TargetFramework>
9+
<TargetFrameworks>net6.0; net5.0</TargetFrameworks>
1110
</PropertyGroup>
12-
1311

1412
<ItemGroup>
1513
<SupportedPlatform Include="browser" />

‎src/StrawberryShake/Directory.Build.props

+1-9
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,7 @@
88

99
<PropertyGroup>
1010
<Product>Strawberry Shake</Product>
11-
<Authors>ChilliCream authors and contributors</Authors>
12-
<Company>ChilliCream</Company>
13-
<Copyright>Copyright &#169; 2019 ChilliCream (Michael &amp; Rafael Staib)</Copyright>
14-
<PackageLicenseUrl>https://github.com/ChilliCream/hotchocolate/blob/master/LICENSE</PackageLicenseUrl>
15-
<PackageProjectUrl>https://chillicream.com</PackageProjectUrl>
16-
<PackageReleaseNotes>Release notes: https://github.com/ChilliCream/hotchocolate/releases/$(PackageVersion)</PackageReleaseNotes>
17-
<PackageTags>GraphQL ChilliCream</PackageTags>
18-
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
19-
<PackageIconUrl>https://chillicream.com/resources/strawberryshake-signet.png</PackageIconUrl>
11+
<PackageIcon>strawberryshake-signet.png</PackageIcon>
2012
</PropertyGroup>
2113

2214
<PropertyGroup>

‎templates/v12/function/GlobalUsings.cs

-6
This file was deleted.

‎templates/v12/function/HotChocolate.Template.AzureFunctions.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
<ImplicitUsings>enable</ImplicitUsings>
88
</PropertyGroup>
99

10+
<ItemGroup>
11+
<Using Include="Microsoft.Azure.Functions.Extensions.DependencyInjection" />
12+
<Using Include="Microsoft.Extensions.DependencyInjection" />
13+
<Using Include="HotChocolate.Template.AzureFunctions" />
14+
</ItemGroup>
15+
1016
<ItemGroup>
1117
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.0.1" />
1218
<PackageReference Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />

‎templates/v12/server/GlobalUsings.cs

-3
This file was deleted.

‎templates/v12/server/HotChocolate.Template.Server.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66
<ImplicitUsings>enable</ImplicitUsings>
77
</PropertyGroup>
88

9+
<ItemGroup>
10+
<Using Include="HotChocolate.Template.Server" />
11+
</ItemGroup>
12+
913
<ItemGroup>
1014
<PackageReference Include="HotChocolate.AspNetCore" Version="11.1.0" />
1115
</ItemGroup>

0 commit comments

Comments
 (0)
Please sign in to comment.