Skip to content

Commit fa319e3

Browse files
SimonZhao888SimonZhao888
authored
Merge branch 'main' into dev/Simon/Fix_Issue_42921_Re-enableDotNetWatcherTests
2 parents 612d787 + 5f0b2ce commit fa319e3

File tree

467 files changed

+22439
-6468
lines changed

Some content is hidden

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

467 files changed

+22439
-6468
lines changed

‎.config/dotnet-tools.json

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

‎.devcontainer/devcontainer.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,10 @@
2727
"DOTNET_ROOT": "${containerWorkspaceFolder}/.dotnet",
2828
"DOTNET_MSBUILD_SDK_RESOLVER_CLI_DIR": "${containerWorkspaceFolder}/.dotnet",
2929
"NUGET_PACKAGES": "/home/vscode/.nuget/packages"
30+
},
31+
"remoteUser": "vscode",
32+
"hostRequirements": {
33+
"cpus": 16,
34+
"memory": "32gb"
3035
}
3136
}

‎.devcontainer/scripts/post-creation.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
1+
#! /usr/bin/env sh
2+
13
# Install SDK and tool dependencies before container starts
24
# Also run the full restore on the repo so that go-to definition
35
# and other language features will be available in C# files
46
./restore.sh
7+
# run the build so that everything is 'hot'
8+
./build.sh -tl:off
9+
# setup the IDE env to point to the local .dotnet folder so that assemblies/tools are loaded as expected
10+
# this script is run from repo root so shellcheck warning about relative-path lookups can be ignored
11+
# shellcheck disable=SC1091
12+
. ./artifacts/sdk-build-env.sh

‎.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,10 @@ indent_brace_style = Allman
475475
[*.{csproj,vbproj,vcxproj,vcxproj.filters,proj,nativeproj,locproj}]
476476
indent_size = 2
477477

478+
# WiX files
479+
[*.{wixproj,wxs,wxi,wxl,thm}]
480+
indent_size = 2
481+
478482
[*.{csproj,vbproj,proj,nativeproj,locproj}]
479483
charset = utf-8-bom
480484

‎.github/ISSUE_TEMPLATE/10_bug_report.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,11 @@ Include the exception you get when facing this issue
2929
-->
3030

3131
### Further technical details
32-
- Include the output of `dotnet --info`
33-
- The IDE (VS / VS Code/ VS4Mac) you're running on, and its version
32+
<details><summary>details of dotnet --info</summary>
33+
<p>
34+
<!--
35+
Include the `dotnet --info` output here
36+
-->
37+
</p>
38+
</details>
39+
- The IDE (VS / VS Code/ VS4Mac) you're running on, and its version

‎.github/copilot-instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ Output Considerations:
1111
- When considering how output should look, solicit advice from baronfel.
1212

1313
Localization:
14-
- Avoid modifying .xlf files and instead prompt the user to update them using the `/t:UpdateXlf` target on MSBuild.
14+
- Avoid modifying .xlf files and instead prompt the user to update them using the `/t:UpdateXlf` target on MSBuild. Correctly automatically modified .xlf files have elements with state `needs-review-translation` or `new`.
1515
- Consider localizing strings in .resx files when possible.
1616

1717
Documentation:
18-
- Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.
18+
- Do not manually edit files under documentation/manpages/sdk as these are generated based on documentation and should not be manually modified.

‎.github/workflows/copilot-setup-steps.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
steps:
2626
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
2727
- name: Do an initial build to ensure all dependencies are restored
28+
continue-on-error: true
2829
run: |
2930
./build.sh
3031
- name: Put repo-local dotnet install on PATH

‎.vscode/launch.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"version": "0.2.0",
3+
"configurations": [
4+
{
5+
"name": ".NET Core Launch (console)",
6+
"type": "coreclr",
7+
"request": "launch",
8+
"program": "${workspaceFolder}${/}artifacts${/}bin${/}redist${/}Debug${/}dotnet${/}sdk${/}10.0.100--dev${/}dotnet.dll",
9+
"args": [
10+
],
11+
"env": {
12+
"MSBuildExtensionsPath": "${workspaceFolder}${/}artifacts${/}bin${/}redist${/}Debug${/}dotnet${/}sdk${/}10.0.100-dev",
13+
"MSBuildSDKsPath": "${workspaceFolder}${/}artifacts${/}bin${/}redist${/}Debug${/}dotnet${/}sdk${/}10.0.100-dev${/}Sdks",
14+
"DOTNET_ROOT": "${workspaceFolder}${/}artifacts${/}bin${/}redist${/}Debug${/}dotnet",
15+
},
16+
"stopAtEntry": false,
17+
"console": "integratedTerminal",
18+
"justMyCode": true
19+
},
20+
{
21+
"name": ".NET Core Attach",
22+
"type": "coreclr",
23+
"request": "attach",
24+
"requireExactSource": false
25+
}
26+
]
27+
}

‎.vscode/mcp.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"servers": {
3+
"ms.docs": {
4+
"url": "https://learn.microsoft.com/api/mcp",
5+
"type": "http"
6+
}
7+
},
8+
"inputs": []
9+
}

‎.vscode/settings.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"dotnet.testWindow.disableAutoDiscovery": true,
3+
"dotnet.defaultSolution": "sdk.slnx"
4+
}

0 commit comments

Comments
 (0)