Skip to content

[xaprepare] Delete redundant Windows JdkInfo.props generator#11946

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

Merged
jonathanpeppers merged 1 commit into from
Jul 1, 2026
Merged

[xaprepare] Delete redundant Windows JdkInfo.props generator #11946

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
21 changes: 0 additions & 21 deletions build-tools/xaprepare/xaprepare/Resources/JdkInfo.Windows.props.in
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions build-tools/xaprepare/xaprepare/Scenarios/Scenario_Standard.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -19,11 +19,5 @@ protected override void AddSteps (Context context)

Steps.Add (new Step_GenerateFiles (atBuildStart: true));
}

protected override void AddEndSteps (Context context)
{
Steps.Add (new Step_GenerateFiles (atBuildStart: false));
}

}
}
39 changes: 0 additions & 39 deletions build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.Windows.cs
View file
Open in desktop

This file was deleted.

21 changes: 5 additions & 16 deletions build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,28 +41,17 @@ protected override Task<bool> Execute (Context context)

List<GeneratedFile>? GetFilesToGenerate (Context context)
{
if (atBuildStart) {
if (onlyRequired) {
return null;
} else {
return new List <GeneratedFile> {
Get_Configuration_OperatingSystem_props (context),
};
}
}
if (!atBuildStart)
return null;

if (onlyRequired)
return null;

var steps = new List <GeneratedFile> ();

AddOSSpecificSteps (context, steps);

return steps;
return new List <GeneratedFile> {
Get_Configuration_OperatingSystem_props (context),
};
}

partial void AddOSSpecificSteps (Context context, List<GeneratedFile> steps);

GeneratedFile Get_Configuration_OperatingSystem_props (Context context)
{
const string OutputFileName = "Configuration.OperatingSystem.props";
Expand Down