Skip to content

Commit 724d536

Browse files
committed
Clean up documentation management and fix MSBuild Core-only issues.
Flow doc mappings through consumer configs.
1 parent d5b4b63 commit 724d536

3 files changed

Lines changed: 15 additions & 5 deletions

File tree

SharpGen.Doc.Msdn.Tasks/SharpGen.Doc.Msdn.Tasks.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net46;netstandard1.3</TargetFrameworks>
4+
<TargetFrameworks>net46</TargetFrameworks>
55
<PackageId>SharpGen.Doc.Msdn.Tasks</PackageId>
66
<NoPackageAnalysis>true</NoPackageAnalysis>
77
<!-- forces SDK to copy dependencies into build output to make packing easier -->
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Project>
22
<PropertyGroup>
3-
<DocProviderTargets>$(DocProviderTargets);DocumentCppModuleFromMsdn</DocProviderTargets>
3+
<DocProviderTargets>$(DocProviderTargets);DocumentCppModuleFromMsdn;WarnUnableToFetchFromMsdn</DocProviderTargets>
44
</PropertyGroup>
55
</Project>
Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,32 @@
11
<Project>
22
<ItemGroup>
3-
<MsdnDocProvider Include="../tools/netstandard1.3/SharpGen.Doc.Msdn.Tasks.dll" />
3+
<MsdnDocProvider Condition="'$(MSBuildRuntimeType)' == 'Full'" Include="$(MSBuildThisFileDirectory)/../tools/net46/SharpGen.Doc.Msdn.Tasks.dll" />
4+
45
<MsdnDocumentationCheckFile Include="$(SharpGenIntermediateDir)MsdnDocumentation.checkfile" />
56
</ItemGroup>
67

7-
<UsingTask TaskName="MsdnDocTask" AssemblyFile="@(MsdnDocProvider)" />
8+
<UsingTask TaskName="MsdnDocTask" AssemblyFile="@(MsdnDocProvider)" Condition="'@(MsdnDocProvider)' != ''" />
89

910
<Target
1011
Name="DocumentCppModuleFromMsdn"
1112
Inputs="@(ParsedCppModule);@(MsdnDocProvider)"
1213
Outputs="@(MsdnDocumentationCheckFile)"
1314
DependsOnTargets="ParseCPlusPlus"
14-
Condition="'$(SharpGenGenerateDoc)' == 'true' and '@(SharpGenMapping)' != ''" >
15+
Condition="'$(SharpGenGenerateDoc)' == 'true' and '@(SharpGenMapping)' != '' and '$(MSBuildRuntimeType)' == 'Full'" >
1516
<MsdnDocTask
1617
CppModule="@(ParsedCppModule)"
1718
DocumentationCache="@(SharpGenDocumentationCache)"
1819
ShadowCopy="$(ShadowCopyDocumentationOutput)"
20+
1921
/>
2022
<Touch Files="@(MsdnDocumentationCheckFile)" AlwaysCreate="True" />
2123
</Target>
24+
25+
<Target
26+
Name="WarnUnableToFetchFromMsdn"
27+
DependsOnTargets="ParseCPlusPlus"
28+
Condition="'$(MSBuildRuntimeType)' != 'Full'"
29+
>
30+
<Warning Text="Unable to fetch documentation from MSDN when MSBuild is not running on .NET Framework." Code="MDP0001" />
31+
</Target>
2232
</Project>

0 commit comments

Comments
 (0)