Skip to content

Commit 79a3de0

Browse files
author
Jason Zhai
committed
Merge branch 'main' of https://github.com/dotnet/sdk into darc-main-86b63178-e6e0-4baf-80a2-68fa2bb61b88
2 parents a11d8a8 + b41708c commit 79a3de0

34 files changed

+418
-616
lines changed

.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:

.vsts-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ extends:
285285
name: Azure Pipelines
286286
image: macOS-latest
287287
os: macOS
288-
helixTargetQueue: osx.13.amd64
288+
helixTargetQueue: osx.15.amd64
289289
oneESCompat:
290290
templateFolderName: templates-official
291291
publishTaskPrefix: 1ES.
@@ -313,7 +313,7 @@ extends:
313313
name: Azure Pipelines
314314
vmImage: macOS-latest
315315
os: macOS
316-
helixTargetQueue: osx.13.arm64
316+
helixTargetQueue: osx.15.arm64
317317
macOSJobParameterSets:
318318
- categoryName: TestBuild
319319
buildArchitecture: arm64

.vsts-pr.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ stages:
6868
name: Azure Pipelines
6969
vmImage: macOS-latest
7070
os: macOS
71-
helixTargetQueue: osx.13.amd64.open
71+
helixTargetQueue: osx.15.amd64.open
7272
### ARM64 ###
7373
- ${{ if eq(parameters.enableArm64Job, true) }}:
7474
- template: /eng/pipelines/templates/jobs/sdk-job-matrix.yml
@@ -77,7 +77,7 @@ stages:
7777
name: Azure Pipelines
7878
vmImage: macOS-latest
7979
os: macOS
80-
helixTargetQueue: osx.13.arm64.open
80+
helixTargetQueue: osx.15.arm64.open
8181
macOSJobParameterSets:
8282
- categoryName: TestBuild
8383
buildArchitecture: arm64

documentation/general/trust-code.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Overview
2+
The .NET SDK is intended to be a collection of tools for manipulating, building, and executing code. As a result, there is no way to ensure that it is 100% secure regardless of how it is used. This document attempts to make clear the line between what security threats are up to the user and what threats the SDK should protect against. It defines the trust boundary where the user can assume that as long as they are secure in the ways outlined in this document, they will not be compromised by an outside threat actor.
3+
4+
# Types of Threats
5+
6+
## Untrusted Source Code
7+
You should never build or run code from an untrusted source without employing mitigating factors like those described [here](ExecutingCustomerCode.md). Additionally, some SDK commands will automatically find code or code-adjacent files in the current directory, project directory, executable directory, or any parent directory of any of those up to the file system root. Files that may affect a build or other command if found include but are not limited to a Directory.Build.props, global.json, NuGet.config, or dotnet-tools.json. You should also check your home folder as well as environment variables that may point to other locations the SDK will search to find code or configuration files.
8+
9+
## Untrusted Locations
10+
Some folders often store untrusted files. (The Downloads folder is a fairly straightforward example of that.) Some commands look "next to" the project, solution, or other code file being worked with in the directory. Do not run dotnet CLI commands from within any directory that contains any files you do not trust.
11+
12+
## Untrusted Packages
13+
Since many SDK commands utilize NuGet under the covers, we further assume that:
14+
* NuGet packages in local caches are trustworthy.
15+
* NuGet.Config, Packages.Config, .props, and similar files within our resolution scope (see previous comments on trusted and untrusted directories) point only to trusted package repositories and/or packages.
16+
17+
See: [Managing the global packages and cache folders](https://learn.microsoft.com/nuget/consume-packages/managing-the-global-packages-and-cache-folders), [Managing package trust boundaries](https://learn.microsoft.com/nuget/consume-packages/installing-signed-packages), and [Consuming packages from authenticated feeds](https://learn.microsoft.com/nuget/consume-packages/consuming-packages-authenticated-feeds) for more information.
18+
19+
Violating these assumptions may lead to unwanted code execution.

0 commit comments

Comments
 (0)