Skip to content

Commit e047956

Browse files
committed
Merge remote-tracking branch 'origin/main' into merge/release/9.0.3xx-to-main
2 parents 5cd282e + 35b730f commit e047956

File tree

5,493 files changed

+224253
-200945
lines changed

Some content is hidden

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

5,493 files changed

+224253
-200945
lines changed

.config/dotnet-tools.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"microsoft.dotnet.darc": {
6-
"version": "1.1.0-beta.24367.3",
6+
"version": "1.1.0-beta.25257.6",
77
"commands": [
88
"darc"
99
]

.config/tsaoptions.json

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"instanceUrl": "https://devdiv.visualstudio.com/",
3+
"template": "TFSDEVDIV",
4+
"projectName": "DEVDIV",
5+
"areaPath": "DevDiv\\NET Tools\\SDK",
6+
"iterationPath": "DevDiv",
7+
"notificationAliases": [ "[email protected]" ],
8+
"repositoryName": "dotnet-sdk",
9+
"codebaseName": "dotnet-sdk"
10+
}

.devcontainer/devcontainer.json

+5
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@
1111
]
1212
}
1313
},
14+
"features": {
15+
"ghcr.io/devcontainers/features/sshd:1": {
16+
"version": "latest"
17+
}
18+
},
1419
// Use 'postCreateCommand' to run commands after the container is created.
1520
"postCreateCommand": "bash -i ${containerWorkspaceFolder}/.devcontainer/scripts/post-creation.sh",
1621
// Add the locally installed dotnet to the path to ensure that it is activated

.devcontainer/vmr/README.md

-61
This file was deleted.

.devcontainer/vmr/devcontainer.json

-25
This file was deleted.

.devcontainer/vmr/init.sh

-30
This file was deleted.

.devcontainer/vmr/synchronize-vmr.sh

-4
This file was deleted.

.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ dotnet_diagnostic.SA1601.severity = none
456456
dotnet_diagnostic.SA1633.severity = none
457457

458458
# Additional rules for test source code for template engine
459-
[test/{Microsoft.TemplateEngine.*,dotnet-new.Tests}/**.cs]
459+
[test/{Microsoft.TemplateEngine.*,dotnet-new.IntegrationTests}/**.cs]
460460
# Test methods should not be skipped
461461
dotnet_diagnostic.xUnit1004.severity = warning
462462
# Elements should appear in the correct order

.gitattributes

+6
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,12 @@
1010
###############################################################################
1111
*.xlf linguist-generated=true
1212

13+
###############################################################################
14+
# Set default behavior to:
15+
# don't collapse these files in PRs
16+
###############################################################################
17+
**/build/** linguist-generated=false
18+
1319
###############################################################################
1420
# Set file behavior to:
1521
# treat as text

.github/copilot-instructions.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Coding Style and Changes:
2+
- Code should match the style of the file it's in.
3+
- Changes should be minimal to resolve a problem in a clean way.
4+
- User-visible changes to behavior should be considered carefully before committing. They should always be flagged.
5+
6+
Testing:
7+
- Large changes should always include test changes.
8+
- The Skip parameter of the Fact attribute to point to the specific issue link.
9+
10+
Output Considerations:
11+
- When considering how output should look, solicit advice from baronfel.
12+
13+
Localization:
14+
- Avoid modifying .xlf files and instead prompt the user to update them using the `/t:UpdateXlf` target on MSBuild.
15+
- Consider localizing strings in .resx files when possible.

0 commit comments

Comments
 (0)