Skip to content

Commit 57a4dda

Browse files
joeloffjoeloff
authored
Merge branch 'main' into wix5
2 parents dabe3a7 + 4e77fb9 commit 57a4dda

File tree

275 files changed

+7089
-2572
lines changed

Some content is hidden

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

275 files changed

+7089
-2572
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.25367.1",
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

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

‎CODEOWNERS

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,16 @@
3434
/test/dotnet-format.UnitTests @arunchndr
3535

3636
# Area-NuGet
37-
/src/Cli/dotnet/commands/dotnet-add/dotnet-add-package @dotnet/nuget-team
38-
/test/dotnet-add-package.Tests @dotnet/nuget-team
39-
/src/Cli/dotnet/commands/dotnet-nuget @dotnet/nuget-team
40-
/test/dotnet-nuget.UnitTests @dotnet/nuget-team
41-
/src/Cli/dotnet/commands/dotnet-list/dotnet-list-package @dotnet/nuget-team
42-
/test/dotnet-list-package.Tests @dotnet/nuget-team
37+
/src/Cli/dotnet/Commands/NuGet @dotnet/nuget-team
38+
/src/Cli/dotnet/Commands/Pack @dotnet/nuget-team
39+
/src/Cli/dotnet/Commands/Package @dotnet/nuget-team
40+
/src/Cli/dotnet/Commands/Restore @dotnet/nuget-team
41+
/test/Microsoft.NET.Restore.Tests @dotnet/nuget-team
42+
/test/Microsoft.NET.Pack.Tests @dotnet/nuget-team
43+
/test/dotnet.Tests/CommandTests/NuGet @dotnet/nuget-team
44+
/test/dotnet.Tests/CommandTests/Pack @dotnet/nuget-team
45+
/test/dotnet.Tests/CommandTests/Package @dotnet/nuget-team
46+
/test/dotnet.Tests/CommandTests/Restore @dotnet/nuget-team
4347

4448
# Area-FSharp
4549
/src/Cli/dotnet/commands/dotnet-fsi @dotnet/fsharp

‎Directory.Packages.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<PackageVersion Include="Microsoft.Build.NuGetSdkResolver" Version="$(MicrosoftBuildNuGetSdkResolverPackageVersion)" />
1919
<PackageVersion Include="Microsoft.CodeAnalysis" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
2020
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzer.Testing" Version="$(MicrosoftCodeAnalysisAnalyzerTestingVersion)" />
21+
<PackageVersion Include="Microsoft.CodeAnalysis.BuildClient" Version="$(MicrosoftCodeAnalysisBuildClientVersion)" />
2122
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
2223
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeStyle" Version="$(MicrosoftCodeAnalysisPackageVersion)" />
2324
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Features" Version="$(MicrosoftCodeAnalysisCSharpPackageVersion)" />
@@ -113,6 +114,7 @@
113114
<PackageVersion Include="System.Composition.Runtime" Version="$(SystemCompositionRuntimePackageVersion)" />
114115
<PackageVersion Include="System.Composition.TypedParts" Version="$(SystemCompositionTypedPartsPackageVersion)" />
115116
<PackageVersion Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerPackageVersion)" />
117+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
116118
<PackageVersion Include="System.Formats.Asn1" Version="$(SystemFormatsAsn1Version)" />
117119
<PackageVersion Include="System.IO.Hashing" Version="$(SystemIOHashingPackageVersion)" />
118120
<!-- System.Reflection.Metadata and System.Collections.Immutable cannot be pinned here because of hard dependencies within Roslyn on specific versions that have to work both here and in VS -->

0 commit comments

Comments
 (0)