Skip to content

Commit d782766

Browse files
sevokusevoku
committed
Merge remote-tracking branch 'origin/roslyn-dark-skin'
2 parents ec79e13 + cab3fd8 commit d782766

3,316 files changed

Lines changed: 15610 additions & 6182 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitmodules‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
[submodule "main/external/mono-addins"]
1515
path = main/external/mono-addins
1616
url = git://github.com/mono/mono-addins.git
17+
branch = master
1718
[submodule "main/external/ikvm"]
1819
path = main/external/ikvm
1920
url = git://github.com/mono/ikvm-fork.git

‎.vscode/settings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Local Monodevelop VS Code settings
2+
// Prevents trailing spaces removal and other formatting issues which VSCode usually does.
3+
{
4+
"editor.insertSpaces": false,
5+
"files.trimTrailingWhitespace": false,
6+
"files.insertFinalNewline": false
7+
}

‎main/build/MacOSX/monostub.m‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ int main (int argc, char **argv)
192192
NSString *appDir = [[NSBundle mainBundle] bundlePath];
193193

194194
// can be overridden with plist string MonoMinVersion
195-
NSString *req_mono_version = @"4.2";
195+
NSString *req_mono_version = @"4.3";
196196
// can be overridden with either plist bool MonoUseSGen or MONODEVELOP_USE_SGEN env
197197
bool use_sgen = YES;
198198
bool need64Bit = false;
@@ -248,7 +248,8 @@ int main (int argc, char **argv)
248248

249249
if (libmono == NULL) {
250250
fprintf (stderr, "Failed to load libmono%s-2.0.dylib: %s\n", use_sgen ? "sgen" : "", dlerror ());
251-
exit_with_message ("This application requires the Mono framework.", argv[0]);
251+
NSString *msg = [NSString stringWithFormat:@"This application requires Mono %s or newer.", [req_mono_version UTF8String]];
252+
exit_with_message ((char *)[msg UTF8String], argv[0]);
252253
}
253254

254255
mono_main _mono_main = (mono_main) dlsym (libmono, "mono_main");
@@ -270,8 +271,10 @@ int main (int argc, char **argv)
270271
}
271272

272273
char *mono_version = _mono_get_runtime_build_info ();
273-
if (!check_mono_version (mono_version, [req_mono_version UTF8String]))
274-
exit_with_message ("This application requires a newer version of the Mono framework.", argv[0]);
274+
if (!check_mono_version (mono_version, [req_mono_version UTF8String])) {
275+
NSString *msg = [NSString stringWithFormat:@"This application requires a newer version (%s+) of the Mono framework.", [req_mono_version UTF8String]];
276+
exit_with_message ((char *)[msg UTF8String], argv[0]);
277+
}
275278

276279
extra_argv = get_mono_env_options (&extra_argc);
277280

‎main/external/mono-addins‎

Submodule mono-addins updated 153 files

‎main/external/xwt‎

Submodule xwt updated 79 files

‎main/po/ca.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15646,7 +15646,7 @@ msgid "Print operation failed."
1564615646
msgstr "S'ha produït un error en l'operació d'impressió."
1564715647

1564815648
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185
15649-
msgid "Press 'F2' for focus"
15649+
msgid "Press F2 to focus"
1565015650
msgstr ""
1565115651

1565215652
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185

‎main/po/cs.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15486,7 +15486,7 @@ msgid "Print operation failed."
1548615486
msgstr "Operace tisku selhala."
1548715487

1548815488
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185
15489-
msgid "Press 'F2' for focus"
15489+
msgid "Press F2 to focus"
1549015490
msgstr ""
1549115491

1549215492
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185

‎main/po/da.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16267,7 +16267,7 @@ msgid "Print operation failed."
1626716267
msgstr "Det mislykkedes at gemme."
1626816268

1626916269
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185
16270-
msgid "Press 'F2' for focus"
16270+
msgid "Press F2 to focus"
1627116271
msgstr ""
1627216272

1627316273
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185

‎main/po/de.po‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15305,8 +15305,8 @@ msgid "Print operation failed."
1530515305
msgstr "Druckoperation fehlgeschlagen."
1530615306

1530715307
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185
15308-
msgid "Press 'F2' for focus"
15309-
msgstr "'F2' für Fokus"
15308+
msgid "Press F2 to focus"
15309+
msgstr "F2 für Fokus"
1531015310

1531115311
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185
1531215312
msgid "Clipboard ring"

‎main/po/es.po‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15729,7 +15729,7 @@ msgid "Print operation failed."
1572915729
msgstr "La operación de impresión ha fallado."
1573015730

1573115731
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185
15732-
msgid "Press 'F2' for focus"
15732+
msgid "Press F2 to focus"
1573315733
msgstr ""
1573415734

1573515735
#: ../src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorView.cs:185

0 commit comments

Comments
 (0)