Skip to content

Commit 9d8e9c5

Browse files
Youssef1313Youssef1313
authored
Merge branch 'main' into dev/ygerges/cleanup-dotnet-root
2 parents 7705c39 + 35ad031 commit 9d8e9c5

File tree

360 files changed

+19575
-3554
lines changed

Some content is hidden

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

360 files changed

+19575
-3554
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.25358.3",
6+
"version": "1.1.0-beta.25374.1",
77
"commands": [
88
"darc"
99
]

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

‎.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/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

‎.github/workflows/remove-lockdown-label.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,4 +68,4 @@ jobs:
6868
name: 'Branch Lockdown'
6969
});
7070
console.log(`Removed Branch Lockdown label from PR #${pr.number}`);
71-
}
71+
}

‎.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+
}

‎.vsconfig‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Component.Roslyn.Compiler",
5+
"Microsoft.Component.MSBuild",
6+
"Microsoft.VisualStudio.Component.Roslyn.LanguageServices",
7+
"Microsoft.VisualStudio.Component.SQL.LocalDB.Runtime",
8+
"Microsoft.VisualStudio.Component.SQL.CLR",
9+
"Microsoft.VisualStudio.Component.CoreEditor",
10+
"Microsoft.VisualStudio.Workload.CoreEditor",
11+
"Microsoft.Net.Component.4.8.SDK",
12+
"Microsoft.Net.Component.4.7.2.TargetingPack",
13+
"Microsoft.Net.ComponentGroup.DevelopmentPrerequisites",
14+
"Microsoft.VisualStudio.Component.TypeScript.TSServer",
15+
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions",
16+
"Microsoft.VisualStudio.Component.JavaScript.TypeScript",
17+
"Microsoft.VisualStudio.Component.TextTemplating",
18+
"Microsoft.VisualStudio.Component.NuGet",
19+
"Microsoft.Component.ClickOnce",
20+
"Microsoft.VisualStudio.Component.ManagedDesktop.Core",
21+
"Microsoft.NetCore.Component.Runtime.10.0",
22+
"Microsoft.NetCore.Component.SDK",
23+
"Microsoft.VisualStudio.Component.FSharp",
24+
"Microsoft.ComponentGroup.ClickOnce.Publish",
25+
"Microsoft.NetCore.Component.DevelopmentTools",
26+
"Microsoft.Net.Component.4.8.TargetingPack",
27+
"Microsoft.Net.ComponentGroup.4.8.DeveloperTools",
28+
"Microsoft.VisualStudio.Component.IntelliTrace.FrontEnd",
29+
"Microsoft.VisualStudio.Component.DiagnosticTools",
30+
"Microsoft.VisualStudio.Component.EntityFramework",
31+
"Microsoft.VisualStudio.Component.LiveUnitTesting",
32+
"Microsoft.VisualStudio.Component.Debugger.JustInTime",
33+
"Component.Microsoft.VisualStudio.LiveShare.2022",
34+
"Microsoft.VisualStudio.Component.IntelliCode",
35+
"Component.VisualStudio.GitHub.Copilot",
36+
"Microsoft.VisualStudio.Component.ClassDesigner",
37+
"Microsoft.VisualStudio.Component.GraphDocument",
38+
"Microsoft.VisualStudio.Component.CodeMap",
39+
"Microsoft.VisualStudio.Component.VC.CoreIde",
40+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
41+
"Microsoft.VisualStudio.Component.Graphics.Tools",
42+
"Microsoft.VisualStudio.Component.VC.DiagnosticTools",
43+
"Microsoft.VisualStudio.Component.Windows11SDK.26100",
44+
"Microsoft.VisualStudio.Component.ManagedDesktop.Prerequisites",
45+
"Microsoft.VisualStudio.Component.DotNetModelBuilder",
46+
"Microsoft.ComponentGroup.Blend",
47+
"Microsoft.VisualStudio.Component.Debugger.VsDbgExe",
48+
"Microsoft.VisualStudio.Workload.ManagedDesktop",
49+
"Microsoft.VisualStudio.Component.VC.ATL",
50+
"Microsoft.VisualStudio.ComponentGroup.ArchitectureTools.Native",
51+
"Microsoft.VisualStudio.Component.VC.Redist.14.Latest",
52+
"Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core",
53+
"Microsoft.VisualStudio.Component.Windows11Sdk.WindowsPerformanceToolkit",
54+
"Microsoft.VisualStudio.Component.CppBuildInsights",
55+
"Microsoft.VisualStudio.ComponentGroup.WebToolsExtensions.CMake",
56+
"Microsoft.VisualStudio.Component.VC.CMake.Project",
57+
"Microsoft.VisualStudio.Component.VC.TestAdapterForBoostTest",
58+
"Microsoft.VisualStudio.Component.VC.TestAdapterForGoogleTest",
59+
"Microsoft.VisualStudio.Component.VC.ASAN",
60+
"Microsoft.VisualStudio.Component.Vcpkg",
61+
"Microsoft.VisualStudio.Workload.NativeDesktop",
62+
"Microsoft.NetCore.Component.Runtime.8.0",
63+
"Microsoft.Net.Component.4.6.TargetingPack",
64+
"Microsoft.VisualStudio.Component.VSSDK",
65+
"Microsoft.VisualStudio.ComponentGroup.VisualStudioExtension.Prerequisites",
66+
"Microsoft.Component.CodeAnalysis.SDK",
67+
"Microsoft.VisualStudio.Workload.VisualStudioExtension"
68+
],
69+
"extensions": []
70+
}

0 commit comments

Comments
 (0)