Skip to content

[xapreapre] Generate omnisharp.json for the current branch #7166

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
merged 4 commits into from
Jul 13, 2022
Merged

[xapreapre] Generate omnisharp.json for the current branch #7166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fbb209a
[xapreapre] Generate omnisharp.json for the current branch
grendello Jul 12, 2022
9e20a11
No trailing commas for JSON
grendello Jul 12, 2022
8dbb032
Merge sections, because JSON won't
grendello Jul 12, 2022
7fa4a0e
Unify indentation
grendello Jul 12, 2022
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,4 @@ tests/api-compatibility/reference/*.cs
Novell
*.patch
*.keystore
/omnisharp.json
Copy link
Contributor

@jonpryor jonpryor Jul 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this line need a leading /?

Copy link
Contributor Author

@grendello grendello Jul 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We create the file in the root directory only, I figured other directories may get their own locally created config files and we shouldn't hide them

17 changes: 17 additions & 0 deletions build-tools/scripts/omnisharp.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"msbuild": {
"loadProjectsOnDemand": true,
"Configuration": "@CONFIGURATION@"
},

"RenameOptions": {
"RenameInComments": false,
"RenameOverloads": true,
"RenameInStrings": false
},

"sdk": {
"IncludePreleases": true,
"Path": "@DOTNET_SDK_PATH@"
}
}
17 changes: 17 additions & 0 deletions build-tools/xaprepare/xaprepare/Steps/Step_GenerateFiles.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ protected override async Task<bool> Execute (Context context)
Get_mingw_32_cmake (context),
Get_mingw_64_cmake (context),
Get_MonoGitHash_props (context),
Get_Omnisharp_Json (context),
};
}
}
Expand Down Expand Up @@ -237,5 +238,21 @@ public GeneratedFile Get_MonoGitHash_props (Context context)
Path.Combine (Configurables.Paths.BuildBinDir, OutputFileName)
);
}

public GeneratedFile Get_Omnisharp_Json (Context context)
{
const string OutputFileName = "omnisharp.json";

var replacements = new Dictionary<string, string> (StringComparer.Ordinal) {
{ "@CONFIGURATION@", context.Configuration },
{ "@DOTNET_SDK_PATH@", Path.Combine (Configurables.Paths.DotNetPreviewPath, "sdk", context.Properties.GetRequiredValue (KnownProperties.MicrosoftDotnetSdkInternalPackageVersion)) },
};

return new GeneratedPlaceholdersFile (
replacements,
Path.Combine (Configurables.Paths.BuildToolsScriptsDir, $"{OutputFileName}.in"),
Path.Combine (BuildPaths.XamarinAndroidSourceRoot, OutputFileName)
);
}
}
}