From c0e745e50fc7905b404a33443a9ef5962c150f66 Mon Sep 17 00:00:00 2001
From: Nathan Mytelka <Forgind@users.noreply.github.com>
Date: Fri, 2 Apr 2021 10:22:04 -0700
Subject: [PATCH 1/3] branding update

---
 eng/Versions.props           | 2 +-
 src/MSBuild/app.amd64.config | 4 ++--
 src/MSBuild/app.config       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index d6b6d8beda1..91c428912ff 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -2,7 +2,7 @@
 <!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the MIT license. See License.txt in the project root for full license information. -->
 <Project>
   <PropertyGroup>
-    <VersionPrefix>16.10.0</VersionPrefix>
+    <VersionPrefix>17.0.0</VersionPrefix>
     <AssemblyVersion>15.1.0.0</AssemblyVersion>
     <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
     <DotNetUseShippingVersions>true</DotNetUseShippingVersions>
diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config
index 5e1dee0ffee..ab0ffa2fb09 100644
--- a/src/MSBuild/app.amd64.config
+++ b/src/MSBuild/app.amd64.config
@@ -48,8 +48,8 @@
         </dependentAssembly>
         <dependentAssembly>
           <assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="16.0.0.0-16.10.0.0" newVersion="16.10.0.0" />
-          <codeBase version="16.10.0.0" href="..\..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
+          <bindingRedirect oldVersion="16.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
+          <codeBase version="17.0.0.0" href="..\..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
         </dependentAssembly>
 
         <!-- Pull plugins that reference SCI up to our version in case they depended on our copy of the older version -->
diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config
index 4dc44912a1d..e500dca5600 100644
--- a/src/MSBuild/app.config
+++ b/src/MSBuild/app.config
@@ -60,8 +60,8 @@
         </dependentAssembly>
         <dependentAssembly>
           <assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="16.0.0.0-16.10.0.0" newVersion="16.10.0.0" />
-          <codeBase version="16.10.0.0" href="..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
+          <bindingRedirect oldVersion="16.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
+          <codeBase version="17.0.0.0" href="..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
         </dependentAssembly>
 
         <!-- Workaround for crash in C++ CodeAnalysis scenarios due to https://github.com/Microsoft/msbuild/issues/1675 -->

From bc2cd44ec4d0a33949d6b1ed249c5cb41b9c1b90 Mon Sep 17 00:00:00 2001
From: Nathan Mytelka <Forgind@users.noreply.github.com>
Date: Sat, 3 Apr 2021 05:50:11 -0700
Subject: [PATCH 2/3] Remove binding redirect

---
 src/MSBuild/app.amd64.config | 1 -
 src/MSBuild/app.config       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config
index ab0ffa2fb09..7a9d1ce02d6 100644
--- a/src/MSBuild/app.amd64.config
+++ b/src/MSBuild/app.amd64.config
@@ -48,7 +48,6 @@
         </dependentAssembly>
         <dependentAssembly>
           <assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="16.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
           <codeBase version="17.0.0.0" href="..\..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
         </dependentAssembly>
 
diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config
index e500dca5600..f4c2f2f7fa9 100644
--- a/src/MSBuild/app.config
+++ b/src/MSBuild/app.config
@@ -60,7 +60,6 @@
         </dependentAssembly>
         <dependentAssembly>
           <assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <bindingRedirect oldVersion="16.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
           <codeBase version="17.0.0.0" href="..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
         </dependentAssembly>
 

From bc02f9849c8eebd16076ae3d4307cea81446778a Mon Sep 17 00:00:00 2001
From: Nathan Mytelka <Forgind@users.noreply.github.com>
Date: Mon, 5 Apr 2021 06:46:03 -0700
Subject: [PATCH 3/3] Remove codebase, too

---
 src/MSBuild/app.amd64.config | 4 ----
 src/MSBuild/app.config       | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config
index 7a9d1ce02d6..0a80738b202 100644
--- a/src/MSBuild/app.amd64.config
+++ b/src/MSBuild/app.amd64.config
@@ -46,10 +46,6 @@
           <bindingRedirect oldVersion="0.0.0.0-99.9.9.9" newVersion="15.1.0.0" />
           <codeBase version="15.1.0.0" href="..\Microsoft.Build.Conversion.Core.dll"/>
         </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <codeBase version="17.0.0.0" href="..\..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
-        </dependentAssembly>
 
         <!-- Pull plugins that reference SCI up to our version in case they depended on our copy of the older version -->
         <dependentAssembly>
diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config
index f4c2f2f7fa9..2dff0102225 100644
--- a/src/MSBuild/app.config
+++ b/src/MSBuild/app.config
@@ -58,10 +58,6 @@
           <bindingRedirect oldVersion="4.0.0.0-16.0.0.0" newVersion="16.0.0.0" />
           <codeBase version="16.0.0.0" href=".\amd64\XamlBuildTask.dll" />
         </dependentAssembly>
-        <dependentAssembly>
-          <assemblyIdentity name="Microsoft.Build.CPPTasks.Common" culture="neutral" publicKeyToken="b03f5f7f11d50a3a" />
-          <codeBase version="17.0.0.0" href="..\..\Microsoft\VC\v160\Microsoft.Build.CPPTasks.Common.dll" />
-        </dependentAssembly>
 
         <!-- Workaround for crash in C++ CodeAnalysis scenarios due to https://github.com/Microsoft/msbuild/issues/1675 -->
         <dependentAssembly>