From 9e2382f8cc20de345437716eb7e5098cff41cc09 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Thu, 17 Sep 2020 21:16:38 -0700
Subject: [PATCH] Make a separate props file

---
 eng/ManualVersions.props | 14 ++++++++++++++
 eng/Versions.props       |  6 +-----
 2 files changed, 15 insertions(+), 5 deletions(-)
 create mode 100644 eng/ManualVersions.props

diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props
new file mode 100644
index 000000000..11821df82
--- /dev/null
+++ b/eng/ManualVersions.props
@@ -0,0 +1,14 @@
+<?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.
+ -->
+  <PropertyGroup>
+    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.3-preview</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.4-preview</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
+    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.3-preview</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
+  </PropertyGroup>
+</Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 295f01011..39336b1e1 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -129,13 +129,9 @@
     <DotnetDebToolVersion>2.0.0</DotnetDebToolVersion>
     <MicrosoftNETTestSdkVersion>16.8.0-release-20200902-05</MicrosoftNETTestSdkVersion>
   </PropertyGroup>
-  <PropertyGroup>
-    <MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>10.0.17763.3-preview</MicrosoftWindowsSDKNETRef10_0_17763PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>10.0.18362.4-preview</MicrosoftWindowsSDKNETRef10_0_18362PackageVersion>
-    <MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>10.0.19041.3-preview</MicrosoftWindowsSDKNETRef10_0_19041PackageVersion>
-  </PropertyGroup>
   <PropertyGroup>
     <!-- pinned dependency. This package is not being produced outside of the 2.0 branch of corefx and should not change. -->
     <CLI_NETStandardLibraryNETFrameworkVersion>2.0.1-servicing-26011-01</CLI_NETStandardLibraryNETFrameworkVersion>
   </PropertyGroup>
+  <Import Project="$(RepositoryEngineeringDir)ManualVersions.props" />
 </Project>