Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade (dotnet/coreclr#24333)
Browse files Browse the repository at this point in the history
* 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 dotnet/arcade#2673


Commit migrated from dotnet/coreclr@d3b5e99
  • Loading branch information
dotnet-maestro[bot] authored and jkotas committed May 24, 2019
1 parent 5d1c165 commit b0f94f1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
11 changes: 10 additions & 1 deletion src/coreclr/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -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>

<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>
2 changes: 1 addition & 1 deletion src/coreclr/src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
<!-- Keep it in sync with PRERELEASE in clrdefinitions.cmake -->
<IsPrerelease>true</IsPrerelease>
</PropertyGroup>
</Project>
</Project>

0 comments on commit b0f94f1

Please sign in to comment.