Skip to content

Commit ca78bf8

Browse files
mhutchmhutch
committed
Merge branch 'master' into editor
2 parents be9302c + 2707708 commit ca78bf8

359 files changed

Lines changed: 7126 additions & 4159 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: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,10 @@
1-
[submodule "main/external/mono-tools"]
2-
path = main/external/mono-tools
3-
url = git://github.com/mono/mono-tools.git
4-
[submodule "main/external/mdtestharness"]
5-
path = main/external/mdtestharness
6-
url = git://github.com/mono/mdtestharness.git
7-
[submodule "main/external/nrefactory"]
8-
path = main/external/nrefactory
9-
url = git://github.com/icsharpcode/NRefactory.git
10-
[submodule "main/external/mono-addins"]
11-
path = main/external/mono-addins
12-
url = git://github.com/mono/mono-addins.git
13-
branch = master
141
[submodule "main/external/debugger-libs"]
152
path = main/external/debugger-libs
163
url = git://github.com/mono/debugger-libs.git
174
branch = master
185
[submodule "main/external/guiunit"]
196
path = main/external/guiunit
207
url = git://github.com/mono/guiunit.git
21-
[submodule "main/external/nuget-binary"]
22-
path = main/external/nuget-binary
23-
url = git://github.com/mono/nuget-binary.git
24-
branch = master
25-
[submodule "main/external/xwt"]
26-
path = main/external/xwt
27-
url = git://github.com/mono/xwt
28-
branch = master
29-
[submodule "main/external/sharpsvn-binary"]
30-
path = main/external/sharpsvn-binary
31-
url = git://github.com/mono/sharpsvn-binary.git
32-
[submodule "main/external/libgit2sharp"]
33-
path = main/external/libgit2sharp
34-
url = git://github.com/mono/libgit2sharp.git
35-
branch = xs-5.10-v2
368
[submodule "main/external/libgit-binary"]
379
path = main/external/libgit-binary
3810
url = git://github.com/mono/libgit-binary.git
@@ -41,13 +13,41 @@
4113
path = main/external/libgit2
4214
url = git://github.com/mono/libgit2.git
4315
branch = xs-5.10-v2
16+
[submodule "main/external/libgit2sharp"]
17+
path = main/external/libgit2sharp
18+
url = git://github.com/mono/libgit2sharp.git
19+
branch = xs-5.10-v2
20+
[submodule "main/external/macdoc"]
21+
path = main/external/macdoc
22+
url = git://github.com/xamarin/macdoc
23+
[submodule "main/external/mdtestharness"]
24+
path = main/external/mdtestharness
25+
url = git://github.com/mono/mdtestharness.git
26+
[submodule "main/external/mono-addins"]
27+
path = main/external/mono-addins
28+
url = git://github.com/mono/mono-addins.git
29+
branch = master
30+
[submodule "main/external/mono-tools"]
31+
path = main/external/mono-tools
32+
url = git://github.com/mono/mono-tools.git
33+
[submodule "main/external/nrefactory"]
34+
path = main/external/nrefactory
35+
url = git://github.com/icsharpcode/NRefactory.git
36+
[submodule "main/external/nuget-binary"]
37+
path = main/external/nuget-binary
38+
url = git://github.com/mono/nuget-binary.git
39+
branch = master
4440
[submodule "main/external/RefactoringEssentials"]
4541
path = main/external/RefactoringEssentials
4642
url = git://github.com/mono/RefactoringEssentials.git
4743
branch = monodevelop2
48-
[submodule "main/external/macdoc"]
49-
path = main/external/macdoc
50-
url = git://github.com/xamarin/macdoc
44+
[submodule "main/external/sharpsvn-binary"]
45+
path = main/external/sharpsvn-binary
46+
url = git://github.com/mono/sharpsvn-binary.git
47+
[submodule "main/external/xwt"]
48+
path = main/external/xwt
49+
url = git://github.com/mono/xwt
50+
branch = master
5151
[submodule "main/external/vs-editor-core"]
5252
path = main/external/vs-editor-core
5353
url = ../../xamarin/vs-editor-core.git

