Skip to content

Commit f09dfa9

Browse files
thargythargy
committed
#1 MSBuild command line does not respect solution build order dependencies, so these are now added explicitly per project.
1 parent fb9bd54 commit f09dfa9

9 files changed

+56
-27
lines changed

Diff for: ‎CoreLibraries.sln

-25
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,6 @@ EndProject
1616
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Testing.Test", "Testing\WebApplications.Testing.Test\WebApplications.Testing.Test.csproj", "{CBE3CF94-6406-4EED-AADA-3E6B441B1DE3}"
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities", "Utilities\WebApplications.Utilities.csproj", "{2931C698-6123-49BC-81FD-F72A4C1415EA}"
19-
ProjectSection(ProjectDependencies) = postProject
20-
{CA6C3C0E-96DB-4B74-A8E4-33ABA73D0553} = {CA6C3C0E-96DB-4B74-A8E4-33ABA73D0553}
21-
{3626816D-EB33-4ED0-AF95-FD7CA6C6D99A} = {3626816D-EB33-4ED0-AF95-FD7CA6C6D99A}
22-
EndProjectSection
2319
EndProject
2420
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.BuildTasks", "Utilities\WebApplications.Utilities.BuildTasks\WebApplications.Utilities.BuildTasks.csproj", "{CA6C3C0E-96DB-4B74-A8E4-33ABA73D0553}"
2521
EndProject
@@ -34,9 +30,6 @@ EndProject
3430
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Cryptography.Test", "Cryptography\WebApplications.Utilities.Cryptography.Test\WebApplications.Utilities.Cryptography.Test.csproj", "{0A67DBB5-780E-4BC6-841E-E1B50309895D}"
3531
EndProject
3632
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer", "Initializer\WebApplications.Utilities.Initializer.csproj", "{3626816D-EB33-4ED0-AF95-FD7CA6C6D99A}"
37-
ProjectSection(ProjectDependencies) = postProject
38-
{D45DFBAF-5019-4435-80FB-1FA2EC48F23A} = {D45DFBAF-5019-4435-80FB-1FA2EC48F23A}
39-
EndProjectSection
4033
EndProject
4134
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer.Test", "Initializer\WebApplications.Utilities.Initializer.Test\WebApplications.Utilities.Initializer.Test.csproj", "{1F4CFF76-3151-460B-B1A4-2E77EEF20029}"
4235
EndProject
@@ -49,35 +42,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Targets", "Targets", "{E3E4
4942
EndProjectSection
5043
EndProject
5144
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Initializer.TestApp", "Initializer\WebApplications.Utilities.Initializer.TestApp\WebApplications.Utilities.Initializer.TestApp.csproj", "{B32CE846-8FAF-4B89-9A17-22B4427133C9}"
52-
ProjectSection(ProjectDependencies) = postProject
53-
{3626816D-EB33-4ED0-AF95-FD7CA6C6D99A} = {3626816D-EB33-4ED0-AF95-FD7CA6C6D99A}
54-
EndProjectSection
5545
EndProject
5646
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance", "Performance\WebApplications.Utilities.Performance.csproj", "{04220E31-53F6-453F-80C5-0E2D49776D36}"
57-
ProjectSection(ProjectDependencies) = postProject
58-
{6F2B5D7A-E8B7-4820-9C39-30F722B0DB01} = {6F2B5D7A-E8B7-4820-9C39-30F722B0DB01}
59-
EndProjectSection
6047
EndProject
6148
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance.Test", "Performance\WebApplications.Utilities.Performance.Test\WebApplications.Utilities.Performance.Test.csproj", "{2A45DCFA-A60C-4AE6-80E8-18D62D04E438}"
6249
EndProject
6350
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Performance.Tools.PerfSetup", "Performance\WebApplications.Utilities.Performance.Tools.PerfSetup\WebApplications.Utilities.Performance.Tools.PerfSetup.csproj", "{6F2B5D7A-E8B7-4820-9C39-30F722B0DB01}"
64-
ProjectSection(ProjectDependencies) = postProject
65-
{D45DFBAF-5019-4435-80FB-1FA2EC48F23A} = {D45DFBAF-5019-4435-80FB-1FA2EC48F23A}
66-
EndProjectSection
6751
EndProject
6852
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILMerge.Build.Task", "ILMerge\ILMerge.Build.Task.csproj", "{D45DFBAF-5019-4435-80FB-1FA2EC48F23A}"
69-
ProjectSection(ProjectDependencies) = postProject
70-
{CA6C3C0E-96DB-4B74-A8E4-33ABA73D0553} = {CA6C3C0E-96DB-4B74-A8E4-33ABA73D0553}
71-
EndProjectSection
7253
EndProject
7354
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Serialization", "Serialization\WebApplications.Utilities.Serialization.csproj", "{686798D4-CC9C-460F-937F-28933CC53E09}"
7455
EndProject
7556
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Serialization.Test", "Serialization\Utilities.Serialization.Test\WebApplications.Utilities.Serialization.Test.csproj", "{D118B240-3DCE-46E3-A721-751B60E003B1}"
7657
EndProject
7758
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Logging", "Logging\WebApplications.Utilities.Logging.csproj", "{0EBA7604-0BDB-438E-967F-7DFE93E6ABD5}"
78-
ProjectSection(ProjectDependencies) = postProject
79-
{3626816D-EB33-4ED0-AF95-FD7CA6C6D99A} = {3626816D-EB33-4ED0-AF95-FD7CA6C6D99A}
80-
EndProjectSection
8159
EndProject
8260
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Logging.Test", "Logging\WebApplications.Utilities.Logging.Test\WebApplications.Utilities.Logging.Test.csproj", "{4B05B106-0F92-46D0-B129-107D0D05F48A}"
8361
EndProject
@@ -92,9 +70,6 @@ EndProject
9270
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Database.Test", "Database\WebApplications.Utilities.Database.Test\WebApplications.Utilities.Database.Test.csproj", "{8C6554DF-D0FE-48B5-B487-19882850AC69}"
9371
EndProject
9472
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service", "Service\WebApplications.Utilities.Service.csproj", "{B580A145-6DE0-45D4-B4B6-924A52BF10B7}"
95-
ProjectSection(ProjectDependencies) = postProject
96-
{839D6111-FFE7-4498-928C-75054DE61CE9} = {839D6111-FFE7-4498-928C-75054DE61CE9}
97-
EndProjectSection
9873
EndProject
9974
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebApplications.Utilities.Service.Common", "Service\WebApplications.Utilities.Service.Common\WebApplications.Utilities.Service.Common.csproj", "{B365AD50-598A-4D1B-8656-1F0F8ADCDBC8}"
10075
EndProject

Diff for: ‎ILMerge/ILMerge.Build.Task.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,13 @@
2626
<None Include="app.config" />
2727
<None Include="packages.config" />
2828
</ItemGroup>
29+
<ItemGroup>
30+
<ProjectReference Include="..\Utilities\WebApplications.Utilities.BuildTasks\WebApplications.Utilities.BuildTasks.csproj">
31+
<Project>{ca6c3c0e-96db-4b74-a8e4-33aba73d0553}</Project>
32+
<Name>WebApplications.Utilities.BuildTasks</Name>
33+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
34+
</ProjectReference>
35+
</ItemGroup>
2936
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
3037
Other similar extension points exist, see Microsoft.Common.targets.
3138
<Target Name="BeforeBuild">

Diff for: ‎Initializer/WebApplications.Utilities.Initializer.TestApp/WebApplications.Utilities.Initializer.TestApp.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121
<Compile Include="ModuleInitializer.cs" />
2222
<Compile Include="Properties\AssemblyInfo.cs" />
2323
</ItemGroup>
24+
<ItemGroup>
25+
<ProjectReference Include="..\WebApplications.Utilities.Initializer.csproj">
26+
<Project>{3626816d-eb33-4ed0-af95-fd7ca6c6d99a}</Project>
27+
<Name>WebApplications.Utilities.Initializer</Name>
28+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
29+
</ProjectReference>
30+
</ItemGroup>
2431
<PropertyGroup>
2532
<InjectModuleInitializerTool>$(SolutionDir)bin\WebApplications.Utilities.Initializer.dll</InjectModuleInitializerTool>
2633
</PropertyGroup>

Diff for: ‎Initializer/WebApplications.Utilities.Initializer.csproj

+7-1
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,16 @@
7575
<Visible>False</Visible>
7676
</RootBinPath>
7777
</ItemGroup>
78+
<ItemGroup>
79+
<ProjectReference Include="..\ILMerge\ILMerge.Build.Task.csproj">
80+
<Project>{d45dfbaf-5019-4435-80fb-1fa2ec48f23a}</Project>
81+
<Name>ILMerge.Build.Task</Name>
82+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
83+
</ProjectReference>
84+
</ItemGroup>
7885
<Target Name="CopyToRoot" AfterTargets="AfterBuild;SignOutput">
7986
<Copy SourceFiles="$(MergedOutputFile)" DestinationFiles="@(RootBinPath)" />
8087
</Target>
81-
8288
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
8389
Other similar extension points exist, see Microsoft.Common.targets.
8490
<Target Name="BeforeBuild">

Diff for: ‎Logging/WebApplications.Utilities.Logging.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,11 @@
8585
</EmbeddedResource>
8686
</ItemGroup>
8787
<ItemGroup>
88+
<ProjectReference Include="..\Initializer\WebApplications.Utilities.Initializer.csproj">
89+
<Project>{3626816d-eb33-4ed0-af95-fd7ca6c6d99a}</Project>
90+
<Name>WebApplications.Utilities.Initializer</Name>
91+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
92+
</ProjectReference>
8893
<ProjectReference Include="..\Performance\WebApplications.Utilities.Performance.csproj">
8994
<Project>{04220e31-53f6-453f-80c5-0e2d49776d36}</Project>
9095
<Name>WebApplications.Utilities.Performance</Name>

Diff for: ‎Performance/WebApplications.Utilities.Performance.Tools.PerfSetup/WebApplications.Utilities.Performance.Tools.PerfSetup.csproj

+8-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<PlatformTarget>x86</PlatformTarget>
3232
<ErrorReport>prompt</ErrorReport>
3333
<MergedOutputFileName>PerfSetup32.exe</MergedOutputFileName>
34-
<Platform>x86</Platform>
34+
<Platform>x86</Platform>
3535
</PropertyGroup>
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
3737
<DebugSymbols>true</DebugSymbols>
@@ -145,6 +145,13 @@
145145
<Visible>False</Visible>
146146
</RootBinPath>
147147
</ItemGroup>
148+
<ItemGroup>
149+
<ProjectReference Include="..\..\ILMerge\ILMerge.Build.Task.csproj">
150+
<Project>{d45dfbaf-5019-4435-80fb-1fa2ec48f23a}</Project>
151+
<Name>ILMerge.Build.Task</Name>
152+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
153+
</ProjectReference>
154+
</ItemGroup>
148155
<Target Name="CopyToRoot" AfterTargets="AfterBuild;SignOutput">
149156
<Copy SourceFiles="$(MergedOutputFile)" DestinationFolder="$(SolutionDir)bin" />
150157
</Target>

Diff for: ‎Performance/WebApplications.Utilities.Performance.csproj

+5
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,11 @@
6464
<Project>{2931c698-6123-49bc-81fd-f72a4c1415ea}</Project>
6565
<Name>WebApplications.Utilities</Name>
6666
</ProjectReference>
67+
<ProjectReference Include="WebApplications.Utilities.Performance.Tools.PerfSetup\WebApplications.Utilities.Performance.Tools.PerfSetup.csproj">
68+
<Project>{6f2b5d7a-e8b7-4820-9c39-30f722b0db01}</Project>
69+
<Name>WebApplications.Utilities.Performance.Tools.PerfSetup</Name>
70+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
71+
</ProjectReference>
6772
</ItemGroup>
6873
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
6974
Other similar extension points exist, see Microsoft.Common.targets.

Diff for: ‎Service/WebApplications.Utilities.Service.csproj

+10
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,16 @@
8686
<Project>{2931c698-6123-49bc-81fd-f72a4c1415ea}</Project>
8787
<Name>WebApplications.Utilities</Name>
8888
</ProjectReference>
89+
<ProjectReference Include="ServiceClient\ServiceClient.csproj">
90+
<Project>{12fe7e65-e744-4f7f-a7eb-608249c75235}</Project>
91+
<Name>ServiceClient</Name>
92+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
93+
</ProjectReference>
94+
<ProjectReference Include="WebApplications.Utilities.Service.Client\WebApplications.Utilities.Service.Client.csproj">
95+
<Project>{839d6111-ffe7-4498-928c-75054de61ce9}</Project>
96+
<Name>WebApplications.Utilities.Service.Client</Name>
97+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
98+
</ProjectReference>
8999
<ProjectReference Include="WebApplications.Utilities.Service.Common\WebApplications.Utilities.Service.Common.csproj">
90100
<Project>{b365ad50-598a-4d1b-8656-1f0f8adcdbc8}</Project>
91101
<Name>WebApplications.Utilities.Service.Common</Name>

Diff for: ‎Utilities/WebApplications.Utilities.csproj

+7
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,13 @@
350350
<LastGenOutput>Funcs.cs</LastGenOutput>
351351
</None>
352352
</ItemGroup>
353+
<ItemGroup>
354+
<ProjectReference Include="..\Initializer\WebApplications.Utilities.Initializer.csproj">
355+
<Project>{3626816d-eb33-4ed0-af95-fd7ca6c6d99a}</Project>
356+
<Name>WebApplications.Utilities.Initializer</Name>
357+
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
358+
</ProjectReference>
359+
</ItemGroup>
353360
<PropertyGroup>
354361
<InjectModuleInitializerTool>$(SolutionDir)bin\WebApplications.Utilities.Initializer.dll</InjectModuleInitializerTool>
355362
</PropertyGroup>

0 commit comments

Comments
 (0)