Skip to content

Commit

Permalink
Fixed parallel build (dnnsoftware#2562)
Browse files Browse the repository at this point in the history
* Set active Nuget package source to All

* Fixed parallel build
  • Loading branch information
daguiler authored and zyhfish committed Mar 29, 2019
1 parent 3c684a5 commit e05619d
Show file tree
Hide file tree
Showing 24 changed files with 37 additions and 31 deletions.
3 changes: 3 additions & 0 deletions .nuget/NuGet.Config
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@
<add key="enabled" value="true" />
<add key="automatic" value="true" />
</solution>
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
<packageSources>
<add key="NuGet" value="https://api.nuget.org/v3/index.json" />
<add key="MyGet" value="https://www.myget.org/F/dnn-software-public/api/v2" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -162,12 +162,12 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -296,13 +296,13 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Name>DotNetNuke.Library</Name>
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -228,12 +228,12 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -204,13 +204,13 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Name>DotNetNuke.Library</Name>
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Private>False</Private>
</ProjectReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,12 +141,12 @@
<Name>DotNetNuke.Web.Client</Name>
</ProjectReference>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,12 +165,12 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -262,11 +262,11 @@
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
<Private>False</Private>
</ProjectReference>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<Name>DotNetNuke.Instrumentation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\..\Providers\ClientCapabilityProviders\Provider.AspNetCCP\DotNetNuke.Providers.AspNetCCP.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\..\Providers\AuthenticationProviders\DotNetNuke.Authentication.Facebook\DotNetNuke.Authentication.Facebook.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<Name>DotNetNuke.Web</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\DotNetNuke.Tests.Data\DotNetNuke.Tests.Data.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\DotNetNuke.Tests.Utilities\DotNetNuke.Tests.Utilities.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@
<Name>DotNetNuke.Instrumentation</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\DNN.Integration.Test.Framework\DNN.Integration.Test.Framework.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{B1699614-39D4-468A-AB1D-A2FBA97CADDF}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\DotNetNuke.Tests.Utilities\DotNetNuke.Tests.Utilities.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\DotNetNuke.Tests.Utilities\DotNetNuke.Tests.Utilities.csproj">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,11 +117,11 @@
<Name>DotNetNuke.Log4Net</Name>
</ProjectReference>
<ProjectReference Include="..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{8DA31B98-5E8E-4243-8967-D4CF7DC622CB}</Project>
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
</ProjectReference>
<ProjectReference Include="..\..\Library\DotNetNuke.Library.csproj">
<Project>{D391550C-7107-49B2-A6AC-8627C8B06ADC}</Project>
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
<ProjectReference Include="..\DotNetNuke.Tests.Utilities\DotNetNuke.Tests.Utilities.csproj">
Expand Down
3 changes: 3 additions & 0 deletions DNN_Platform.sln
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Integration", "Integration", "{7E98CA08-903E-45F7-BD83-853763D5E15B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Tests.Urls", "DNN Platform\Tests\DotNetNuke.Tests.Urls\DotNetNuke.Tests.Urls.csproj", "{F9CE7C63-C729-4E3A-A266-6B23D75A1247}"
ProjectSection(ProjectDependencies) = postProject
{3D9C3F5F-1D2D-4D89-995B-438055A5E3A6} = {3D9C3F5F-1D2D-4D89-995B-438055A5E3A6}
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Tests.AspNetCCP", "DNN Platform\Tests\DotNetNuke.Tests.AspNetCCP\DotNetNuke.Tests.AspNetCCP.csproj", "{64BA74E9-411E-4DC1-91CB-DEF7F22468AD}"
EndProject
Expand Down

0 comments on commit e05619d

Please sign in to comment.