Skip to content

Commit 961ab9b

Browse files
MiYanniMiYanni
committed
Merge branch 'main' into locfiles/8e676afd-e256-405b-a919-40f9eb99aaf7
# Conflicts: # src/Cli/dotnet/Commands/xlf/CliCommandStrings.cs.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.de.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.es.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.fr.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.it.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.ja.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.ko.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.pl.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.pt-BR.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.ru.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.tr.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hans.xlf # src/Cli/dotnet/Commands/xlf/CliCommandStrings.zh-Hant.xlf
2 parents a3a5dae + 3b15dbb commit 961ab9b

30 files changed

+1818
-418
lines changed

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

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

‎Directory.Packages.props

Lines changed: 1 addition & 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)" />

‎eng/Version.Details.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@
9696
<Uri>https://github.com/dotnet/dotnet</Uri>
9797
<Sha>1add0c55b8beeb1b1de4d81e362fad8978c4c8c8</Sha>
9898
</Dependency>
99+
<Dependency Name="Microsoft.CodeAnalysis.BuildClient" Version="5.0.0-2.25373.106">
100+
<Uri>https://github.com/dotnet/dotnet</Uri>
101+
<Sha>1add0c55b8beeb1b1de4d81e362fad8978c4c8c8</Sha>
102+
</Dependency>
99103
<Dependency Name="Microsoft.CodeAnalysis.CSharp" Version="5.0.0-2.25373.106">
100104
<Uri>https://github.com/dotnet/dotnet</Uri>
101105
<Sha>1add0c55b8beeb1b1de4d81e362fad8978c4c8c8</Sha>

‎eng/Versions.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@
218218
<MicrosoftNetCompilersToolsetVersion>5.0.0-2.25373.106</MicrosoftNetCompilersToolsetVersion>
219219
<MicrosoftNetCompilersToolsetFrameworkPackageVersion>5.0.0-2.25373.106</MicrosoftNetCompilersToolsetFrameworkPackageVersion>
220220
<MicrosoftCodeAnalysisPackageVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisPackageVersion>
221+
<MicrosoftCodeAnalysisBuildClientVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisBuildClientVersion>
221222
<MicrosoftCodeAnalysisCSharpPackageVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisCSharpPackageVersion>
222223
<MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisCSharpCodeStylePackageVersion>
223224
<MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>5.0.0-2.25373.106</MicrosoftCodeAnalysisCSharpFeaturesPackageVersion>

‎src/Cli/Microsoft.DotNet.Cli.Utils/ArgumentEscaper.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,12 @@ private static IEnumerable<string> EscapeArgArrayForCmd(IEnumerable<string> argu
8686
return escapedArgs;
8787
}
8888

89-
public static string EscapeSingleArg(string arg)
89+
public static string EscapeSingleArg(string arg, Func<string, bool>? additionalShouldSurroundWithQuotes = null)
9090
{
9191
var sb = new StringBuilder();
9292

9393
var length = arg.Length;
94-
var needsQuotes = length == 0 || ShouldSurroundWithQuotes(arg);
94+
var needsQuotes = length == 0 || ShouldSurroundWithQuotes(arg) || additionalShouldSurroundWithQuotes?.Invoke(arg) == true;
9595
var isQuoted = needsQuotes || IsSurroundedWithQuotes(arg);
9696

9797
if (needsQuotes) sb.Append("\"");

0 commit comments

Comments
 (0)