Skip to content

Commit 8791f6e

Browse files
committed
Merge branch 'main' of https://github.com/dotnet/sdk into ManagedSignerWithBundles
2 parents 1deba35 + a354e47 commit 8791f6e

File tree

4,396 files changed

+136138
-159407
lines changed

Some content is hidden

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

4,396 files changed

+136138
-159407
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
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.25175.1",
6+
"version": "1.1.0-beta.25330.2",
77
"commands": [
88
"darc"
99
]

.devcontainer/devcontainer.json

Lines changed: 5 additions & 0 deletions
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

Lines changed: 0 additions & 61 deletions
This file was deleted.

.devcontainer/vmr/devcontainer.json

Lines changed: 0 additions & 25 deletions
This file was deleted.

.devcontainer/vmr/init.sh

Lines changed: 0 additions & 30 deletions
This file was deleted.

.devcontainer/vmr/synchronize-vmr.sh

Lines changed: 0 additions & 4 deletions
This file was deleted.

.editorconfig

Lines changed: 1 addition & 1 deletion
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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,3 @@
6767
*.verified.txt text eol=lf working-tree-encoding=UTF-8
6868
*.verified.xml text eol=lf working-tree-encoding=UTF-8
6969
*.verified.json text eol=lf working-tree-encoding=UTF-8
70-
71-
src/SourceBuild/patches/**/*.patch text eol=lf

.github/copilot-instructions.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ Output Considerations:
1212

1313
Localization:
1414
- 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.
15+
- Consider localizing strings in .resx files when possible.
16+
17+
Documentation:
18+
- Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.

.github/policies/resourceManagement.yml

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,10 @@ configuration:
7777
- labelAdded:
7878
label: breaking-change
7979
then:
80-
- addLabel:
81-
label: needs-breaking-change-doc-created
8280
- addReply:
8381
reply: >-
84-
Added `needs-breaking-change-doc-created` label because this issue has the `breaking-change` label.
85-
86-
87-
1. [ ] Create and link to this issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
88-
89-
90-
Tagging @dotnet/compat for awareness of the breaking change.
91-
description: Add breaking change doc label to issue
82+
Refer to the [.NET SDK breaking change guidelines](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/breaking-change-guidelines.md#required-process-for-all-net-sdk-breaking-changes)
83+
description: Add breaking change doc instructions to issue
9284
- if:
9385
- payloadType: Pull_Request
9486
- labelAdded:
@@ -106,10 +98,10 @@ configuration:
10698
10799
1. [ ] Create and link to this PR and the issue a matching issue in the dotnet/docs repo using the [breaking change documentation template](https://aka.ms/dotnet/docs/new-breaking-change-issue), then remove this `needs-breaking-change-doc-created` label.
108100
109-
2. [ ] Ask a committer to mail the `.NET Breaking Change Notification` DL.
101+
2. [ ] Ask a committer to mail the `.NET SDK Breaking Change Notification` email list.
110102
111103
112-
Tagging @dotnet/compat for awareness of the breaking change.
113-
description: Add breaking change doc label to PR
104+
You can refer to the [.NET SDK breaking change guidelines](https://github.com/dotnet/sdk/blob/main/documentation/project-docs/breaking-change-guidelines.md)
105+
description: Add breaking change instructions to PR.
114106
onFailure:
115107
onSuccess:

0 commit comments

Comments
 (0)