From c9f14955d677c1541bff226460f73b5cd9e9b4c5 Mon Sep 17 00:00:00 2001 From: Nathan Mytelka Date: Wed, 13 Jan 2021 14:22:40 -0800 Subject: [PATCH 1/2] Update branding for 16.10 --- README.md | 6 +++--- eng/Versions.props | 2 +- src/MSBuild/app.amd64.config | 4 ++-- src/MSBuild/app.config | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index cda862de73f..43e8c9d6f07 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,13 @@ For more information on MSBuild, see the [MSBuild documentation](https://docs.mi ### Build Status -The current development branch is `master`. Changes in `master` will go into a future update of MSBuild, which will release with Visual Studio 16.9 and a corresponding version of the .NET Core SDK. +The current development branch is `master`. Changes in `master` will go into a future update of MSBuild, which will release with Visual Studio 16.10 and a corresponding version of the .NET Core SDK. [![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=master)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=master) -We have forked for MSBuild 16.8 in the branch [`vs16.8`](https://github.com/Microsoft/msbuild/tree/vs16.8). Changes to that branch need special approval. +We have forked for MSBuild 16.9 in the branch [`vs16.9`](https://github.com/Microsoft/msbuild/tree/vs16.9). Changes to that branch need special approval. -[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=vs16.8)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=vs16.8) +[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=vs16.9)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=vs16.9) MSBuild 16.7 builds from the branch [`vs16.7`](https://github.com/Microsoft/msbuild/tree/vs16.7). Only high-priority bugfixes will be considered for servicing 16.7. diff --git a/eng/Versions.props b/eng/Versions.props index ecf838c7307..43c2286e9b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 16.9.0 + 16.10.0 15.1.0.0 preview true diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 44d367d12ca..5e1dee0ffee 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -48,8 +48,8 @@ - - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 7a2af88853e..4dc44912a1d 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -60,8 +60,8 @@ - - + + From 1801c2cf44a043481552b0aebfae7e5e3619d721 Mon Sep 17 00:00:00 2001 From: Nathan Mytelka Date: Wed, 13 Jan 2021 14:39:33 -0800 Subject: [PATCH 2/2] Remove 16.0 --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 43e8c9d6f07..631504a1702 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,6 @@ MSBuild 16.4 builds from the branch [`vs16.4`](https://github.com/Microsoft/msbu [![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=vs16.4)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=vs16.4) -MSBuild 16.0 builds from the branch [`vs16.0`](https://github.com/Microsoft/msbuild/tree/vs16.0). Only high-priority bugfixes will be considered for servicing 16.0. - -[![Build Status](https://dev.azure.com/dnceng/public/_apis/build/status/Microsoft/msbuild/msbuild-pr?branchName=vs16.0)](https://dev.azure.com/dnceng/public/_build/latest?definitionId=86&branchName=vs16.0) - MSBuild 15.9 builds from the branch [`vs15.9`](https://github.com/Microsoft/msbuild/tree/vs15.9). Only very-high-priority bugfixes will be considered for servicing 15.9. ## Building