From 910829d94b110731fab2221b645f29c92b18225f Mon Sep 17 00:00:00 2001
From: Kev Ritchie <65573253+KevRitchie@users.noreply.github.com>
Date: Tue, 12 Oct 2021 20:35:51 +0000
Subject: [PATCH 1/2] Update Build From Source documentation
---
docs/BuildFromSource.md | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md
index 3c8b5147b0b2..123526fc93c6 100644
--- a/docs/BuildFromSource.md
+++ b/docs/BuildFromSource.md
@@ -74,7 +74,7 @@ Building ASP.NET Core on Windows (10, version 1803 or newer) requires that you h
#### [Visual Studio 2019](https://visualstudio.com)
-Visual Studio 2019 (16.10 Preview 3) is required to build the repo locally. If you don't have visual studio installed you can run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1) to install the exact required dependencies.
+Visual Studio 2019 is required to build the repo locally. If you don't have visual studio installed you can run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1) to install the exact required dependencies.
> :bulb: By default, the script will install Visual Studio Enterprise Edition, however you can use a different edition by passing the `-Edition` flag.
> :bulb: To install Visual Studio from the preview channel, you can use the `-Channel` flag to set the channel (`-Channel Preview`).
@@ -119,7 +119,7 @@ This repo contains some Java source code that depends on an install of the JDK v
- OpenJDK
- Oracle's JDK
-Alternatively, you can run [eng/scripts/InstallJdk.ps1](/eng/scripts/InstallJdk.ps1) to install a version of the JDK that will only be used in this repo.
+Alternatively, you can run [eng/scripts/InstallJdk.ps1](/eng/scripts/InstallJdk.ps1) to install a version of the JDK that will only be used in this repo.
```powershell
./eng/scripts/InstallJdk.ps1
@@ -217,6 +217,7 @@ Studio because those projects are not listed in AspNetCore.sln.
This will download the required tools and restore all projects inside the repository. At that point, you should be able
to open the .sln file or one of the project specific .slnf files to work on the projects you care about.
+> :bulb: Note, if the build fails whilst running the `restore.cmd` and makes reference to paths like `.tools\msbuild\16.5.0-alpha\`, you will need to re-run the InstallVisualStudio.ps1 script detailed above to resolve any component issues (even if Visual Studio is already installed).
> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the main
> branch, we regularly update the versions of .NET Core SDK required to build the repo.
From 280cb57c810f22371128ba9e1558362fbbe27e7c Mon Sep 17 00:00:00 2001
From: Kev Ritchie <65573253+KevRitchie@users.noreply.github.com>
Date: Tue, 12 Oct 2021 20:42:48 +0000
Subject: [PATCH 2/2] Update Build From Source documentation
---
docs/BuildFromSource.md | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md
index 123526fc93c6..6c2264098b34 100644
--- a/docs/BuildFromSource.md
+++ b/docs/BuildFromSource.md
@@ -77,7 +77,9 @@ Building ASP.NET Core on Windows (10, version 1803 or newer) requires that you h
Visual Studio 2019 is required to build the repo locally. If you don't have visual studio installed you can run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1) to install the exact required dependencies.
> :bulb: By default, the script will install Visual Studio Enterprise Edition, however you can use a different edition by passing the `-Edition` flag.
+
> :bulb: To install Visual Studio from the preview channel, you can use the `-Channel` flag to set the channel (`-Channel Preview`).
+
> :bulb: Even if you have installed Visual Studio, we still recommend using this script to install again to avoid errors due to missing components.
```powershell
@@ -217,7 +219,7 @@ Studio because those projects are not listed in AspNetCore.sln.
This will download the required tools and restore all projects inside the repository. At that point, you should be able
to open the .sln file or one of the project specific .slnf files to work on the projects you care about.
-> :bulb: Note, if the build fails whilst running the `restore.cmd` and makes reference to paths like `.tools\msbuild\16.5.0-alpha\`, you will need to re-run the InstallVisualStudio.ps1 script detailed above to resolve any component issues (even if Visual Studio is already installed).
+> :bulb: Note, if the build fails whilst running the `restore.cmd` and makes reference to paths like `.tools\msbuild\16.5.0-alpha\`, you will need to re-run the InstallVisualStudio.ps1 script detailed above to install any missing components (even if Visual Studio is already installed).
> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the main
> branch, we regularly update the versions of .NET Core SDK required to build the repo.