Skip to content
Merged
Changes from all commits
Commits
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
Fix servicing of coreclr nuget packages
Fixes the failures in the 7.0.1 test servicing build:

```
/__w/1/s/.packages/microsoft.dotnet.build.tasks.packaging/7.0.0-beta.22416.1/build/Packaging.targets(800,5): error : No VersionSuffix was set. Ensure it is set before targets in packaging are ran. [/__w/1/s/src/coreclr/.nuget/Microsoft.NETCore.ILAsm/Microsoft.NETCore.ILAsm.pkgproj]
##[error].packages/microsoft.dotnet.build.tasks.packaging/7.0.0-beta.22416.1/build/Packaging.targets(800,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) No VersionSuffix was set. Ensure it is set before targets in packaging are ran.
/__w/1/s/.packages/microsoft.dotnet.build.tasks.packaging/7.0.0-beta.22416.1/build/Packaging.targets(800,5): error : No VersionSuffix was set. Ensure it is set before targets in packaging are ran. [/__w/1/s/src/coreclr/.nuget/Microsoft.NETCore.ILDAsm/Microsoft.NETCore.ILDAsm.pkgproj]
##[error].packages/microsoft.dotnet.build.tasks.packaging/7.0.0-beta.22416.1/build/Packaging.targets(800,5): error : (NETCORE_ENGINEERING_TELEMETRY=Build) No VersionSuffix was set. Ensure it is set before targets in packaging are ran.
```
  • Loading branch information
ViktorHofer authored Sep 20, 2022
commit c87f3959d5d5be59adfdd4e278e71c160dd85101
5 changes: 5 additions & 0 deletions src/coreclr/.nuget/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
<!-- coreclr doesn't currently use the index so don't force it to be in sync -->
<SkipIndexCheck>true</SkipIndexCheck>
</PropertyGroup>

<!-- CoreCLR nuget packages shouldn't be published during servicing. -->
<PropertyGroup Condition="'$(PreReleaseVersionLabel)' == 'servicing'">
<IsShipping>false</IsShipping>
</PropertyGroup>

<ItemGroup>
<PackageIndex Condition="'$(MSBuildProjectExtension)' == '.pkgproj'" Include="$(PackageIndexFile)" />
Expand Down