Skip to content

Update minimum Mono version to 6.6.0 #3539

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 3 commits into from
Jan 30, 2020
Merged

Update minimum Mono version to 6.6.0 #3539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a92d82
Update minimum Mono version to 6.6.0
JoeRobich Jan 30, 2020
0a87768
Update MonoResolver tests
JoeRobich Jan 30, 2020
ba98810
Update travis yml to install Mono 6.6.0
JoeRobich Jan 30, 2020
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
3 changes: 3 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ language: node_js
node_js:
- "10"

mono:
- latest

env:
- CODE_VERSION=1.33.0

Expand Down
3 changes: 2 additions & 1 deletion src/omnisharp/OmniSharpMonoResolver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import { MonoInformation } from '../constants/MonoInformation';
import { IGetMonoVersion } from '../constants/IGetMonoVersion';

export class OmniSharpMonoResolver implements IMonoResolver {
private minimumMonoVersion = "5.8.1";
private minimumMonoVersion = "6.6.0";

constructor(private getMonoVersion: IGetMonoVersion) {
}

Expand Down
36 changes: 21 additions & 15 deletions test/unitTests/omnisharp/OmniSharpMonoResolver.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,13 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
let getMonoCalled: boolean;
let environment: NodeJS.ProcessEnv;
let options: Options;

const monoPath = "monoPath";

const lowerMonoVersion = "6.4.0";
const requiredMonoVersion = "6.6.0";
const higherMonoVersion = "6.8.0";

const getMono = (version: string) => async(env: NodeJS.ProcessEnv) => {
getMonoCalled = true;
environment = env;
Expand All @@ -28,8 +34,8 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
options = getEmptyOptions();
});

test("it returns undefined if the version is less than 5.8.1 and useGlobalMono is auto", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.0.0"));
test(`it returns undefined if the version is less than ${requiredMonoVersion} and useGlobalMono is auto`, async () => {
let monoResolver = new OmniSharpMonoResolver(getMono(lowerMonoVersion));
let monoInfo = await monoResolver.getGlobalMonoInfo({
...options,
useGlobalMono: "auto",
Expand All @@ -39,7 +45,7 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
});

test("it returns undefined if useGlobalMono is never", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.8.2"));
let monoResolver = new OmniSharpMonoResolver(getMono(higherMonoVersion));
let monoInfo = await monoResolver.getGlobalMonoInfo({
...options,
useGlobalMono: "never",
Expand All @@ -48,32 +54,32 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
expect(monoInfo).to.be.undefined;
});

test("it returns the path and version if the version is greater than or equal to 5.8.1 and getGlobalMonoInfo is always", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.8.1"));
test(`it returns the path and version if the version is greater than or equal to ${requiredMonoVersion} and getGlobalMonoInfo is always`, async () => {
let monoResolver = new OmniSharpMonoResolver(getMono(requiredMonoVersion));
let monoInfo = await monoResolver.getGlobalMonoInfo({
...options,
useGlobalMono: "always",
monoPath: monoPath
});

expect(monoInfo.version).to.be.equal("5.8.1");
expect(monoInfo.version).to.be.equal(requiredMonoVersion);
expect(monoInfo.path).to.be.equal(monoPath);
});

test("it returns the path and version if the version is greater than or equal to 5.8.1 and getGlobalMonoInfo is auto", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.8.2"));
test(`it returns the path and version if the version is greater than or equal to ${requiredMonoVersion} and getGlobalMonoInfo is auto`, async () => {
let monoResolver = new OmniSharpMonoResolver(getMono(higherMonoVersion));
let monoInfo = await monoResolver.getGlobalMonoInfo({
...options,
useGlobalMono: "auto",
monoPath: monoPath
});

expect(monoInfo.version).to.be.equal("5.8.2");
expect(monoInfo.version).to.be.equal(higherMonoVersion);
expect(monoInfo.path).to.be.equal(monoPath);
});

test("it throws exception if getGlobalMonoInfo is always and version<5.8.1", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.8.0"));
test(`it throws exception if getGlobalMonoInfo is always and version<${requiredMonoVersion}`, async () => {
let monoResolver = new OmniSharpMonoResolver(getMono(lowerMonoVersion));

await expect(monoResolver.getGlobalMonoInfo({
...options,
Expand All @@ -83,7 +89,7 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
});

test("sets the environment with the monoPath id useGlobalMono is auto", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.8.1"));
let monoResolver = new OmniSharpMonoResolver(getMono(requiredMonoVersion));
let monoInfo = await monoResolver.getGlobalMonoInfo({
...options,
useGlobalMono: "auto",
Expand All @@ -95,7 +101,7 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
});

test("sets the environment with the monoPath id useGlobalMono is always", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.8.1"));
let monoResolver = new OmniSharpMonoResolver(getMono(requiredMonoVersion));
let monoInfo = await monoResolver.getGlobalMonoInfo({
...options,
useGlobalMono: "auto",
Expand All @@ -107,7 +113,7 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
});

test("doesn't set the environment with the monoPath if useGlobalMono is never", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.8.1"));
let monoResolver = new OmniSharpMonoResolver(getMono(requiredMonoVersion));
await monoResolver.getGlobalMonoInfo({
...options,
useGlobalMono: "never",
Expand All @@ -120,7 +126,7 @@ suite(`${OmniSharpMonoResolver.name}`, () => {
});

test("getMono is called with the environment that includes the monoPath if the useGlobalMono is auto or always", async () => {
let monoResolver = new OmniSharpMonoResolver(getMono("5.8.1"));
let monoResolver = new OmniSharpMonoResolver(getMono(requiredMonoVersion));
await monoResolver.getGlobalMonoInfo({
...options,
useGlobalMono: "auto",
Expand Down