mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #1100 from dotnet/anurse/1093-fix-shared-source-packages

Browse source 
suppress adding project output to export when there is no output
This commit is contained in:
Andrew Stanton-Nurse 2016-02-01 10:28:14 -08:00
commit 0951d424be
3 changed files with 33 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Microsoft.DotNet.Cli.sln
View file

@ -1,7 +1,7 @@
 
Microsoft Visual Studio Solution File, Format Version 12.00 Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14 # Visual Studio 14
VisualStudioVersion = 14.0.23107.0 VisualStudioVersion = 14.0.24720.0
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED2FE3E2-F7E7-4389-8231-B65123F2076F}"
EndProject EndProject
@ -91,6 +91,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server.Tests", "test\dotnet-projectmodel-server.Tests\dotnet-projectmodel-server.Tests.xproj", "{11C77123-E4DA-499F-8900-80C88C2C69F2}" Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server.Tests", "test\dotnet-projectmodel-server.Tests\dotnet-projectmodel-server.Tests.xproj", "{11C77123-E4DA-499F-8900-80C88C2C69F2}"
EndProject EndProject
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "TestLibraryWithRunner", "test\TestProjects\TestLibraryWithRunner\TestLibraryWithRunner.xproj", "{B76591D6-D105-441D-AB40-AC7E78EAF84D}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
@ -695,6 +697,22 @@ Global
{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU {11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.Debug|x64.ActiveCfg = Debug|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.Debug|x64.Build.0 = Debug|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.MinSizeRel|x64.Build.0 = Debug|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.Release|Any CPU.Build.0 = Release|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.Release|x64.ActiveCfg = Release|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.Release|x64.Build.0 = Release|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
{B76591D6-D105-441D-AB40-AC7E78EAF84D}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -738,5 +756,6 @@ Global
{386D412C-003C-47B1-8258-0E35865CB7C4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {386D412C-003C-47B1-8258-0E35865CB7C4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{1EA9AF94-5494-40DD-A05B-9D564572CCFC} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F} {1EA9AF94-5494-40DD-A05B-9D564572CCFC} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
{11C77123-E4DA-499F-8900-80C88C2C69F2} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7} {11C77123-E4DA-499F-8900-80C88C2C69F2} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{B76591D6-D105-441D-AB40-AC7E78EAF84D} = {713CBFBB-5392-438D-B766-A9A585EF1BB8}
EndGlobalSection EndGlobalSection
EndGlobal EndGlobal

2
src/Microsoft.DotNet.ProjectModel/Compilation/LibraryExporter.cs
View file

@ -174,7 +174,7 @@ namespace Microsoft.DotNet.ProjectModel.Compilation
compileAssemblies.Add(compileAsset); compileAssemblies.Add(compileAsset);
runtimeAssets.Add(pdbPath); runtimeAssets.Add(pdbPath);
} }
else else if(project.Project.Files.SourceFiles.Any())
{ {
var outputCalculator = project.GetOutputPathCalculator(); var outputCalculator = project.GetOutputPathCalculator();
var assemblyPath = outputCalculator.GetAssemblyPath(_configuration); var assemblyPath = outputCalculator.GetAssemblyPath(_configuration);

12
test/TestProjects/TestLibraryWithRunner/Test.cs Normal file
View file

@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace TestLibraryWithRunner
{
// Need to have source code to actually publish a DLL, so please don't remove this, even though it does nothing :).
public class Test
{
}
}