Compiler and tooling experience for Razor ASP.NET Core apps in Visual Studio, Visual Studio for Mac, and VS Code.
Перейти к файлу
dotnet bot aed0fbca2f
Merge release/dev17.10 to release/dev17.11 (#11072)
This is an automatically generated pull request from release/dev17.10
into release/dev17.11.


Once all conflicts are resolved and all the tests pass, you are free to
merge the pull request. 🐯

## Troubleshooting conflicts

### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its
path into the following searches:
- https://github.com/dotnet/razor/find/release/dev17.10
- https://github.com/dotnet/razor/find/release/dev17.11

Usually the most recent change to a file between the two branches is
considered to have introduced the conflicts, but sometimes it will be
necessary to look for the conflicting lines and check the blame in each
branch. Generally the author whose change introduced the conflicts
should pull down this PR, fix the conflicts locally, then push up a
commit resolving the conflicts.

### Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally
will work without conflicts. This is due to differences between the
merge algorithm used in local git versus the one used by GitHub.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.10-to-release/dev17.11
git reset --hard upstream/release/dev17.11
git merge upstream/release/dev17.10
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.10-to-release/dev17.11 --force
```
2024-10-23 11:08:43 -07:00
.config Update dependencies from https://github.com/dotnet/arcade build 20230410.3 2023-04-11 16:04:51 +00:00
.github Don't annoy the compiler with IDE services changes 2024-05-10 15:12:58 +10:00
.vscode Delete old vs code extension bits 2023-11-04 18:03:48 +11:00
docs Update insertion doc for vscode (#10482) 2024-06-22 02:16:08 +00:00
eng Update dependencies from https://github.com/dotnet/arcade build 20241016.1 2024-10-16 21:39:43 +00:00
src Allow @@ as a fallback (#10752) 2024-08-20 10:50:58 -07:00
.editorconfig Enable Roslyn diagnostics for MEF 2024-01-23 15:10:59 -08:00
.gitattributes Add UTF-8 encoding to .gitattributes (#8163) 2023-01-23 12:27:05 -08:00
.gitignore Warn on invalid NuGet configuration 2024-04-04 13:08:17 -07:00
.globalconfig Remove unnecessary variable assignments (#10428) 2024-05-30 18:43:30 +02:00
.vsconfig Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
BuildAnalyzers.sln Use project references for analyzers 2023-09-19 12:50:51 -07:00
CODE-OF-CONDUCT.md Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
CONTRIBUTING.md Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
Directory.Build.props Revert "Revert "Move to Central Package Management"" (#10235) 2024-04-07 08:21:46 +10:00
Directory.Build.targets Framework MSBuild demands a string 2024-04-05 09:47:09 -05:00
Directory.Packages.props Merge remote-tracking branch 'upstream/release/dev17.10' into merges/release/dev17.10-to-release/dev17.11 2024-08-12 15:05:38 -07:00
LICENSE.txt Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
NOTICE.txt Remove VS Mac specific code 2023-09-13 09:37:40 +10:00
NuGet.config Upgrade Roslyn.Diagnostics.Analyzers versions and fix new warnings. 2024-03-06 11:34:42 -08:00
README.md Remove VS Mac specific code 2023-09-13 09:37:40 +10:00
README_compiler.md Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
Razor.Slim.slnf Remove MS.VS.Editor.Razor and *.Test projects 2024-04-05 10:00:29 -07:00
Razor.sln Merge branch 'main' into big-smoosh 2024-04-08 08:39:35 -07:00
SECURITY.md Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
SpellingExclusions.dic Clean up ProjectConfigurationFileChangeEventArgs a bit 2024-04-19 09:35:32 -07:00
activate.ps1 Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
activate.sh Added executable flag to activate.sh (#1938) 2020-05-27 17:10:47 -07:00
azure-pipelines-compliance.yml Fix APIScan authentication (#10504) 2024-06-19 19:52:25 +02:00
azure-pipelines-conditional-integration.yml Disable CodeQL in unofficial builds (#10004) 2024-02-29 10:53:44 +01:00
azure-pipelines-integration-dartlab.yml Disable CodeQL in unofficial builds (#10004) 2024-02-29 10:53:44 +01:00
azure-pipelines-official.yml Switch to regular pool in 17.10 branch (#10535) 2024-06-26 11:16:21 +02:00
azure-pipelines-richnav.yml Disable CodeQL in unofficial builds (#10004) 2024-02-29 10:53:44 +01:00
azure-pipelines.yml Switch to regular pool in 17.10 branch (#10535) 2024-06-26 11:16:21 +02:00
build.cmd Clean up from previous PR (#8863) 2023-06-23 14:21:30 -07:00
build.ps1 Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
build.sh Workaround issue with .editorconfigs when NUGET_PACKAGES does not have a 2024-03-22 11:17:35 -07:00
clean.cmd Remove BOM from batch files 2023-01-10 10:45:26 -08:00
clean.ps1 Update file encoding to UTF-8 with BOM (#8099) 2023-01-10 01:57:58 +00:00
clean.sh Added executable bit to clean shell script (#1841) 2020-04-27 17:13:25 -07:00
global.json Update dependencies from https://github.com/dotnet/arcade build 20241016.1 2024-10-16 21:39:43 +00:00
restore.cmd Remove BOM from batch files 2023-01-10 10:45:26 -08:00
restore.sh Add dedicated scripts for restore 2018-12-14 12:50:08 -08:00
startvs.cmd Update StartVS script 2023-01-10 09:19:06 -08:00
startvs.ps1 Update StartVS script 2023-01-10 09:19:06 -08:00

README.md

ASP.NET Core Razor

This repository is the open-source implementation for the Razor experience in ASP.NET Core. It contains the compiler and IDE tools for working on Razor ASP.NET Core apps using Visual Studio and Visual Studio Code.

Contributing

All work on Razor happens directly on GitHub. Both core team members and external contributors send pull requests which go through the same review process. Some of the best ways to contribute are to try things out, file issues, join in design conversations, and make pull requests.

Getting Started with Razor

If you are unfamiliar with ASP.NET Core or Razor, follow the links below to learn more:

Also check out the .NET Homepage for released versions of .NET, getting started guides, and learning resources.

Reporting security issues and bugs

Security issues and bugs should be reported privately, via email, to the Microsoft Security Response Center (MSRC) secure@microsoft.com. You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Further information, including the MSRC PGP key, can be found in the Security TechCenter.

Status

Build Status

These are some other repos for related projects:

Code of conduct

See CODE-OF-CONDUCT.md