Skip to content

Commit 227ad28

Browse files
authored
Merge pull request #8325 from MiYanni/LinkCheckInvalidJsonString
Fix markdown-link-check to run properly, fix JSON parse warning in CredScan
2 parents 532c6dd + 16afa27 commit 227ad28

File tree

7 files changed

+27
-10
lines changed

7 files changed

+27
-10
lines changed

.github/ISSUE_TEMPLATE/branch-checklist.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ _Descriptions of these steps can be found in the team OneNote._
2323
- [ ] Update the [signed build definition](https://devdiv.visualstudio.com/DevDiv/_build?definitionId=9675) to build the new branch
2424
- [ ] Update Roslyn Tools [config.xml](https://github.com/dotnet/roslyn-tools/blob/main/src/GitHubCreateMergePRs/config.xml) file to flow branch changes to the latest dev branch
2525
- [ ] dotnet/roslyn-tools PR: https://github.com/dotnet/roslyn-tools/pull/❓
26-
- [ ] Update [Versions.props](..\..\build\import\Versions.props) (via `<ProjectSystemVersion>`) and [version.json](..\..\version.json) (via `"version"` and `"assemblyVersion"`) to match the version of VS, if needed
26+
- [ ] Update [Versions.props](..\\..\build\import\Versions.props) (via `<ProjectSystemVersion>`) and [version.json](..\\..\version.json) (via `"version"` and `"assemblyVersion"`) to match the version of VS, if needed
2727
- [ ] In new branch: https://github.com/dotnet/project-system/blob/dev17.❓.x/build/import/Versions.props
2828
- [ ] In `main`: https://github.com/dotnet/project-system/blob/main/build/import/Versions.props
2929
- [ ] Clone existing release definition to insert this branch into VS (see OneNote)
Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,30 @@
11
{
22
"ignorePatterns": [
33
{
4-
"pattern": "^https://.*\.visualstudio\.com"
4+
"pattern": "^https:\/\/.*\\.visualstudio\\.com"
5+
},
6+
{
7+
"pattern": "^https:\/\/dev\\.azure\\.com"
8+
},
9+
{
10+
"pattern": "^https:\/\/aka\\.ms"
11+
},
12+
{
13+
"pattern": ".*❓.*"
514
}
615
],
716
"replacementPatterns": [
817
{
918
"pattern": "^/",
1019
"replacement": "{{BASEURL}}/"
1120
}
21+
],
22+
"httpHeaders": [
23+
{
24+
"urls": ["https://docs.github.com/"],
25+
"headers": {
26+
"Accept-Encoding": "zstd, br, gzip, deflate"
27+
}
28+
}
1229
]
1330
}

.github/workflows/markdown-link-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on: [push, pull_request]
33

44
jobs:
55
markdown-link-check:
6-
name: verify
6+
name: markdown-link-check
77
runs-on: ubuntu-latest
88

99
steps:

SECURITY.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ The .NET Core and ASP.NET Core support policy, including supported versions can
88

99
Security issues and bugs should be reported privately to the Microsoft Security Response Center (MSRC), either by emailing secure@microsoft.com or via the portal at https://msrc.microsoft.com.
1010
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
11-
original message. Further information, including the MSRC PGP key, can be found in the [MSRC Report an Issue FAQ](https://www.microsoft.com/en-us/msrc/faqs-report-an-issue).
11+
original message. Further information, including the MSRC PGP key, can be found in the [MSRC Report an Issue FAQ](https://www.microsoft.com/msrc/faqs-report-an-issue).
1212

1313
Reports via MSRC may qualify for the .NET Core Bug Bounty. Details of the .NET Core Bug Bounty including terms and conditions are at [https://aka.ms/corebounty](https://aka.ms/corebounty).
1414

build/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
- *Potential change*: Rename this folder to `pipelines` as part of: https://github.com/dotnet/project-system/issues/7915
77

88
#### Notable Files
9-
- [official.yml](build\official.yml): This file is our official build pipeline that produces the signed packages (VSIX) that used for insertion into Visual Studio.
10-
- [unit-tests.yml](build\unit-tests.yml): This file is our build pipeline used when validating pull requests into the repo from GitHub.
9+
- [official.yml](ci\official.yml): This file is our official build pipeline that produces the signed packages (VSIX) that used for insertion into Visual Studio.
10+
- [unit-tests.yml](ci\unit-tests.yml): This file is our build pipeline used when validating pull requests into the repo from GitHub.
1111

1212
### `import`
1313
- This directory is highly accessed as part of the MSBuild pipeline to produce our assemblies, run tests, create packages, etc.
@@ -22,7 +22,7 @@
2222

2323
### `loc`
2424
- This directory contains the **OneLocBuildSetup** project which creates the `LocProject.json` and copies language-specific XLF files to become language-neutral; both of these are required for the [OneLocBuild](https://aka.ms/OneLocBuild) process for localization.
25-
- The **OneLocBuildSetup** project is only build and used as part of the [one-loc-build.yml](build\one-loc-build.yml) pipeline.
25+
- The **OneLocBuildSetup** project is only build and used as part of the [one-loc-build.yml](ci\one-loc-build.yml) pipeline.
2626
- *Potential change*: This pipeline might be combined into another pipeline as part of: https://github.com/dotnet/project-system/issues/7915
2727

2828
### `optprof`

docs/repo/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
#### Prerequisites
44
- [Visual Studio 16.3 Preview 2 or higher](https://visualstudio.microsoft.com/vs/preview/)
55
- GitHub account
6-
- Basic Git experience: https://try.github.io/
6+
- Basic Git experience: https://docs.github.com/get-started/quickstart/set-up-git
77

88
All commands below are run under a [Visual Studio Developer Prompt](https://msdn.microsoft.com/en-us/library/ms229859(v=vs.150).aspx).
99

1010
## Code
1111

12-
Contribution to this repository is via the [fork model](https://help.github.com/articles/fork-a-repo/). Contributors push changes to their own "forked" version of project-system, and then submit a pull request into it requesting those changes be merged.
12+
Contribution to this repository is via the [fork model](https://docs.github.com/get-started/quickstart/fork-a-repo). Contributors push changes to their own "forked" version of project-system, and then submit a pull request into it requesting those changes be merged.
1313

1414
To get started:
1515

setup/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
- This project is an SDK-style VS Extension project, creating the VSIX package defined by the `source.extension.vsixmanifest`.
4444
- This project type is able to build via a workaround in our [Directory.Build.targets](..\Directory.Build.targets) that loads the `Microsoft.VsSDK.targets` manually.
4545
- The assembly produced from the `.csproj` is not used.
46-
- The assemblies from [Microsoft.VisualStudio.AppDesigner.csproj](..\src\Microsoft.VisualStudio.AppDesigner\Microsoft.VisualStudio.AppDesigner.csproj) and [Microsoft.VisualStudio.Editors.csproj](..\src\Microsoft.VisualStudio.Editors\Microsoft.VisualStudio.Editors.csproj) are included in the produced VSIX package.
46+
- The assemblies from [Microsoft.VisualStudio.AppDesigner.csproj](..\src\Microsoft.VisualStudio.AppDesigner\Microsoft.VisualStudio.AppDesigner.vbproj) and [Microsoft.VisualStudio.Editors.csproj](..\src\Microsoft.VisualStudio.Editors\Microsoft.VisualStudio.Editors.vbproj) are included in the produced VSIX package.
4747
- The `.vsmanproj` creates the `.vsman` manifest, which is inserted into VS as `Microsoft.VisualStudio.Editors.vsman`.
4848

4949
## High-level Design

0 commit comments

Comments
 (0)