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

Update .NET SDK version from 7.0.100-preview.4.22252.9 to 7.0.100-preview.5.22307.18 (#17402)

Browse Source
This commit is contained in:
github-actions[bot]
2022-06-13 13:09:30 -07:00
committed by GitHub
parent 4f6e574820
commit cfc237ac85
13 changed files with 33 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/wix/files.wxs
+3 -15
View File
@@ -1554,18 +1554,9 @@
<Component Id="cmp19ADFEFDD03047828CF493B5B5CE7B6E">
<File Id="filCE65C019A32144BB9E9CCA3D5E634E32" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Http.Json.dll" />
</Component>
<Component Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" Guid="{ee32f38f-14ee-4a85-914f-d02522cc3635}">
<File Id="fil04B0F83A7AED430A86A7E6E3E99AB45D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
</Component>
<Component Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77">
<File Id="filBC93A3F22F78439F8D4173E4C64ACFDC" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
</Component>
<Component Id="cmp834F3E0C83664E92B0D115A39A8FAACB">
<File Id="fil6A09131961874B31AC3EBEC863CC12C4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.CompilerServices.Unsafe.dll" />
</Component>
<Component Id="cmp68158D010ECB439582D041355BFACCBB">
<File Id="filB8694A0190CA422E9462870B514B813C" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
</Component>
<Component Id="cmp690F24F04C044127A61754363A4D63E3">
<File Id="fil5BF6895A87684AC088DAB3759AA465BA" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\Microsoft.Win32.Registry.dll" />
</Component>
@@ -3138,8 +3129,8 @@
<Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
<File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
</Component>
<Component Id="cmp1BCC0D0458494D89B527324A8E131D18">
<File Id="fil81CF1F7D16E34E6BAD003EF106FE384A" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.22904.dll" />
<Component Id="cmp7B3D20B284F74CE38B349854F6AB21FD">
<File Id="fil2100DA01A95645ADBBDD7C73ED75B0A1" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.30112.dll" />
</Component>
</DirectoryRef>
</Fragment>
@@ -4092,15 +4083,12 @@
<ComponentRef Id="cmpBB705B2570064C99A71B6FA65CDF9DC8" />
<ComponentRef Id="cmpE9599A00802144DF98F5792E029C8875" />
<ComponentRef Id="cmp0989343D60B74AF082291F612F0E6FA6" />
<ComponentRef Id="cmp72C41225E0B4457C8CB5F4C5FE6E3187" />
<ComponentRef Id="cmp0BD7D15E0377407FA4C43BFE89F0C12E" />
<ComponentRef Id="cmpC0FFB3F4FB30438082D2DC0F4E4BF12D" />
<ComponentRef Id="cmpB92B70CEFC2F438386F97264FB436CDD" />
<ComponentRef Id="cmpEE26930D65E346FDAE1B3E07F5DBEF77" />
<ComponentRef Id="cmp8635213A03B04AAE8E1BFB7EA85E0DB2" />
<ComponentRef Id="cmp834F3E0C83664E92B0D115A39A8FAACB" />
<ComponentRef Id="cmp2BB002B115C247FFB3353C80CAAC10B3" />
<ComponentRef Id="cmp68158D010ECB439582D041355BFACCBB" />
<ComponentRef Id="cmp3547A55EA9D04784B4CF2FC717447E16" />
<ComponentRef Id="cmp690F24F04C044127A61754363A4D63E3" />
<ComponentRef Id="cmpFAD6557C4AEC48B89DDC4E6485C020C4" />
@@ -4148,8 +4136,8 @@
<ComponentRef Id="cmp0AB1EF494922410AB17DC61097295172" />
<ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
<ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
<ComponentRef Id="cmp1BCC0D0458494D89B527324A8E131D18" />
<ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
<ComponentRef Id="cmp7B3D20B284F74CE38B349854F6AB21FD" />
</ComponentGroup>
</Fragment>
</Wix>
global.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.100-preview.4.22252.9"
"version": "7.0.100-preview.5.22307.18"
}
}
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+1 -1
View File
@@ -47,7 +47,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.5.22308.7" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+2 -2
View File
@@ -32,8 +32,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="NJsonSchema" Version="10.7.2" />
</ItemGroup>
src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
-11
View File
@@ -391,7 +391,6 @@ namespace Microsoft.PowerShell.Commands
byte[] result = null;
int elements = 1;
bool isArray = false;
bool isBool = false;
bool isEnum = false;
if (baseType.IsArray)
{
@@ -424,11 +423,6 @@ namespace Microsoft.PowerShell.Commands
_lastInputType = baseType;
}
if (baseType == typeof(bool))
{
isBool = true;
}
var elementSize = Marshal.SizeOf(baseType);
result = new byte[elementSize * elements];
if (!isArray)
@@ -450,11 +444,6 @@ namespace Microsoft.PowerShell.Commands
{
toBytes = Convert.ChangeType(obj, baseType);
}
else if (isBool)
{
// bool is 1 byte apparently
toBytes = Convert.ToByte(obj);
}
else
{
toBytes = obj;
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+1 -1
View File
@@ -8,7 +8,7 @@
<ItemGroup>
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.5.22308.7" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+10 -10
View File
@@ -18,19 +18,19 @@
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.5.22308.7" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0-preview1.22261.2" />
<PackageReference Include="System.ServiceModel.Http" Version="4.10.0-preview1.22261.2" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.0-preview1.22261.2" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.10.0-preview1.22261.2" />
<PackageReference Include="System.ServiceModel.Security" Version="4.10.0-preview1.22261.2" />
<PackageReference Include="System.Private.ServiceModel" Version="4.10.0-preview1.22261.2" />
<!-- the source could not be found for the following package(s) -->
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.5.22308.7" />
</ItemGroup>
</Project>
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+1 -1
View File
@@ -10,7 +10,7 @@
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.5.22308.7" />
</ItemGroup>
<PropertyGroup>
src/System.Management.Automation/System.Management.Automation.csproj
+7 -7
View File
@@ -16,16 +16,16 @@
<!-- the Application Insights package -->
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.5.22308.7" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Management" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.5.22308.7" />
<!-- the following package(s) are from the powershell org -->
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.3.0-preview.1" />
test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<LangVersion>latest</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
<PackageReference Include="CommandLineParser" Version="2.9.1" />
<PackageReference Include="MarkdownLog.NS20" Version="0.10.1" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+3 -3
View File
@@ -1382,7 +1382,7 @@ ConstructorTestClass(int i, bool b)
It '<Intent>' -TestCases @(
@{
Intent = 'Complete attribute members on empty line'
Expected = 'Position'
Expected = @('Position','ParameterSetName','Mandatory','ValueFromPipeline','ValueFromPipelineByPropertyName','ValueFromRemainingArguments','HelpMessage','HelpMessageBaseName','HelpMessageResourceId','DontShow')
TestString = @'
function bar { [parameter(
@@ -1394,7 +1394,7 @@ function bar { [parameter(
}
@{
Intent = 'Complete attribute members on empty line with preceding member'
Expected = 'Position'
Expected = @('Position','ParameterSetName','Mandatory','ValueFromPipeline','ValueFromPipelineByPropertyName','ValueFromRemainingArguments','HelpMessage','HelpMessageBaseName','HelpMessageResourceId','DontShow')
TestString = @'
function bar { [parameter(
Mandatory,
@@ -1408,7 +1408,7 @@ Mandatory,
param($Expected, $TestString)
$CursorIndex = $TestString.IndexOf('^')
$res = TabExpansion2 -cursorColumn $CursorIndex -inputScript $TestString.Remove($CursorIndex, 1)
$res.CompletionMatches[0].CompletionText | Should -BeExactly $Expected
$res.CompletionMatches[0].CompletionText | Should -BeIn $Expected
}
It "Test completion with line continuation" {
test/tools/TestService/TestService.csproj
+1 -1
View File
@@ -13,7 +13,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.5.22308.7" />
</ItemGroup>
</Project>
test/tools/WebListener/WebListener.csproj
+2 -2
View File
@@ -7,8 +7,8 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.4.22251.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.4.22229.4" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.5.22309.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.5.22308.7" />
</ItemGroup>
<ItemGroup>