Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3.1.11: Disable NRTs in scaffolding #23060

Merged
merged 2 commits into from
Nov 13, 2020
Merged

3.1.11: Disable NRTs in scaffolding #23060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f57176c
Disable NRTs in scaffolding (#21190)
roji Jun 12, 2020
1b1dcc3
Update to generate a comment
ajcvickers Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/EFCore.Design/Scaffolding/Internal/CSharpDbContextGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@ public class CSharpDbContextGenerator : ICSharpDbContextGenerator

_sb.AppendLine();

_sb.AppendLine("// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.");
_sb.AppendLine("// If you have enabled NRTs for your project, then un-comment the following line:");
_sb.AppendLine("// #nullable disable");
_sb.AppendLine();

_sb.AppendLine($"namespace {finalContextNamespace}");
_sb.AppendLine("{");

Expand Down
5 changes: 5 additions & 0 deletions src/EFCore.Design/Scaffolding/Internal/CSharpEntityTypeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,11 @@ public virtual string WriteCode(IEntityType entityType, string @namespace, bool
_sb.AppendLine($"using {ns};");
}

_sb.AppendLine();
_sb.AppendLine("// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.");
_sb.AppendLine("// If you have enabled NRTs for your project, then un-comment the following line:");
_sb.AppendLine("// #nullable disable");

_sb.AppendLine();
_sb.AppendLine($"namespace {@namespace}");
_sb.AppendLine("{");
Expand Down
8 changes: 8 additions & 0 deletions test/EFCore.Design.Tests/Scaffolding/Internal/CSharpDbContextGeneratorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ public void Empty_model()
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;

// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.
// If you have enabled NRTs for your project, then un-comment the following line:
// #nullable disable

namespace TestNamespace
{
public partial class TestDbContext : DbContext
Expand Down Expand Up @@ -80,6 +84,10 @@ public void SuppressConnectionStringWarning_works()
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata;

// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.
// If you have enabled NRTs for your project, then un-comment the following line:
// #nullable disable

namespace TestNamespace
{
public partial class TestDbContext : DbContext
Expand Down
20 changes: 20 additions & 0 deletions test/EFCore.Design.Tests/Scaffolding/Internal/CSharpEntityTypeGeneratorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,10 @@ public void Navigation_properties()
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.
// If you have enabled NRTs for your project, then un-comment the following line:
// #nullable disable

namespace TestNamespace
{
public partial class Post
Expand Down Expand Up @@ -98,6 +102,10 @@ public void Navigation_property_with_same_type_and_navigation_name()
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.
// If you have enabled NRTs for your project, then un-comment the following line:
// #nullable disable

namespace TestNamespace
{
public partial class Post
Expand Down Expand Up @@ -153,6 +161,10 @@ public void Navigation_property_with_same_type_and_property_name()
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.
// If you have enabled NRTs for your project, then un-comment the following line:
// #nullable disable

namespace TestNamespace
{
public partial class Post
Expand Down Expand Up @@ -209,6 +221,10 @@ public void Navigation_property_with_same_type_and_other_navigation_name()
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.
// If you have enabled NRTs for your project, then un-comment the following line:
// #nullable disable

namespace TestNamespace
{
public partial class Post
Expand Down Expand Up @@ -276,6 +292,10 @@ public void Composite_key()
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;

// Code scaffolded by EF Core assumes nullable reference types (NRTs) are not used or disabled.
// If you have enabled NRTs for your project, then un-comment the following line:
// #nullable disable

namespace TestNamespace
{
public partial class Post
Expand Down