Skip to content

Commit 45fcd51

Browse files
committed
Fix packaging
1 parent 58d696a commit 45fcd51

File tree

4 files changed

+14
-40
lines changed

4 files changed

+14
-40
lines changed

src/MsBuildPipeLogger.Logger/BinaryLogger/BinaryLogRecordKind.cs

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

src/MsBuildPipeLogger.Logger/MsBuildPipeLogger.Logger.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFrameworks>netstandard2.0</TargetFrameworks>
44
<RootNamespace>MsBuildPipeLogger</RootNamespace>
55
<Description>A logger for MSBuild that sends event data over anonymous or named pipes.</Description>
6+
<IsPackable>false</IsPackable>
67
</PropertyGroup>
78
<ItemGroup>
89
<PackageReference Include="Microsoft.Build" Version="17.13.9" PrivateAssets="all" ExcludeAssets="runtime">

src/MsBuildPipeLogger.Server/MsBuildPipeLogger.Server.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<RootNamespace>MsBuildPipeLogger</RootNamespace>
55
<Description>A logger for MSBuild that sends event data over anonymous or named pipes.</Description>
6+
<IsPackable>false</IsPackable>
67
</PropertyGroup>
78
<ItemGroup>
89
<PackageReference Include="Microsoft.Build" Version="17.13.9" ExcludeAssets="runtime" />

src/dotnet-releaser/ReleaserApp.Projects.cs

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ public partial class ReleaserApp
211211

212212
foreach (var msBuildProject in _config.MSBuild.Projects)
213213
{
214-
var basePath = Path.GetDirectoryName(msBuildProject);
214+
var basePath = Path.GetDirectoryName(msBuildProject)!;
215215
var solutionSerializer = Microsoft.VisualStudio.SolutionPersistence.Serializer.SolutionSerializers.GetSerializerByMoniker(msBuildProject);
216216
if (solutionSerializer is not null)
217217
{
@@ -221,23 +221,20 @@ public partial class ReleaserApp
221221
var solutionFile = await solutionSerializer.OpenAsync(msBuildProject, CancellationToken.None);
222222
foreach (var subProject in solutionFile.SolutionProjects)
223223
{
224-
if (string.IsNullOrEmpty(subProject.Type))
225-
{
226-
var fullProjectPath = Path.GetFullPath(Path.Combine(basePath, subProject.FilePath));
224+
var fullProjectPath = Path.GetFullPath(Path.Combine(basePath, subProject.FilePath));
227225

228-
if (allProjectPaths.Add(fullProjectPath))
229-
{
230-
if (!solutionToProjects.TryGetValue(msBuildProject, out var listOfProjectsPerSolution))
231-
{
232-
listOfProjectsPerSolution = new List<string>();
233-
solutionToProjects[msBuildProject] = listOfProjectsPerSolution;
234-
}
235-
listOfProjectsPerSolution.Add(fullProjectPath);
236-
}
237-
else
226+
if (allProjectPaths.Add(fullProjectPath))
227+
{
228+
if (!solutionToProjects.TryGetValue(msBuildProject, out var listOfProjectsPerSolution))
238229
{
239-
Error($"The project `{fullProjectPath}` is duplicated in the list of input projects.");
230+
listOfProjectsPerSolution = new List<string>();
231+
solutionToProjects[msBuildProject] = listOfProjectsPerSolution;
240232
}
233+
listOfProjectsPerSolution.Add(fullProjectPath);
234+
}
235+
else
236+
{
237+
Error($"The project `{fullProjectPath}` is duplicated in the list of input projects.");
241238
}
242239
}
243240
}

0 commit comments

Comments
 (0)