Skip to content

Commit 5f40a64

Browse files
fixed missing NullableEnabled property in the RazorPageModel (#1854)
* fixed missing NullableEnabled property in the RazorPageModel * removing Debugger.Launch()
1 parent 5478e26 commit 5f40a64

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

scripts/install-aspnet-codegenerator.sh

100644100755
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
VERSION=5.0.0
3+
VERSION=6.0.3
44
DEFAULT_NUPKG_PATH=~/.nuget/packages
55
SRC_DIR=$(pwd)
66
echo $SRC_DIR

src/Scaffolding/VS.Web.CG.Mvc/RazorPage/RazorPageGeneratorTemplateModel.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ public class RazorPageGeneratorTemplateModel
3131
public IModelMetadata ModelMetadata { get; set; }
3232

3333
public string JQueryVersion { get; set; }
34+
public bool NullableEnabled { get; set; } = false;
3435

3536
}
3637
}

src/Scaffolding/VS.Web.CG.Mvc/RazorPage/RazorPageScaffolderBase.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ protected RazorPageGeneratorTemplateModel GetRazorPageViewGeneratorTemplateModel
239239
{
240240
razorGeneratorModel.BootstrapVersion = RazorPageScaffolderBase.DefaultBootstrapVersion;
241241
}
242-
243242
RazorPageGeneratorTemplateModel2 templateModel = new RazorPageGeneratorTemplateModel2()
244243
{
245244
NamespaceName = namespaceName,
@@ -252,7 +251,8 @@ protected RazorPageGeneratorTemplateModel GetRazorPageViewGeneratorTemplateModel
252251
ReferenceScriptLibraries = razorGeneratorModel.ReferenceScriptLibraries,
253252
JQueryVersion = "1.10.2", //Todo
254253
BootstrapVersion = razorGeneratorModel.BootstrapVersion,
255-
ContentVersion = DetermineContentVersion(razorGeneratorModel)
254+
ContentVersion = DetermineContentVersion(razorGeneratorModel),
255+
NullableEnabled = "enable".Equals(ApplicationInfo?.WorkspaceHelper?.GetMsBuildProperty("Nullable"), StringComparison.OrdinalIgnoreCase)
256256
};
257257

258258
return templateModel;

src/Scaffolding/VS.Web.CG.Mvc/RazorPage/RazorPageWithContextTemplateModel.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ public RazorPageWithContextTemplateModel(ModelType modelType, string dbContextFu
3737
public string DbContextNamespace { get; private set; }
3838

3939
public ModelType ModelType { get; private set; }
40-
public bool NullableEnabled { get; set; }
4140

4241
public string ModelTypeName
4342
{

0 commit comments

Comments
 (0)