Skip to content

Commit 101c591

Browse files
author
ArthurHub
committed
* use MSBuild to create Multi-Target dlls
1 parent 17f5a15 commit 101c591

File tree

5 files changed

+8
-423
lines changed

5 files changed

+8
-423
lines changed

‎Build/build.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99
<LibRoot>$(SourceRoot)\HtmlRenderer</LibRoot>
1010
<DemoRoot>$(SourceRoot)\Demo</DemoRoot>
1111
<BuildWarn>WarningLevel=0</BuildWarn>
12+
<Build20>TargetFrameworkVersion=v2.0</Build20>
13+
<Build35>TargetFrameworkVersion=v3.5;TargetFrameworkProfile=client</Build35>
14+
<Build40>TargetFrameworkVersion=v4.0;TargetFrameworkProfile=client</Build40>
15+
<Build45>TargetFrameworkVersion=v4.5</Build45>
1216
<BuildProperties>Configuration=Release</BuildProperties>
1317
<BuildOutputPath>OutputPath=..\..\Build\$(OutputBinRoot)</BuildOutputPath>
1418
<DemoBuildOutputPath>OutputPath=..\..\Build\$(OutputRoot)</DemoBuildOutputPath>
@@ -64,16 +68,16 @@
6468
<!--Build all the multi-target dlls of the library-->
6569
<Target Name="BuildLibrary">
6670
<Message Importance="high" Text="====================== Build .NET 2.0..."/>
67-
<MSBuild Properties="$(BuildProperties);$(BuildOutputPath)\NET20;$(BuildWarn)" UseResultsCache="true" Targets="Rebuild" Projects="$(LibRoot)\HtmlRenderer.csproj" />
71+
<MSBuild Properties="$(BuildProperties);$(BuildOutputPath)\NET20;$(BuildWarn);$(Build20)" UseResultsCache="true" Targets="Rebuild" Projects="$(LibRoot)\HtmlRenderer.csproj" />
6872

6973
<Message Importance="high" Text="====================== Build .NET 3.5..."/>
70-
<MSBuild Properties="$(BuildProperties);$(BuildOutputPath)\NET35;$(BuildWarn)" Targets="Rebuild" Projects="$(LibRoot)\HtmlRendererNET35.csproj" />
74+
<MSBuild Properties="$(BuildProperties);$(BuildOutputPath)\NET35;$(BuildWarn);$(Build35)" Targets="Rebuild" Projects="$(LibRoot)\HtmlRenderer.csproj" />
7175

7276
<Message Importance="high" Text="====================== Build .NET 4.0..."/>
73-
<MSBuild Properties="$(BuildProperties);$(BuildOutputPath)\NET40;$(BuildWarn)" Targets="Rebuild" Projects="$(LibRoot)\HtmlRendererNET40.csproj" />
77+
<MSBuild Properties="$(BuildProperties);$(BuildOutputPath)\NET40;$(BuildWarn);$(Build40)" Targets="Rebuild" Projects="$(LibRoot)\HtmlRenderer.csproj" />
7478

7579
<Message Importance="high" Text="====================== Build .NET 4.5..."/>
76-
<MSBuild Properties="$(BuildProperties);$(BuildOutputPath)\NET45;$(BuildWarn)" Targets="Rebuild" Projects="$(LibRoot)\HtmlRendererNET45.csproj" />
80+
<MSBuild Properties="$(BuildProperties);$(BuildOutputPath)\NET45;$(BuildWarn);$(Build45)" Targets="Rebuild" Projects="$(LibRoot)\HtmlRenderer.csproj" />
7781
</Target>
7882

7983
<!--Get current version-->

‎Source/HtmlRenderer.sln‎

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer.Demo", "Demo\H
55
EndProject
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRenderer", "HtmlRenderer\HtmlRenderer.csproj", "{1B058920-24B4-4140-8AE7-C8C6C38CA52D}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRendererNET45", "HtmlRenderer\HtmlRendererNET45.csproj", "{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}"
9-
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MultiTarget", "MultiTarget", "{1BED3EBA-15BF-4AEC-A03C-581D5F1C4DD5}"
11-
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRendererNET35", "HtmlRenderer\HtmlRendererNET35.csproj", "{06CFAAB3-459A-46F1-982B-CE0D62483AC7}"
13-
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlRendererNET40", "HtmlRenderer\HtmlRendererNET40.csproj", "{73A762F1-C802-4659-9B3E-2BF6B284E606}"
15-
EndProject
168
Global
179
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1810
Debug|Any CPU = Debug|Any CPU
@@ -43,43 +35,8 @@ Global
4335
{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
4436
{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
4537
{1B058920-24B4-4140-8AE7-C8C6C38CA52D}.Release|x86.ActiveCfg = Release|Any CPU
46-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
47-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Debug|Any CPU.Build.0 = Debug|Any CPU
48-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
49-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
50-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Debug|x86.ActiveCfg = Debug|Any CPU
51-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Release|Any CPU.ActiveCfg = Release|Any CPU
52-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Release|Any CPU.Build.0 = Release|Any CPU
53-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
54-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Release|Mixed Platforms.Build.0 = Release|Any CPU
55-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934}.Release|x86.ActiveCfg = Release|Any CPU
56-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
58-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
59-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
60-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Debug|x86.ActiveCfg = Debug|Any CPU
61-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
62-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Release|Any CPU.Build.0 = Release|Any CPU
63-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
64-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Release|Mixed Platforms.Build.0 = Release|Any CPU
65-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7}.Release|x86.ActiveCfg = Release|Any CPU
66-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
67-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Debug|Any CPU.Build.0 = Debug|Any CPU
68-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
69-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
70-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Debug|x86.ActiveCfg = Debug|Any CPU
71-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Release|Any CPU.ActiveCfg = Release|Any CPU
72-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Release|Any CPU.Build.0 = Release|Any CPU
73-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
74-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Release|Mixed Platforms.Build.0 = Release|Any CPU
75-
{73A762F1-C802-4659-9B3E-2BF6B284E606}.Release|x86.ActiveCfg = Release|Any CPU
7638
EndGlobalSection
7739
GlobalSection(SolutionProperties) = preSolution
7840
HideSolutionNode = FALSE
7941
EndGlobalSection
80-
GlobalSection(NestedProjects) = preSolution
81-
{6018296C-7FE3-40A4-A8CC-28D8DA1FD934} = {1BED3EBA-15BF-4AEC-A03C-581D5F1C4DD5}
82-
{06CFAAB3-459A-46F1-982B-CE0D62483AC7} = {1BED3EBA-15BF-4AEC-A03C-581D5F1C4DD5}
83-
{73A762F1-C802-4659-9B3E-2BF6B284E606} = {1BED3EBA-15BF-4AEC-A03C-581D5F1C4DD5}
84-
EndGlobalSection
8542
EndGlobal

‎Source/HtmlRenderer/HtmlRendererNET35.csproj‎

Lines changed: 0 additions & 125 deletions
This file was deleted.

‎Source/HtmlRenderer/HtmlRendererNET40.csproj‎

Lines changed: 0 additions & 126 deletions
This file was deleted.

0 commit comments

Comments
 (0)