admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump to .NET SDK 6.0.401 (#18188)

Browse Source
This commit is contained in:
Aditya Patwardhan
2022-09-30 13:35:48 -07:00
committed by GitHub
parent 5d4b1b760d
commit 6906f788fb
12 changed files with 19 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.editorconfig
+2
View File
@@ -114,6 +114,8 @@ dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_auto_properties = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion
dotnet_style_prefer_compound_assignment = false:silent
dotnet_diagnostic.IDE0031.severity = none
dotnet_code_quality_unused_parameters = non_public:suggestion
assets/wix/files.wxs
+3 -3
View File
@@ -3154,8 +3154,8 @@
<Component Id="cmp22840874A8C84AA796496634FBEBF09C">
<File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
</Component>
<Component Id="cmpDF10CA775F754D57B0D88408CA630BD5">
<File Id="filE291DC8D56264F029FDEBE6C4C8F885B" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.822.36306.dll" />
<Component Id="cmp6CB9F94720134CBAB4C97175599DBE5E">
<File Id="fil0B2937AC5E894C5FB6ABE8223AE604E8" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.922.41905.dll" />
</Component>
</DirectoryRef>
</Fragment>
@@ -4173,7 +4173,7 @@
<ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
<ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
<ComponentRef Id="cmpB2EF287C99374D839EDF65DF6D2610F0" />
<ComponentRef Id="cmpDF10CA775F754D57B0D88408CA630BD5" />
<ComponentRef Id="cmp6CB9F94720134CBAB4C97175599DBE5E" />
</ComponentGroup>
</Fragment>
</Wix>
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "6.0.303"
"version": "6.0.401"
}
}
src/System.Management.Automation/System.Management.Automation.csproj
+1 -1
View File
@@ -17,7 +17,7 @@
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.1" />
<PackageReference Include="System.DirectoryServices" Version="6.0.0" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="6.0.0" />
src/System.Management.Automation/singleshell/config/MshSnapinInfo.cs
+2
View File
@@ -1296,7 +1296,9 @@ namespace System.Management.Automation
{
lock (s_syncObject)
{
#pragma warning disable IDE0074 // Disabling the rule because it can't be applied on non Unix
if (s_defaultMshSnapins == null)
#pragma warning restore IDE0074
{
s_defaultMshSnapins = new List<DefaultPSSnapInInformation>()
{
src/System.Management.Automation/utils/tracing/PSSysLogProvider.cs
+2 -5
View File
@@ -49,11 +49,8 @@ namespace System.Management.Automation.Tracing
{
get
{
if (t_payloadBuilder == null)
{
// NOTE: Thread static fields must be explicitly initialized for each thread.
t_payloadBuilder = new StringBuilder(200);
}
// NOTE: Thread static fields must be explicitly initialized for each thread.
t_payloadBuilder ??= new StringBuilder(200);
return t_payloadBuilder;
}
src/System.Management.Automation/utils/tracing/SysLogProvider.cs
+3 -9
View File
@@ -130,11 +130,8 @@ namespace System.Management.Automation.Tracing
{
get
{
if (t_messageBuilder == null)
{
// NOTE: Thread static fields must be explicitly initialized for each thread.
t_messageBuilder = new StringBuilder(200);
}
// NOTE: Thread static fields must be explicitly initialized for each thread.
t_messageBuilder ??= new StringBuilder(200);
return t_messageBuilder;
}
@@ -201,10 +198,7 @@ namespace System.Management.Automation.Tracing
{
get
{
if (_resourceManager is null)
{
_resourceManager = new global::System.Resources.ResourceManager("System.Management.Automation.resources.EventResource", typeof(EventResource).Assembly);
}
_resourceManager ??= new global::System.Resources.ResourceManager("System.Management.Automation.resources.EventResource", typeof(EventResource).Assembly);
return _resourceManager;
}
test/perf/dotnet-tools/Reporting/Reporting.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="5.0.0-preview.5.20278.1" />
</ItemGroup>
test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.8.0" />
<PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
<PackageReference Include="Perfolizer" Version="0.2.1" />
</ItemGroup>
test/tools/WebListener/Controllers/RetryController.cs
+1 -4
View File
@@ -23,10 +23,7 @@ namespace mvc.Controllers
public JsonResult Retry(string sessionId, int failureCode, int failureCount)
{
if (retryInfo == null)
{
retryInfo = new Dictionary<string, Tuple<int, int, int>>();
}
retryInfo ??= new Dictionary<string, Tuple<int, int, int>>();
if (retryInfo.TryGetValue(sessionId, out Tuple<int, int, int> retry))
{
test/tools/WebListener/WebListener.csproj
+1 -1
View File
@@ -7,7 +7,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.9" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
</ItemGroup>
tools/cgmanifest.json
+1 -1
View File
@@ -755,7 +755,7 @@
"Type": "nuget",
"Nuget": {
"Name": "System.Configuration.ConfigurationManager",
"Version": "6.0.0"
"Version": "6.0.1"
}
},
"DevelopmentDependency": false