f556e9a86d
This is an automatically generated pull request from release/dev17.12 into release/dev17.13. 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.12 - https://github.com/dotnet/razor/find/release/dev17.13 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.12-to-release/dev17.13 git reset --hard upstream/release/dev17.13 git merge upstream/release/dev17.12 # Fix merge conflicts git commit git push upstream merges/release/dev17.12-to-release/dev17.13 --force ``` |
||
|---|---|---|
| .config | ||
| .devcontainer | ||
| .github | ||
| .vscode | ||
| docs | ||
| eng | ||
| src | ||
| .editorconfig | ||
| .gitattributes | ||
| .gitignore | ||
| .globalconfig | ||
| .vsconfig | ||
| CODE-OF-CONDUCT.md | ||
| CONTRIBUTING.md | ||
| Directory.Build.props | ||
| Directory.Build.targets | ||
| Directory.Packages.props | ||
| LICENSE.txt | ||
| NOTICE.txt | ||
| NuGet.config | ||
| README.md | ||
| README_compiler.md | ||
| Razor.Slim.slnf | ||
| Razor.sln | ||
| SECURITY.md | ||
| SpellingExclusions.dic | ||
| activate.ps1 | ||
| activate.sh | ||
| azure-pipelines-compliance.yml | ||
| azure-pipelines-conditional-integration.yml | ||
| azure-pipelines-integration-dartlab.yml | ||
| azure-pipelines-official.yml | ||
| azure-pipelines-richnav.yml | ||
| azure-pipelines.yml | ||
| build.cmd | ||
| build.ps1 | ||
| build.sh | ||
| clean.cmd | ||
| clean.ps1 | ||
| clean.sh | ||
| global.json | ||
| restore.cmd | ||
| restore.sh | ||
| startvs.cmd | ||
| startvs.ps1 | ||
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.
- Check out the contributing page to see the best places to log issues, start discussions, and for general contributing guidelines.
- Instructions to build Razor Tooling source code
- Follow along with the development of ASP.NET Core:
- Community Standup: The community standup is held every week and streamed live to YouTube. You can view past standups in the linked playlist.
Getting Started with Razor
If you are unfamiliar with ASP.NET Core or Razor, follow the links below to learn more:
- ASP.NET Core apps: Follow the Getting Started instructions in the ASP.NET Core docs.
- Razor pages: Visit the tutorial on getting started with Razor pages.
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
Related projects
These are some other repos for related projects:
- ASP.NET Core - the ASP.NET Core framework
- Documentation - documentation sources for https://docs.microsoft.com/aspnet/core/
- Extensions - Logging, configuration, dependency injection, and more.