Skip to content
This repository has been archived by the owner on Jul 30, 2024. It is now read-only.
/ NuGet.Jobs Public archive

Enable msbuild /t:pack on library packages #593

Merged
merged 1 commit into from
Oct 24, 2018
Merged

Enable msbuild /t:pack on library packages #593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,17 @@ Invoke-BuildStep 'Creating artifacts' {
# We need a few projects to be published for sharing the common bits with other repos.
# We need symbols published for those, too. All other packages are deployment ones and
# don't need to be shared, hence no need for symbols for them
$ProjectsWithSymbols =
$CsprojProjects =
"src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj",
"src/Validation.Common.Job/Validation.Common.Job.csproj",
"src/Validation.ScanAndSign.Core/Validation.ScanAndSign.Core.csproj",
"src/Validation.Symbols.Core/Validation.Symbols.Core.csproj"

$Projects = `
$CsprojProjects | ForEach-Object {
New-ProjectPackage (Join-Path $PSScriptRoot $_) -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -Symbols
}

$NuspecProjects = `
"src/Stats.CollectAzureCdnLogs/Stats.CollectAzureCdnLogs.csproj", `
"src/Stats.AggregateCdnDownloadsInGallery/Stats.AggregateCdnDownloadsInGallery.csproj", `
"src/Stats.ImportAzureCdnStatistics/Stats.ImportAzureCdnStatistics.csproj", `
Expand Down Expand Up @@ -181,12 +185,10 @@ Invoke-BuildStep 'Creating artifacts' {
"src/Monitoring.RebootSearchInstance/Monitoring.RebootSearchInstance.csproj", `
"src/StatusAggregator/StatusAggregator.csproj", `
"src/Validation.Symbols.Core/Validation.Symbols.Core.csproj", `
"src/Validation.Symbols/Validation.Symbols.csproj" `
+ $ProjectsWithSymbols
"src/Validation.Symbols/Validation.Symbols.csproj"

Foreach ($Project in $Projects) {
$Symbols = $ProjectsWithSymbols -contains $Project;
New-Package (Join-Path $PSScriptRoot "$Project") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "$msBuildVersion" -Symbols:$Symbols
Foreach ($Project in $NuspecProjects) {
New-Package (Join-Path $PSScriptRoot "$Project") -Configuration $Configuration -BuildNumber $BuildNumber -Version $SemanticVersion -Branch $Branch -MSBuildVersion "$msBuildVersion"
}
} `
-ev +BuildErrors
Expand Down
9 changes: 9 additions & 0 deletions src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
<DefineConstants>TRACE</DefineConstants>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<Authors>.NET Foundation</Authors>
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I chose the minimal set of metadata to get pack working. These are internal-ish packages so I didn't want to think too much.

<IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand Down Expand Up @@ -90,6 +94,11 @@
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
<Version>1.1.2</Version>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks.Pack">
<Version>4.8.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NuGet.Services.Configuration">
<Version>2.27.0</Version>
</PackageReference>
Expand Down
14 changes: 9 additions & 5 deletions src/Validation.Common.Job/Validation.Common.Job.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<Authors>.NET Foundation</Authors>
<IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand Down Expand Up @@ -90,6 +94,11 @@
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions">
<Version>1.1.2</Version>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks.Pack">
<Version>4.8.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NuGet.Packaging">
<Version>4.8.0-preview4.5289</Version>
</PackageReference>
Expand Down Expand Up @@ -127,11 +136,6 @@
<Name>NuGet.Jobs.Common</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="Validation.Common.Job.nuspec">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<SignPath>..\..\build</SignPath>
Expand Down
31 changes: 0 additions & 31 deletions src/Validation.Common.Job/Validation.Common.Job.nuspec
View file
Open in desktop

This file was deleted.

9 changes: 9 additions & 0 deletions src/Validation.ScanAndSign.Core/Validation.ScanAndSign.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<Authors>.NET Foundation</Authors>
<IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand Down Expand Up @@ -54,6 +58,11 @@
<PackageReference Include="Microsoft.Extensions.Options">
<Version>1.1.2</Version>
</PackageReference>
<PackageReference Include="NuGet.Build.Tasks.Pack">
<Version>4.8.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NuGet.Services.ServiceBus">
<Version>2.27.0</Version>
</PackageReference>
Expand Down
9 changes: 9 additions & 0 deletions src/Validation.Symbols.Core/Validation.Symbols.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
<Deterministic>true</Deterministic>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup>
<Authors>.NET Foundation</Authors>
<IncludeSymbols Condition="'$(IncludeSymbols)' == ''">true</IncludeSymbols>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
Expand Down Expand Up @@ -58,6 +62,11 @@
<Compile Include="ZipArchiveService.cs" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="NuGet.Build.Tasks.Pack">
<Version>4.8.0</Version>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="NuGet.Services.ServiceBus">
<Version>2.29.0</Version>
</PackageReference>
Expand Down
105 changes: 0 additions & 105 deletions tests/Validation.Common.Job.Tests/CsprojNuspecConsistencyFacts.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tests/Validation.Common.Job.Tests/Validation.Common.Job.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
</ItemGroup>
<ItemGroup>
<Compile Include="CommonTelemetryServiceFacts.cs" />
<Compile Include="CsprojNuspecConsistencyFacts.cs" />
<Compile Include="FileStreamUtilityFacts.cs" />
<Compile Include="LoggerDiagnosticSourceFacts.cs" />
<Compile Include="PathUtilityFacts.cs" />
Expand Down