Revert "Revert "Bump version to match with VS and update Readme""

dotnet · Apr 6, 2021 · 8afcdc7 · 8afcdc7
1 parent bd8b627
commit 8afcdc7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@
 |[16.7](https://github.com/dotnet/project-system/tree/dev16.7.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.7.x&jobName=Windows_Debug&%20debug&label=dev16.7.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.7.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.7.x&jobName=Windows_Release&%20Release&label=dev16.7.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.7.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.7.x&jobName=Spanish&label=dev16.7.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.7.x)|
 |[16.8](https://github.com/dotnet/project-system/tree/dev16.8.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.8.x&jobName=Windows_Debug&%20debug&label=dev16.8.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.8.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.8.x&jobName=Windows_Release&%20Release&label=dev16.8.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.8.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.8.x&jobName=Spanish&label=dev16.8.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.8.x)|
 |[16.9](https://github.com/dotnet/project-system/tree/dev16.9.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.9.x&jobName=Windows_Debug&%20debug&label=dev16.9.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.9.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.9.x&jobName=Windows_Release&%20Release&label=dev16.9.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.9.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.9.x&jobName=Spanish&label=dev16.9.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.9.x)|
+|[16.10](https://github.com/dotnet/project-system/tree/dev16.10.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.10.x&jobName=Windows_Debug&%20debug&label=dev16.10.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.10.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.10.x&jobName=Windows_Release&%20Release&label=dev16.10.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.10.x)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=dev16.10.x&jobName=Spanish&label=dev16.10.x)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=dev16.10.x)|
 |[main](https://github.com/dotnet/project-system/tree/main)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=main&jobName=Windows_Debug&%20debug&label=main)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=main)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=main&jobName=Windows_Release&%20Release&label=main)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=main)|[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/dotnet/project-system/unit-tests?branchName=main&jobName=Spanish&label=main)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=406&branchName=main)|
 
 [![Join the chat at https://gitter.im/dotnet/project-system](https://badges.gitter.im/dotnet/project-system.svg)](https://gitter.im/dotnet/project-system?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

diff --git a/build/import/Versions.props b/build/import/Versions.props
@@ -1,7 +1,8 @@
 <!-- Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information. -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectSystemVersion>16.8.1</ProjectSystemVersion>
+    <MinimumRequiredVSVersion>16.8.1</MinimumRequiredVSVersion> <!-- We should try to keep this up to date with the highest version available on build machines -->
+    <ProjectSystemVersion>16.10</ProjectSystemVersion> <!-- This should always match with the VS release we're targeting -->
     <VersionBase>$(ProjectSystemVersion)</VersionBase>
     <PreReleaseVersionLabel>beta1</PreReleaseVersionLabel>
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>

diff --git a/build/script/SetVSEnvironment.cmd b/build/script/SetVSEnvironment.cmd
@@ -4,7 +4,7 @@ REM Configures the build environment to be able to build the tree
 REM
 REM Downloads VSWhere, uses it to find a compatible Visual Studio and call a developer prompt to set the environment.
 
-FOR /F "USEBACKQ delims=" %%i IN (`powershell -NonInteractive -NoLogo -NoProfile -Command "([xml](Get-Content %~dp0\..\import\Versions.props)).Project.PropertyGroup.ProjectSystemVersion"`) DO SET RequiredVSVersion=%%i
+FOR /F "USEBACKQ delims=" %%i IN (`powershell -NonInteractive -NoLogo -NoProfile -Command "([xml](Get-Content %~dp0\..\import\Versions.props)).Project.PropertyGroup.MinimumRequiredVSVersion"`) DO SET RequiredVSVersion=%%i
 
 REM Are we already in Developer Command Prompt?
 if defined VSINSTALLDIR (