Skip to content

Commit e1fcdca

Browse files
authored
Merge branch 'master' into merge/release/5.0-preview8-to-master
2 parents 0b415b9 + 3cf8b5c commit e1fcdca

File tree

120 files changed

+2221
-891
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+2221
-891
lines changed
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
---
2+
name: 🐞 Razor Tooling Bug report
3+
about: Report an issue about something that is not working in the new Razor tooling
4+
labels: area-razor.tooling, feature-razor.vs
5+
---
6+
7+
<!--
8+
9+
More information on our issue management policies can be found here: https://aka.ms/aspnet/issue-policies
10+
11+
Please keep in mind that the GitHub issue tracker is not intended as a general support forum, but for reporting **non-security** bugs and feature requests.
12+
13+
If you believe you have an issue that affects the SECURITY of the platform, please do NOT create an issue and instead email your issue details to [email protected]. Your report may be eligible for our [bug bounty](https://www.microsoft.com/en-us/msrc/bounty-dot-net-core) but ONLY if it is reported through email.
14+
For other types of questions, consider using [StackOverflow](https://stackoverflow.com).
15+
16+
-->
17+
18+
<!-- NOTE: This issue template is meant specifically to be used for issues with the new experimental Razor tooling experience provided in Visual Studio's Preview Feature pane -->
19+
20+
### Describe the bug
21+
A clear and concise description of what the bug is.
22+
23+
### To Reproduce
24+
<!--
25+
We ❤ code! Point us to a minimalistic repro project hosted in a GitHub repo.
26+
For a repro project, create a new ASP.NET Core project using the template of your your choice, apply the minimum required code to result in the issue you're observing.
27+
28+
We will close this issue if:
29+
- the repro project you share with us is complex. We can't investigate custom projects, so don't point us to such, please.
30+
- if we will not be able to repro the behavior you're reporting
31+
-->
32+
33+
### Logs & Exceptions
34+
35+
Please collect the data below before reporting your issue to aid us in diagnosing the root cause.
36+
37+
#### Activity log
38+
[Here](https://docs.microsoft.com/en-us/visualstudio/extensibility/how-to-use-the-activity-log?view=vs-2019#to-examine-the-activity-log) are the instructions on how to generate/acquire one.
39+
40+
#### Razor Language Server Client log
41+
<!-- In Visual Studio's `Output` window, the drop-down contains a `Razor Language Server Client` item. Include that below. -->
42+
<details>
43+
<summary>Razor Language Server Client Log Output</summary>
44+
45+
Paste log output here
46+
47+
</details>
48+
49+
#### HTML Language Server Client log
50+
<!-- In Visual Studio's `Output` window, the drop-down contains a `HtmlyLanguageClient` item. Include that below. -->
51+
<details>
52+
<summary>HTML Language Server Client Log Output</summary>
53+
54+
Paste log output here
55+
56+
</details>
57+
58+
### Further technical details
59+
- VS version (Help => About Microsoft Visual Studio, i.e. 16.8.0 Preview 1 30313.27...). If in Codespaces there will be two versions (server and client), please provide both.
60+
- Scenario (Local, LiveShare, Codespaces)
61+
62+
### Pre-requisite checklist
63+
- [ ] Steps to reproduce the issue
64+
- [ ] Visual Studio Activity Log attached.
65+
- [ ] Razor Language Server client logs included.
66+
- [ ] HTML Language Server client logs included

AspNetCore.sln

Lines changed: 452 additions & 341 deletions
Large diffs are not rendered by default.

Directory.Build.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,7 @@
151151
Include="$(RepoRoot)src\Analyzers\Internal.AspNetCore.Analyzers\src\Internal.AspNetCore.Analyzers.csproj"
152152
ReferenceOutputAssembly="false"
153153
OutputItemType="Analyzer"
154-
PrivateAssets="All"
155-
Version="$(InternalAspNetCoreAnalyzersPackageVersion)"
156-
IsImplicitlyDefined="true" />
154+
PrivateAssets="All" />
157155
</ItemGroup>
158156

159157
<!-- Compilation options which apply to all languages. Language-specific options should be set in eng/targets/$(lang).Common.props -->

dockerbuild.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,14 @@ docker run \
133133
-t \
134134
-e TF_BUILD \
135135
-e BUILD_NUMBER \
136+
-e BUILD_BUILDID \
137+
-e SYSTEM_TEAMPROJECT \
136138
-e BUILD_BUILDNUMBER \
137139
-e BUILD_REPOSITORY_URI \
138140
-e BUILD_SOURCEVERSION \
139141
-e BUILD_SOURCEBRANCH \
142+
-e SYSTEM_DEFINITIONID \
143+
-e SYSTEM_TEAMFOUNDATIONCOLLECTIONURI \
140144
-e DOTNET_CLI_TELEMETRY_OPTOUT \
141145
-e Configuration \
142146
-v "$DIR:$DIR" \

docs/BuildFromSource.md

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,22 @@ Building ASP.NET Core from source allows you to tweak and customize ASP.NET Core
44

55
See <https://github.com/dotnet/aspnetcore/labels/area-infrastructure> for known issues and to track ongoing work.
66

7+
## Clone the source code
8+
9+
ASP.NET Core uses git submodules to include the source from a few other projects.
10+
11+
For a new copy of the project, run:
12+
13+
```ps1
14+
git clone --recursive https://github.com/dotnet/aspnetcore
15+
```
16+
17+
To update an existing copy, run:
18+
19+
```ps1
20+
git submodule update --init --recursive
21+
```
22+
723
## Install pre-requisites
824

925
### Windows
@@ -22,7 +38,8 @@ Building ASP.NET Core on Windows requires:
2238
However, any Visual Studio 2019 instance that meets the requirements should be fine. See [global.json](/global.json)
2339
and [eng/scripts/vs.json](/eng/scripts/vs.json) for those requirements. By default, the script will install Visual Studio Enterprise Edition, however you can use a different edition by passing the `-Edition` flag.
2440
* Git. <https://git-scm.org>
25-
* NodeJS. LTS version of 10.14.2 or newer <https://nodejs.org>
41+
* NodeJS. LTS version of 10.14.2 or newer <https://nodejs.org>.
42+
* Install yarn globally (`npm install -g yarn`)
2643
* Java Development Kit 11 or newer. Either:
2744
* OpenJDK <https://jdk.java.net/>
2845
* Oracle's JDK <https://www.oracle.com/technetwork/java/javase/downloads/index.html>
@@ -52,22 +69,6 @@ Building ASP.NET Core on macOS or Linux requires:
5269
* OpenJDK <https://jdk.java.net/>
5370
* Oracle's JDK <https://www.oracle.com/technetwork/java/javase/downloads/index.html>
5471
55-
## Clone the source code
56-
57-
ASP.NET Core uses git submodules to include the source from a few other projects.
58-
59-
For a new copy of the project, run:
60-
61-
```ps1
62-
git clone --recursive https://github.com/dotnet/aspnetcore
63-
```
64-
65-
To update an existing copy, run:
66-
67-
```ps1
68-
git submodule update --init --recursive
69-
```
70-
7172
**NOTE** some ISPs have been know to use web filtering software that has caused issues with git repository cloning, if you experience issues cloning this repo please review <https://help.github.com/en/github/authenticating-to-github/using-ssh-over-the-https-port>
7273
7374
## Building in Visual Studio
@@ -86,6 +87,9 @@ Before opening our .sln/.slnf files in Visual Studio or VS Code, you need to per
8687
> :bulb: Pro tip: you will also want to run this command after pulling large sets of changes. On the master
8788
> branch, we regularly update the versions of .NET Core SDK required to build the repo.
8889
> You will need to restart Visual Studio every time we update the .NET Core SDK.
90+
> To allow executing the setup script, you may need to update the execution policy on your machine.
91+
You can do so by running the `Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser` command
92+
in PowerShell. For more information on execution policies, you can read the [execution policy docs](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.security/set-executionpolicy).
8993

9094
2. Use the `startvs.cmd` script to open Visual Studio .sln/.slnf files. This script first sets the required
9195
environment variables.

eng/Build.props

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,6 @@
4444
<!-- Project selection can be overridden on the command line by passing in -projects. -->
4545
<When Condition="'$(ProjectToBuild)' != ''">
4646
<ItemGroup>
47-
<!-- Include RTMVersions.csproj unless this invocation is building RepoTasks.csproj or won't compile C#. -->
48-
<ProjectToBuild Include="$(RepoRoot)eng\RTMVersions\RTMVersions.csproj"
49-
Exclude="@(ProjectToExclude)"
50-
Condition=" $(ProjectToBuild.EndsWith('.csproj')) AND !$(ProjectToBuild.EndsWith('RepoTasks.csproj')) " />
5147
<ProjectToBuild Include="$(ProjectToBuild)" Exclude="@(ProjectToExclude);$(RepoRoot)**\bin\**\*;$(RepoRoot)**\obj\**\*">
5248
<RestoreInParallel Condition="'%(Extension)' == '.npmproj'">false</RestoreInParallel>
5349
</ProjectToBuild>
@@ -125,11 +121,8 @@
125121
<!--
126122
Use caution to avoid deep recursion. If the globbing pattern picks up something which exceeds MAX_PATH,
127123
the entire pattern will silently fail to evaluate correctly.
128-
129-
Include RTMVersions.csproj when building any managed projects.
130124
-->
131125
<DotNetProjects Include="
132-
$(RepoRoot)eng\RTMVersions\RTMVersions.csproj;
133126
$(RepoRoot)src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.csproj;
134127
$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj;
135128
$(RepoRoot)src\Framework\App.Ref.Internal\src\Microsoft.AspNetCore.App.Ref.Internal.csproj;
@@ -178,7 +171,6 @@
178171
$(RepoRoot)**\obj\**\*;"
179172
Condition=" '$(BuildMainlyReferenceProviders)' != 'true' " />
180173
<DotNetProjects Include="
181-
$(RepoRoot)eng\RTMVersions\RTMVersions.csproj;
182174
$(RepoRoot)src\DefaultBuilder\**\src\*.csproj;
183175
$(RepoRoot)src\Features\JsonPatch\**\src\*.csproj;
184176
$(RepoRoot)src\DataProtection\**\src\*.csproj;

eng/Dependencies.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ and are generated based on the last package release.
7171
<LatestPackageReference Include="System.Reflection.Metadata" />
7272
<LatestPackageReference Include="System.Runtime.CompilerServices.Unsafe" />
7373
<LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
74+
<!-- System.Security.AccessControl should only be referenced in Dependencies.props and RTMVersions.csproj. -->
75+
<LatestPackageReference Include="System.Security.AccessControl" />
7476
<LatestPackageReference Include="System.Security.Cryptography.Cng" />
7577
<LatestPackageReference Include="System.Security.Cryptography.Pkcs" />
7678
<LatestPackageReference Include="System.Security.Cryptography.Xml" />

eng/RTMVersions/Directory.Build.props

Lines changed: 0 additions & 6 deletions
This file was deleted.

eng/RTMVersions/Directory.Build.targets

Lines changed: 0 additions & 1 deletion
This file was deleted.

eng/RTMVersions/RTMVersions.csproj

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)