diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2020-12-31 13:20:46 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-31 13:20:46 +0300 |
| commit | 752c927cf26a3c57190d46b3635de52cc49b203e (patch) | |
| tree | ec1be33295834bf0897b8d254f2553b85f5fe6a4 /Directory.Build.props | |
| parent | 73b824d38e04001b09520637c33b3070a2606c5e (diff) | |
Allow incremental servicing of packages and more packaging infra cleanup (#46447)
* More packaging cleanup
* Add incremental package servicing throughout the repo
* Update dependencies to 6.0.0-beta.20630.3
Diffstat (limited to 'Directory.Build.props')
| -rw-r--r-- | Directory.Build.props | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/Directory.Build.props b/Directory.Build.props index 3d391c4b443..dad14cfa30c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -207,9 +207,9 @@ <!-- Packaging --> <PropertyGroup> <GitHubRepositoryName>runtime</GitHubRepositoryName> - <RepositoryUrl>git://github.com/dotnet/runtime</RepositoryUrl> - <ProjectUrl>https://github.com/dotnet/runtime</ProjectUrl> - <LicenseUrl>https://github.com/dotnet/runtime/blob/master/LICENSE.TXT</LicenseUrl> + <RepositoryUrl>git://github.com/dotnet/$(GitHubRepositoryName)</RepositoryUrl> + <ProjectUrl>https://github.com/dotnet/$(GitHubRepositoryName)</ProjectUrl> + <LicenseUrl>https://github.com/dotnet/$(GitHubRepositoryName)/blob/master/LICENSE.TXT</LicenseUrl> <RuntimeIdGraphDefinitionFile>$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'pkg', 'Microsoft.NETCore.Platforms', 'runtime.json'))</RuntimeIdGraphDefinitionFile> <LicenseFile>$(MSBuildThisFileDirectory)LICENSE.TXT</LicenseFile> <PackageLicenseExpression>MIT</PackageLicenseExpression> @@ -220,14 +220,19 @@ <!-- Keep it in sync with PRERELEASE in eng/native/configureplatform.cmake --> <IsPrerelease>true</IsPrerelease> <IsExperimentalAssembly>$(MSBuildProjectName.Contains('Experimental'))</IsExperimentalAssembly> + <IsPrivateAssembly>$(MSBuildProjectName.Contains('Private'))</IsPrivateAssembly> <!-- Experimental packages should not be stable --> - <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and $(IsExperimentalAssembly)">true</SuppressFinalPackageVersion> + <SuppressFinalPackageVersion Condition="'$(SuppressFinalPackageVersion)' == '' and ($(IsExperimentalAssembly) or $(IsPrivateAssembly))">true</SuppressFinalPackageVersion> <IsShippingAssembly Condition="$(IsExperimentalAssembly)">false</IsShippingAssembly> <!-- We don't want Private packages to be shipped to NuGet.org --> <IsShippingPackage Condition="($(MSBuildProjectName.Contains('Private')) or $(IsExperimentalAssembly)) and '$(MSBuildProjectExtension)' == '.pkgproj'">false</IsShippingPackage> - <!-- Set IsPackable true for all pkgproj as Arcade unconditionally overrides the value. --> - <IsPackable Condition="'$(MSBuildProjectExtension)' == '.pkgproj'">true</IsPackable> + <!-- A package isn't generated (in traversal builds) if in servicing or in runtimelab. Intended to be overridden at project level. --> + <GeneratePackage Condition="'$(GeneratePackage)' == ''">true</GeneratePackage> + <GeneratePackage Condition="(('$(PreReleaseVersionLabel)' == 'servicing' or + '$(RepositoryName)' == 'runtimelab') and + '$(BuildAllProjects)' == 'true')">false</GeneratePackage> </PropertyGroup> + <!-- Language configuration --> <PropertyGroup> |