Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify devcontainer setup and resolve git line ending conflicts #1637

Merged
merged 2 commits into from
Apr 21, 2021

Conversation

bergmeister
Copy link
Collaborator

PR Summary

  • The .gitattributes change is so that VS-Code does not see red-herring diffs due to different line endings when using devcontainer (Remote Contaienr or GitHub CodeSpaces). This is taken from the docs here: https://code.visualstudio.com/docs/remote/troubleshooting#_resolving-git-line-ending-issues-in-containers-resulting-in-many-modified-files
  • Remove some setup in the Dockerfile that is not necessary for PSSA development. The Dockerfile was originally taken from a generic .NET template for the new devcontainer feature, therefore I can now remove the old licence text. I believe that setup is more geared towards scenarios happen in ASP.NET development but not for the development of this module.

PR Checklist

.devcontainer/Dockerfile Outdated Show resolved Hide resolved
.gitattributes Outdated Show resolved Hide resolved
@rjmholt rjmholt merged commit ec1c58d into PowerShell:master Apr 21, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants