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

refactor: mv unneeded tab templates below .net8 #13089

Merged
merged 1 commit into from
Jan 21, 2025
Merged

refactor: mv unneeded tab templates below .net8 #13089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 1 addition & 3 deletions packages/fx-core/src/component/generator/templates/ssrTabGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ export class SsrTabGenerator extends DefaultTemplateGenerator {
const capability = inputs.capabilities as string;
return (
this.capabilities2TemplateNames[capability] !== undefined &&
inputs[QuestionNames.ProgrammingLanguage] === ProgrammingLanguage.CSharp &&
inputs.targetFramework !== "net6.0" &&
inputs.targetFramework !== "net7.0"
inputs[QuestionNames.ProgrammingLanguage] === ProgrammingLanguage.CSharp
);
}
override getTemplateInfos(
Expand Down
3 changes: 0 additions & 3 deletions packages/fx-core/src/component/generator/templates/templateNames.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import {
export enum TemplateNames {
Empty = "empty",
Tab = "non-sso-tab",
SsoTab = "sso-tab",
SsoTabObo = "sso-tab-with-obo-flow",
TabSSR = "non-sso-tab-ssr",
SsoTabSSR = "sso-tab-ssr",
Expand Down Expand Up @@ -60,7 +59,6 @@ export enum TemplateNames {
export const Feature2TemplateName = {
[`${CapabilityOptions.empty().id}:undefined`]: TemplateNames.Empty,
[`${CapabilityOptions.nonSsoTab().id}:undefined`]: TemplateNames.Tab,
[`${CapabilityOptions.tab().id}:undefined`]: TemplateNames.SsoTab,
[`${CapabilityOptions.m365SsoLaunchPage().id}:undefined`]: TemplateNames.SsoTabObo,
[`${CapabilityOptions.nonSsoTab().id}:ssr`]: TemplateNames.TabSSR,
[`${CapabilityOptions.tab().id}:ssr`]: TemplateNames.SsoTabSSR,
Expand Down Expand Up @@ -141,7 +139,6 @@ export function getTemplateName(inputs: Inputs): TemplateNames {
export const inputsToTemplateName: Map<{ [key: string]: any }, TemplateNames> = new Map([
[{ [QuestionNames.Capabilities]: CapabilityOptions.empty().id }, TemplateNames.Empty],
[{ [QuestionNames.Capabilities]: CapabilityOptions.nonSsoTab().id }, TemplateNames.Tab],
[{ [QuestionNames.Capabilities]: CapabilityOptions.tab().id }, TemplateNames.SsoTab],
[
{ [QuestionNames.Capabilities]: CapabilityOptions.m365SsoLaunchPage().id },
TemplateNames.SsoTabObo,
Expand Down
36 changes: 0 additions & 36 deletions packages/fx-core/tests/component/coordinator/coordinator.create.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,42 +503,6 @@ describe("coordinator create", () => {
assert.isTrue(res.isOk());
});

it("create non-sso tab earlier than .Net8", async () => {
const inputs: Inputs = {
platform: Platform.VS,
folder: ".",
[QuestionNames.AppName]: randomAppName(),
[QuestionNames.ProgrammingLanguage]: "csharp",
[QuestionNames.SafeProjectName]: "safeprojectname",
["targetFramework"]: "net6.0",
[QuestionNames.ProjectType]: ProjectTypeOptions.tab().id,
[QuestionNames.Capabilities]: CapabilityOptions.nonSsoTab().id,
};
const fxCore = new FxCore(tools);
const res = await fxCore.createProject(inputs);

assert.isTrue(res.isOk());
assert.equal(generator.args[0][1].templateName, TemplateNames.Tab);
});

it("create sso tab earlier than .Net8", async () => {
const inputs: Inputs = {
platform: Platform.VS,
folder: ".",
[QuestionNames.AppName]: randomAppName(),
[QuestionNames.ProgrammingLanguage]: "csharp",
[QuestionNames.SafeProjectName]: "safeprojectname",
["targetFramework"]: "net6.0",
[QuestionNames.ProjectType]: ProjectTypeOptions.tab().id,
[QuestionNames.Capabilities]: CapabilityOptions.tab().id,
};
const fxCore = new FxCore(tools);
const res = await fxCore.createProject(inputs);

assert.isTrue(res.isOk());
assert.equal(generator.args[0][1].templateName, TemplateNames.SsoTab);
});

it("create non-sso tab from .NET 8", async () => {
const inputs: Inputs = {
platform: Platform.VS,
Expand Down
16 changes: 0 additions & 16 deletions packages/fx-core/tests/component/generator/templateGenerator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,6 @@ describe("TemplateGenerator", () => {
},
TemplateNames.SsoTabSSR,
],
[
{
[QuestionNames.Capabilities]: CapabilityOptions.tab().id,
[QuestionNames.ProgrammingLanguage]: ProgrammingLanguage.CSharp,
targetFramework: "net6.0",
},
TemplateNames.SsoTab,
],
[
{
[QuestionNames.Capabilities]: CapabilityOptions.nonSsoTab().id,
Expand All @@ -43,14 +35,6 @@ describe("TemplateGenerator", () => {
},
TemplateNames.TabSSR,
],
[
{
[QuestionNames.Capabilities]: CapabilityOptions.nonSsoTab().id,
[QuestionNames.ProgrammingLanguage]: ProgrammingLanguage.CSharp,
targetFramework: "net6.0",
},
TemplateNames.Tab,
],
[
{
[QuestionNames.Capabilities]: CapabilityOptions.tab().id,
Expand Down
26 changes: 0 additions & 26 deletions templates/csharp/non-sso-tab/.gitignore
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions templates/csharp/non-sso-tab/.{{NewProjectTypeName}}/.gitignore
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions templates/csharp/non-sso-tab/.{{NewProjectTypeName}}/README.md.tpl
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions templates/csharp/non-sso-tab/.{{NewProjectTypeName}}/launchSettings.json.tpl
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions ...harp/non-sso-tab/.{{NewProjectTypeName}}/{{NewProjectTypeName}}.{{NewProjectTypeExt}}.tpl
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions ...non-sso-tab/.{{NewProjectTypeName}}/{{NewProjectTypeName}}.{{NewProjectTypeExt}}.user.tpl
View file
Open in desktop

This file was deleted.

71 changes: 0 additions & 71 deletions templates/csharp/non-sso-tab/.{{NewProjectTypeName}}/{{ProjectName}}.slnLaunch.user.tpl
View file
Open in desktop

This file was deleted.

12 changes: 0 additions & 12 deletions templates/csharp/non-sso-tab/App.razor
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions templates/csharp/non-sso-tab/Components/Hello.razor
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions templates/csharp/non-sso-tab/Interop/InteropModuleBase.cs.tpl
View file
Open in desktop

This file was deleted.

Loading
Loading