‎main/Directory.Build.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@
77
<ReferencesVSEditor Condition=" '$(OS)' == 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Windows.props</ReferencesVSEditor>
88
<ReferencesVSEditor Condition=" '$(OS)' != 'Windows_NT' ">$(RootDirectory)\msbuild\ReferencesVSEditor.Mac.props</ReferencesVSEditor>
99
<ReferencesGtk>$(RootDirectory)\msbuild\ReferencesGtk.props</ReferencesGtk>
10-
<NuGetVersionRoslyn>2.10.0-beta2-63315-04</NuGetVersionRoslyn>
10+
<NuGetVersionRoslyn>2.10.0-beta2-63410-10</NuGetVersionRoslyn>
1111
<NuGetVersionVSEditor>15.8.519</NuGetVersionVSEditor>
12+
<NuGetVersionAllocationAnalyzer>1.0.0.9</NuGetVersionAllocationAnalyzer>
13+
<NuGetVersionErrorProneNetStructs>0.1.2</NuGetVersionErrorProneNetStructs>
14+
<NuGetVersionMonoDevelopAnalyzers>0.1.0.1</NuGetVersionMonoDevelopAnalyzers>
1215
</PropertyGroup>
1316

1417
</Project>

‎main/Main.sln‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -776,16 +776,16 @@ Global
776776
{2C24D515-4A2C-445C-8419-C09231913CFA}.Debug|Any CPU.Build.0 = Debug|Any CPU
777777
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU
778778
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
779-
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
780-
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
779+
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.ActiveCfg = DebugMac|Any CPU
780+
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugMac|Any CPU.Build.0 = DebugMac|Any CPU
781781
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
782782
{2C24D515-4A2C-445C-8419-C09231913CFA}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
783783
{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.ActiveCfg = Release|Any CPU
784784
{2C24D515-4A2C-445C-8419-C09231913CFA}.Release|Any CPU.Build.0 = Release|Any CPU
785785
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
786786
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
787-
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
788-
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
787+
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.ActiveCfg = ReleaseMac|Any CPU
788+
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseMac|Any CPU.Build.0 = ReleaseMac|Any CPU
789789
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
790790
{2C24D515-4A2C-445C-8419-C09231913CFA}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
791791
{CFC02FEC-BDF4-40B9-94D6-35E73F76A92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -1997,16 +1997,16 @@ Global
19971997
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugGnome|Any CPU.Build.0 = Debug|Any CPU
19981998
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|Any CPU.ActiveCfg = Debug|Any CPU
19991999
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugMac|Any CPU.Build.0 = Debug|Any CPU
2000-
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.ActiveCfg = Debug|Any CPU
2001-
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.Build.0 = Debug|Any CPU
2000+
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.ActiveCfg = DebugWin32|Any CPU
2001+
{BD432AE0-B262-4F63-A695-7B86D11B644F}.DebugWin32|Any CPU.Build.0 = DebugWin32|Any CPU
20022002
{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|Any CPU.ActiveCfg = Release|Any CPU
20032003
{BD432AE0-B262-4F63-A695-7B86D11B644F}.Release|Any CPU.Build.0 = Release|Any CPU
20042004
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|Any CPU.ActiveCfg = Release|Any CPU
20052005
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseGnome|Any CPU.Build.0 = Release|Any CPU
20062006
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|Any CPU.ActiveCfg = Release|Any CPU
20072007
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseMac|Any CPU.Build.0 = Release|Any CPU
2008-
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.ActiveCfg = Release|Any CPU
2009-
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.Build.0 = Release|Any CPU
2008+
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.ActiveCfg = ReleaseWin32|Any CPU
2009+
{BD432AE0-B262-4F63-A695-7B86D11B644F}.ReleaseWin32|Any CPU.Build.0 = ReleaseWin32|Any CPU
20102010
{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
20112011
{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.Debug|Any CPU.Build.0 = Debug|Any CPU
20122012
{B3E73DE7-8AFC-429A-9B68-5699B1E63A02}.DebugGnome|Any CPU.ActiveCfg = Debug|Any CPU

0 commit comments

Comments
 (0)