diff options
| author | Jeffrey Stedfast <jestedfa@microsoft.com> | 2019-07-31 21:23:20 +0300 |
|---|---|---|
| committer | Jeffrey Stedfast <jestedfa@microsoft.com> | 2019-07-31 21:23:20 +0300 |
| commit | 7b394f6b53c5b5e04be2096fb6e747feafc3077b (patch) | |
| tree | c9aa666a2e08af520c6d1b2f69f8c7ab878e38c5 | |
| parent | 3387b2477286202ce488d27eba9fa65ae3fbd5aa (diff) | |
| parent | fb9dd79ddbd152ebdae6ce01f10a69101c076be1 (diff) | |
Merge branch 'master' into vsts-866545-objectvaluetreeview
| m--------- | main/external/libgit-binary | 0 | ||||
| m--------- | main/external/vs-editor-api | 0 | ||||
| -rw-r--r-- | main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs | 2 | ||||
| -rw-r--r-- | version-checks | 2 |
4 files changed, 2 insertions, 2 deletions
diff --git a/main/external/libgit-binary b/main/external/libgit-binary -Subproject b72bab5726be029f930ece1dd1f49d503d94968 +Subproject 2871279e5d6abe886a571583ae72131fae2ffa5 diff --git a/main/external/vs-editor-api b/main/external/vs-editor-api -Subproject f2439c71580618ad284a768860a9787f90f50a0 +Subproject 5f7f209e67b239bf8a05a63cfd1d90ac2bbd65c diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs index 8036e4da1b..7997a72146 100644 --- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs +++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectService.cs @@ -53,7 +53,7 @@ namespace MonoDevelop.Projects TargetFramework defaultTargetFramework; - string defaultPlatformTarget = "x86"; + string defaultPlatformTarget = "anycpu"; static readonly TargetFrameworkMoniker DefaultTargetFrameworkId = TargetFrameworkMoniker.NET_4_7; public const string BuildTarget = "Build"; diff --git a/version-checks b/version-checks index bbe0134370..b6284130b8 100644 --- a/version-checks +++ b/version-checks @@ -17,7 +17,7 @@ DEP[0]=md-addins DEP_NAME[0]=MDADDINS DEP_PATH[0]=${top_srcdir}/../md-addins DEP_MODULE[0]=git@github.com:xamarin/md-addins.git -DEP_NEEDED_VERSION[0]=dd8af1dec2c5926f36927a878a859ab808b5c430 +DEP_NEEDED_VERSION[0]=f69d5f968f1b0d549818e286daafcf6416fbba9c DEP_BRANCH_AND_REMOTE[0]="master origin/master" # heap-shot |