Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/CodeAnalysis.src.globalconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1178,7 +1178,7 @@ dotnet_diagnostic.SA1013.severity = none
dotnet_diagnostic.SA1014.severity = warning

# SA1015: Closing generic bracket should not be followed by a space
dotnet_diagnostic.SA1015.severity = none
dotnet_diagnostic.SA1015.severity = warning

# SA1018: Nullable type symbol should not be preceded by a space
dotnet_diagnostic.SA1018.severity = warning
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,7 @@ public override JsonModelItem Read(ref Utf8JsonReader reader, Type typeToConvert
var dict = JsonSerializer.Deserialize<Dictionary<string, string>>(ref reader, options);
if (dict == null)
return null!;
var idict = new Dictionary<string, string> (dict, StringComparer.OrdinalIgnoreCase);
var idict = new Dictionary<string, string>(dict, StringComparer.OrdinalIgnoreCase);
if (!idict.TryGetValue("Identity", out var identity) || string.IsNullOrEmpty(identity))
throw new JsonException ("deserialized json dictionary item did not have a non-empty Identity metadata");
else
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ private bool InstallPacks(InstallWorkloadRequest req, string nugetConfigContents
Path.Combine(req.TargetPath, "dotnet"),
$"workload install --skip-manifest-update --skip-sign-check --configfile \"{nugetConfigPath}\" --temp-dir \"{_tempDir}/workload-install-temp\" {ExtraWorkloadInstallCommandArguments} {req.WorkloadId}",
workingDir: _tempDir,
envVars: new Dictionary<string, string> () {
envVars: new Dictionary<string, string>() {
["NUGET_PACKAGES"] = _nugetCachePath
},
logStdErrAsMessage: req.IgnoreErrors,
Expand Down
3 changes: 3 additions & 0 deletions src/tools/illink/.editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ file_header_template = Copyright (c) .NET Foundation and contributors. All right
# Spacing around keywords
dotnet_diagnostic.SA1000.severity = none

# Closing generic bracket should not be followed by a space
dotnet_diagnostic.SA1015.severity = none

# Access modifier must be declared
dotnet_diagnostic.SA1400.severity = none

Expand Down
Loading