Skip to content

Commit 5922727

Browse files
authored
fix: Fix Local Debug SSO Tab with .NET 9 (#13069)
1 parent fbb1562 commit 5922727

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

packages/fx-core/src/component/generator/templates/ssrTabGenerator.ts

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { CapabilityOptions, ProgrammingLanguage, QuestionNames } from "../../../
66
import { DefaultTemplateGenerator } from "./templateGenerator";
77
import { TemplateInfo } from "./templateInfo";
88
import { TemplateNames } from "./templateNames";
9+
import { Generator } from "../generator";
910

1011
// For the APS.NET server-side rendering tab
1112
export class SsrTabGenerator extends DefaultTemplateGenerator {
@@ -27,11 +28,25 @@ export class SsrTabGenerator extends DefaultTemplateGenerator {
2728
inputs: Inputs,
2829
destinationPath: string
2930
): Promise<Result<TemplateInfo[], FxError>> {
31+
const appName = inputs[QuestionNames.AppName];
32+
const safeProjectNameFromVS = inputs[QuestionNames.SafeProjectName];
33+
const isNet8 = inputs.targetFramework === "net8.0";
34+
const replaceMap = {
35+
...Generator.getDefaultVariables(
36+
appName,
37+
safeProjectNameFromVS,
38+
inputs.targetFramework,
39+
inputs.placeProjectFileInSolutionDir === "true"
40+
),
41+
IsNet8Framework: isNet8 ? "true" : "",
42+
};
43+
3044
return Promise.resolve(
3145
ok([
3246
{
3347
templateName: this.capabilities2TemplateNames[inputs.capabilities as string],
3448
language: ProgrammingLanguage.CSharp,
49+
replaceMap,
3550
},
3651
])
3752
);

packages/fx-core/tests/component/generator/templateGenerator.test.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,14 @@ describe("TemplateGenerator", () => {
5151
},
5252
TemplateNames.Tab,
5353
],
54+
[
55+
{
56+
[QuestionNames.Capabilities]: CapabilityOptions.tab().id,
57+
[QuestionNames.ProgrammingLanguage]: ProgrammingLanguage.CSharp,
58+
targetFramework: "net9.0",
59+
},
60+
TemplateNames.SsoTabSSR,
61+
],
5462
]);
5563

5664
setTools(new MockTools());

templates/csharp/sso-tab-ssr/Program.cs.tpl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,13 @@ app.UseAntiforgery();
3636
app.UseAuthentication();
3737
app.UseAuthorization();
3838

39+
{{#IsNet8Framework}}
3940
app.MapRazorComponents<App>()
4041
.AddInteractiveServerRenderMode();
42+
{{/IsNet8Framework}}
43+
{{^IsNet8Framework}}
44+
app.MapRazorComponents<App>()
45+
.AddInteractiveServerRenderMode(o => o.ContentSecurityFrameAncestorsPolicy = "'self' *");
46+
{{/IsNet8Framework}}
4147

4248
app.Run();

0 commit comments

Comments
 (0)