diff --git a/build/buildorder.props b/build/buildorder.props index 512cca0827..227658df56 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -9,7 +9,6 @@ - diff --git a/build/repo.props b/build/repo.props index 6d0bae2aaf..ec1af59d48 100644 --- a/build/repo.props +++ b/build/repo.props @@ -62,6 +62,13 @@ + + + - diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md index f7bea99466..7bfdf52d4a 100644 --- a/docs/BuildFromSource.md +++ b/docs/BuildFromSource.md @@ -57,11 +57,11 @@ Before opening our .sln files in Visual Studio or VS Code, you need to perform t 1. Executing the following on command-line: ``` - .\build.cmd /p:SkipTests=true /p:_ProjectsOnly=true + .\build.cmd /p:SkipTests=true /p:_ProjectsOnly=true /p:BuildNumberSuffix=t999 ``` This will download required tools and build the entire repository once. At that point, you should be able to open .sln files to work on the projects you care about. - -2. Update your `PATH` environment variable. (See [below for details](#path).) + +2. Use the `startvs.cmd` script to open Visual Studio .sln files. This script first sets required environment variables. > :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. Visual Studio will only build projects in a solution file, and makes a best effort to use other files on disk. If you pull many changes, the files on disk may be stale and will need to re-build. @@ -84,20 +84,35 @@ Opening solution files may produce an error code NU1105 with a message such This is a known issue in NuGet () and we are working with them for a solution. See also to track progress on this. -**The workaround** for now is to disable NuGet restore in Visual Studio. +**The workaround** for now is to add all projects to the solution. + + dotnet sln add C:\src\AspNetCore\src\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj -![screenshot](https://i.imgur.com/cTKP381.png) #### PATH -For VS Code and Visual Studio to work correctly, you must place the following location in your PATH. -``` -Windows: %USERPROFILE%\.dotnet\x64 -Linux/macOS: $HOME/.dotnet -``` -This must come **before** any other installation of `dotnet`. In Windows, we recommend removing `C:\Program Files\dotnet` from PATH in system variables and adding `%USERPROFILE%\.dotnet\x64` to PATH in user variables. +For VS Code and Visual Studio and `dotnet` commands to work correctly, you must place the following location in your PATH. +Use the following commands to update the PATH variable in a command line window. - +Windows (Command Prompt) + +```batch +set PATH=%USERPROFILE%\.dotnet\x64;%PATH% +``` + +Windows (Powershell) + +```ps1 +$env:PATH="$env:USERPROFILE\.dotnet\x64;$env:PATH" +``` + +Linux/macOS: + +```sh +export PATH="$HOME/.dotnet:$PATH" +``` + +On Windows, we recommend using the `startvs.cmd` command to launch Visual Studio. ## Building on command-line diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 4c1e38844d..8f5460b224 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -509,6 +509,17 @@ + + + 2.2.0 + + + + + + + + 2.2.0 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index d88dbac121..97364fe67c 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -52,6 +52,7 @@ + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 29f0b9978d..5b4af73951 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -18,7 +18,10 @@ + + + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index a62827520f..080f4c9659 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -40,6 +40,7 @@ + diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets index a7f7b610b6..8df4213c62 100644 --- a/eng/targets/CSharp.Common.targets +++ b/eng/targets/CSharp.Common.targets @@ -1,5 +1,11 @@ + + + net$(TargetFrameworkVersion.Substring(1).Replace('.','')) + .NETFramework + + diff --git a/eng/targets/ResolveReferences.targets b/eng/targets/ResolveReferences.targets index 897a906869..675b0efa18 100644 --- a/eng/targets/ResolveReferences.targets +++ b/eng/targets/ResolveReferences.targets @@ -46,12 +46,18 @@ + + + <_ReferenceTemp Include="@(Reference)" /> + - + + <_ReferenceTemp Remove="@(_ReferenceTemp)" /> +