mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update eng/ManualVersions.props

Browse source 
Co-authored-by: Daniel Plaisted <dsplaisted@gmail.com>
This commit is contained in:
William Li 2020-09-18 10:34:56 -07:00 committed by GitHub
parent 9e2382f8cc
commit 6622705649
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
eng/ManualVersions.props
View file

@ -1,10 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- The following property needs to choice the highest when there is merge conflict.
Unlike Versions.props the following property is maintained manually. So there won't be
a bot Checking into multiple branches. Instead of keeping what's in branch,
whenever there is a merge conflict. Pick the highest.
<!-- The following properties (unlike those in version.props) are maintained manually. So
when there is a merge conflict, the highest version should generally be chosen, rather
than keeping what's in the branch, which is the usual strategy with version.props merge
conflicts.
Basically: In this file, choose the highest version when resolving merge conflicts.
-->
<PropertyGroup>
<MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.3-preview</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>