diff options
| author | dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> | 2019-05-24 14:36:24 -0700 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2019-05-24 14:36:24 -0700 |
| commit | d3b5e99a75be2344ec7bc9e1f28319cd3d31ccc2 (patch) | |
| tree | 1fd92b7eb9d5ed823a383bec1062d752c0c50b0d /Directory.Build.targets | |
| parent | 5d85833c0169de7a8a54351184238a0525da5073 (diff) | |
| download | coreclr-d3b5e99a75be2344ec7bc9e1f28319cd3d31ccc2.tar.gz coreclr-d3b5e99a75be2344ec7bc9e1f28319cd3d31ccc2.tar.bz2 coreclr-d3b5e99a75be2344ec7bc9e1f28319cd3d31ccc2.zip | |
[master] Update dependencies from dotnet/arcade (#24333)
* Update dependencies from https://github.com/dotnet/arcade build 20190522.13
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19272.13
- Microsoft.DotNet.Build.Tasks.Feed - 2.2.0-beta.19272.13
- Microsoft.DotNet.Build.Tasks.Packaging - 1.0.0-beta.19272.13
- Microsoft.DotNet.Helix.Sdk - 2.0.0-beta.19272.13
* Update Unix permissions
* Set the versions same way as CoreFX repo
* Fix the product branding version
* Delete .NET Framework reference assemblies reference
* Workaround for https://github.com/dotnet/arcade/issues/2673
Diffstat (limited to 'Directory.Build.targets')
| -rw-r--r-- | Directory.Build.targets | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Directory.Build.targets b/Directory.Build.targets index 29123fe77f..4e17687cb9 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,4 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <Project> <Import Project="Sdk.targets" Sdk="Microsoft.DotNet.Arcade.Sdk" Condition="'$(ArcadeBuild)' == 'True'"/> -</Project>
\ No newline at end of file + + <PropertyGroup> + <!-- SDK sets product to assembly but we want it to be our product name --> + <Product>Microsoft%AE .NET Core</Product> + + <!-- Use the .NET Core product branding version for informational version description --> + <InformationalVersion>$(ProductVersion)</InformationalVersion> + <InformationalVersion Condition="'$(VersionSuffix)' != ''">$(InformationalVersion)-$(VersionSuffix)</InformationalVersion> + </PropertyGroup> +</Project> |