Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ChilliCream/graphql-platform
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 12.2.0
Choose a base ref
...
head repository: ChilliCream/graphql-platform
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 12.2.1
Choose a head ref
  • 2 commits
  • 13 files changed
  • 2 contributors

Commits on Nov 11, 2021

  1. Fixed typo in EF docs. (#4411) 

    Co-authored-by: Michael Staib <michael@chillicream.com>
    @deckerbd @michaelstaib
    deckerbd and michaelstaib authored Nov 11, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0df3f9e View commit details

Commits on Nov 12, 2021

  1. Allow to opt-out of implicit usings. (#4413)

    @michaelstaib
    michaelstaib authored Nov 12, 2021

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    Mic92 Jörg Thalheim
    GPG key ID: B3F5D81B0C6967C4
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    663cd8a View commit details
1 change: 1 addition & 0 deletions src/HotChocolate/AspNetCore/src/AspNetCore/HotChocolate.AspNetCore.csproj
View file
Original file line number Diff line number Diff line change
@@ -35,6 +35,7 @@

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.AspNetCore.props" Pack="true" PackagePath="build/HotChocolate.AspNetCore.props" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.AspNetCore.targets" Pack="true" PackagePath="build/HotChocolate.AspNetCore.targets" Visible="false" />
</ItemGroup>

</Project>
10 changes: 4 additions & 6 deletions src/HotChocolate/AspNetCore/src/MSBuild/HotChocolate.AspNetCore.props
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
<Project>
<ItemGroup>
<Using Include="HotChocolate" />
<Using Include="HotChocolate.Types" />
<Using Include="HotChocolate.Types.Relay" />
<Using Include="GreenDonut" />
</ItemGroup>
<PropertyGroup>
<!--HotChocolateImplicitUsings: default|disable|enable-->
<HotChocolateImplicitUsings>default</HotChocolateImplicitUsings>
</PropertyGroup>
</Project>
12 changes: 12 additions & 0 deletions src/HotChocolate/AspNetCore/src/MSBuild/HotChocolate.AspNetCore.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<Project>
<PropertyGroup>
<HotChocolateImplicitUsings Condition="'$(ImplicitUsings)' == 'enable' AND '$(HotChocolateImplicitUsings)' != 'disable'">enable</HotChocolateImplicitUsings>
</PropertyGroup>

<ItemGroup Condition="'$(HotChocolateImplicitUsings)' == 'enable'">
<Using Include="HotChocolate" />
<Using Include="HotChocolate.Types" />
<Using Include="HotChocolate.Types.Relay" />
<Using Include="GreenDonut" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions ...ocolate/AzureFunctions/src/HotChocolate.AzureFunctions/HotChocolate.AzureFunctions.csproj
View file
Original file line number Diff line number Diff line change
@@ -19,6 +19,7 @@

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.AzureFunctions.props" Pack="true" PackagePath="build/HotChocolate.AzureFunctions.props" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.AzureFunctions.targets" Pack="true" PackagePath="build/HotChocolate.AzureFunctions.targets" Visible="false" />
</ItemGroup>

</Project>
11 changes: 4 additions & 7 deletions src/HotChocolate/AzureFunctions/src/MSBuild/HotChocolate.AzureFunctions.props
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<Project>
<ItemGroup>
<Using Include="HotChocolate" />
<Using Include="HotChocolate.AzureFunctions" />
<Using Include="HotChocolate.Types" />
<Using Include="HotChocolate.Types.Relay" />
<Using Include="GreenDonut" />
</ItemGroup>
<PropertyGroup>
<!--HotChocolateImplicitUsings: default|disable|enable-->
<HotChocolateImplicitUsings>default</HotChocolateImplicitUsings>
</PropertyGroup>
</Project>
13 changes: 13 additions & 0 deletions src/HotChocolate/AzureFunctions/src/MSBuild/HotChocolate.AzureFunctions.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<Project>
<PropertyGroup>
<HotChocolateImplicitUsings Condition="'$(ImplicitUsings)' == 'enable' AND '$(HotChocolateImplicitUsings)' != 'disable'">enable</HotChocolateImplicitUsings>
</PropertyGroup>

<ItemGroup Condition="'$(HotChocolateImplicitUsings)' == 'enable'">
<Using Include="HotChocolate" />
<Using Include="HotChocolate.AzureFunctions" />
<Using Include="HotChocolate.Types" />
<Using Include="HotChocolate.Types.Relay" />
<Using Include="GreenDonut" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions src/HotChocolate/Data/src/Data/HotChocolate.Data.csproj
View file
Original file line number Diff line number Diff line change
@@ -31,6 +31,7 @@

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.Data.props" Pack="true" PackagePath="build/HotChocolate.Data.props" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.Data.targets" Pack="true" PackagePath="build/HotChocolate.Data.targets" Visible="false" />
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/HotChocolate/Data/src/EntityFramework/HotChocolate.Data.EntityFramework.csproj
View file
Original file line number Diff line number Diff line change
@@ -39,6 +39,7 @@

<ItemGroup>
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.Data.props" Pack="true" PackagePath="build/HotChocolate.Data.EntityFramework.props" Visible="false" />
<None Include="$(MSBuildThisFileDirectory)..\MSBuild\HotChocolate.Data.targets" Pack="true" PackagePath="build/HotChocolate.Data.EntityFramework.targets" Visible="false" />
</ItemGroup>

</Project>
7 changes: 4 additions & 3 deletions src/HotChocolate/Data/src/MSBuild/HotChocolate.Data.props
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<Project>
<ItemGroup>
<Using Include="HotChocolate.Data" />
</ItemGroup>
<PropertyGroup>
<!--HotChocolateImplicitUsings: default|disable|enable-->
<HotChocolateImplicitUsings>default</HotChocolateImplicitUsings>
</PropertyGroup>
</Project>
9 changes: 9 additions & 0 deletions src/HotChocolate/Data/src/MSBuild/HotChocolate.Data.targets
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<Project>
<PropertyGroup>
<HotChocolateImplicitUsings Condition="'$(ImplicitUsings)' == 'enable' AND '$(HotChocolateImplicitUsings)' != 'disable'">enable</HotChocolateImplicitUsings>
</PropertyGroup>

<ItemGroup Condition="'$(HotChocolateImplicitUsings)' == 'enable'">
<Using Include="HotChocolate.Data" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion templates/v12/function/HotChocolate.Template.AzureFunctions.csproj
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<ItemGroup Condition="'$(ImplicitUsings)' == 'enable'">
<Using Include="Microsoft.Azure.Functions.Extensions.DependencyInjection" />
<Using Include="Microsoft.Extensions.DependencyInjection" />
<Using Include="HotChocolate.Template.AzureFunctions" />
2 changes: 1 addition & 1 deletion templates/v12/server/HotChocolate.Template.Server.csproj
View file
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<ItemGroup Condition="'$(ImplicitUsings)' == 'enable'">
<Using Include="HotChocolate.Template.Server" />
</ItemGroup>

4 changes: 2 additions & 2 deletions website/src/docs/hotchocolate/integrations/entity-framework.md
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ When using `services.AddDbContext<T>` to register a `DbContext` as a scoped serv
- `A second operation started on this context before a previous operation completed.`
- `Cannot access a disposed object.`

Fortunatly there are a couple of solutions that can be used to avoid the described issue. We will take a closer look at them in the below sections.
Fortunatley there are a couple of solutions that can be used to avoid the described issue. We will take a closer look at them in the below sections.

# DbContextFactory

@@ -37,7 +37,7 @@ public class Startup

```

> ⚠️ Note: All of the configuraion done in the `OnConfiguring` method of the `DbContext` needs to be moved to the configuration action on the `AddPooledDbContextFactory` call.
> ⚠️ Note: All of the configuration done in the `OnConfiguring` method of the `DbContext` needs to be moved to the configuration action on the `AddPooledDbContextFactory` call.
Using the `IDbContextFactory` changes how we access an instance of our `DbContext`. Previously we would directly inject the scoped `DbContext` instance into our constructors or methods. Now we need to inject the `IDbContextFactory` instead and create an instance of the `DbContext` ourselves.