Compare commits

...
Author SHA1 Message Date
Martin Baulig 4d8ba16204 Bump ikvm to pick up my System.Numerics.dll fix.
This is a Mono 3.2.3 only fix.  Don't merge this into master because
master is using a new, improved code path for this.
2013-09-24 17:40:40 +02:00
Martin Baulig 5ba8461cac [xbuild]: Actually add the $(TargetFrameworkMonikerAssemblyAttributesPath) to @(Compile). 2013-09-20 16:56:45 +02:00
Larry O'Brien b3caba3fce [mdoc] Switched from swallowing error to guarded execution
Improves a60ff0fd1e

Tests for file existence and outputs diagnostic rather than treating it as a local recoverable exception.

Leaving the question of general mdoc error-reporting for another day.
2013-09-16 16:49:12 -04:00
Larry O'Brien 23552fa7e7 Bugzilla 14672 (mdoc namespace-level summary and remarks elements weren't being included)
commit 6ec0ddc7e5c4d5640da7420600898c10578a7974
Author: Larry O'Brien <[email protected]>
Date:   Sun Sep 15 11:03:32 2013 -1000

    Coding style

commit f034514fca8298a8ed2a167f3ab288f32bc7c74f
Author: Larry O'Brien <[email protected]>
Date:   Sun Sep 15 10:28:47 2013 -1000

    Bugzilla 14672

    Added namespace file ("ns-{namespace}.xml") summary and remarks into the nsSummaries, which results in displaying the data prior to the namespace type-list when the user searches at the namespace level.

    Appears to only be necessary for native viewer (Web viewer for some reason "knows" about the summaries).
2013-09-16 16:49:11 -04:00
Duncan Mak 2ea33c56be Trigger a build 2013-09-13 12:36:56 -04:00
3 changed files with 15 additions and 1 deletions

No files matched your search

+1 -1
@@ -54,7 +54,17 @@ namespace Monodoc.Providers
nsSummaries[nsName] = nsElements = new XElement ("elements",
new XElement ("summary"),
new XElement ("remarks"));
//Add namespace summary and remarks data from file, if available
var nsFileName = Path.Combine(asm, String.Format("ns-{0}.xml", nsName));
if(File.Exists(nsFileName)){
var nsEl = XElement.Load (nsFileName);
nsElements.Element ("summary").ReplaceWith (nsEl.Descendants ("summary").First ());
nsElements.Element ("remarks").ReplaceWith (nsEl.Descendants ("remarks").First ());
}else{
Console.WriteLine ("Error reading namespace XML for " + nsName);
}
foreach (var type in ns.Elements ("Type")) {
// Add the XML file corresponding to the type to our storage
var id = indexGenerator (type);
@@ -250,6 +250,10 @@
ContinueOnError="true"
Condition="'@(Compile)' != '' and '$(TargetFrameworkMonikerAssemblyAttributeText)' != ''"
/>
<ItemGroup Condition="'@(Compile)' != '' and '$(TargetFrameworkMonikerAssemblyAttributeText)' != ''">
<Compile Include="$(TargetFrameworkMonikerAssemblyAttributesPath)"/>
</ItemGroup>
</Target>
<Target Name="ResolveReferences" DependsOnTargets="$(ResolveReferencesDependsOn)"/>