diff options
| author | Stephen Halter <halter73@gmail.com> | 2020-02-19 00:35:11 +0300 |
|---|---|---|
| committer | Stephen Halter <halter73@gmail.com> | 2020-02-19 00:46:51 +0300 |
| commit | 88073f86ff1b8d1fc80684c93170250aad71d9aa (patch) | |
| tree | dc11bd71260b0c6f355508ea61088db631ea5a3c /eng/Versions.props | |
| parent | b6d433c4b6c301ddd16a1d8090d0a1df87a34f00 (diff) | |
| parent | 7fc314f73b075650f79d5225af8165e0a9369c22 (diff) | |
Merge branch 'release/3.1' into master
Diffstat (limited to 'eng/Versions.props')
| -rw-r--r-- | eng/Versions.props | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/eng/Versions.props b/eng/Versions.props index ac1911826d..60442119d9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,6 +17,8 @@ <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind> <PreReleaseVersionLabel>preview</PreReleaseVersionLabel> <PreReleaseBrandingLabel>Preview $(PreReleaseVersionIteration)</PreReleaseBrandingLabel> + <IncludePreReleaseLabelInPackageVersion>true</IncludePreReleaseLabelInPackageVersion> + <IncludePreReleaseLabelInPackageVersion Condition=" '$(DotNetFinalVersionKind)' == 'release' ">false</IncludePreReleaseLabelInPackageVersion> <AspNetCoreMajorMinorVersion>$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion)</AspNetCoreMajorMinorVersion> <!-- Additional assembly attributes are already configured to include the source revision ID. --> <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion> @@ -31,7 +33,7 @@ <!-- TargetingPackVersionPrefix is used by projects, like .deb and .rpm, which use slightly different version formats. --> <TargetingPackVersionPrefix>$(VersionPrefix)</TargetingPackVersionPrefix> <!-- Targeting packs do not produce patch versions in servicing builds. No API changes are allowed in patches. --> - <TargetingPackVersionPrefix Condition="'$(IsServicingBuild)' == 'true'">$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0</TargetingPackVersionPrefix> + <TargetingPackVersionPrefix Condition="'$(IsTargetingPackBuilding)' != 'true'">$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).0</TargetingPackVersionPrefix> <ExperimentalVersionPrefix>0.3.$(AspNetCorePatchVersion)</ExperimentalVersionPrefix> <!-- ANCM versioning is intentionally 10 + AspNetCoreMajorVersion because earlier versions of ANCM shipped as 8.x. --> <AspNetCoreModuleVersionMajor>$([MSBuild]::Add(10, $(AspNetCoreMajorVersion)))</AspNetCoreModuleVersionMajor> @@ -235,7 +237,7 @@ <CastleCorePackageVersion>4.2.1</CastleCorePackageVersion> <FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion> <GoogleProtobufPackageVersion>3.8.0</GoogleProtobufPackageVersion> - <GrpcAspNetCorePackageVersion>2.23.2</GrpcAspNetCorePackageVersion> + <GrpcAspNetCorePackageVersion>2.27.0</GrpcAspNetCorePackageVersion> <IdentityServer4AspNetIdentityPackageVersion>3.0.0</IdentityServer4AspNetIdentityPackageVersion> <IdentityServer4EntityFrameworkPackageVersion>3.0.0</IdentityServer4EntityFrameworkPackageVersion> <IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion> @@ -267,5 +269,6 @@ <PropertyGroup Label="Restore feeds"> <!-- In an orchestrated build, this may be overridden to other Azure feeds. --> <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetcli.blob.core.windows.net/dotnet/</DotNetAssetRootUrl> + <DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl> </PropertyGroup> </Project> |