Skip to content

Commit b66a93f

Browse files
github-actions[bot]github-actions[bot]
authored
Update .NET SDK version from 7.0.100-preview.6.22352.1 to 7.0.100-preview.7.22377.5 (PowerShell#17776)
1 parent c072f5b commit b66a93f

File tree

12 files changed

+58
-26
lines changed

12 files changed

+58
-26
lines changed

‎assets/wix/files.wxs

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1584,6 +1584,21 @@
15841584
<Component Id="cmp044F67223E6D490D8533691BF50B2B86">
15851585
<File Id="fil461F92924EE64C589D486A178AAD1342" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Tar.dll" />
15861586
</Component>
1587+
<Component Id="cmp7C72179331DD48BCB12BF205F34B76AD">
1588+
<File Id="filF65735DC9B8B4957B27F5B33D2A322F4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Runtime.InteropServices.JavaScript.dll" />
1589+
</Component>
1590+
<Component Id="cmpBB2921B987554B68B26862747C3BD398">
1591+
<File Id="fil1D77B59F22194840A66EFA782AB2BB95" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encodings.Web.dll" />
1592+
</Component>
1593+
<Component Id="cmpD182C2F62588471F82252B0038C75327">
1594+
<File Id="filBD7A930797F148DA8F433C809DC7BFB4" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Formats.Asn1.dll" />
1595+
</Component>
1596+
<Component Id="cmpF3EB02BB62A34F509B22CC370C430A20">
1597+
<File Id="fil489339762CDF41AE97538C020401BEC6" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Net.Quic.dll" />
1598+
</Component>
1599+
<Component Id="cmp16FC1857F01A4E388616BA7AA8CC5F73">
1600+
<File Id="fil877D1292F59541DAB6758F5A7A74D20D" KeyPath="yes" Source="$(var.ProductSourcePath)\ref\System.Text.Encoding.CodePages.dll" />
1601+
</Component>
15871602
</Directory>
15881603
<Directory Id="dirC72EEAF9434D4AD066E0F4D20D8E816C" Name="en-US">
15891604
<Component Id="cmpDC2EF4541FA5A2E63F36A8CD6C5FA51B">
@@ -1654,6 +1669,9 @@
16541669
<Component Id="cmpDEDA23DDAB66342DB2C554F6B963C617">
16551670
<File Id="fil5B71C67EDDC69A7238518F8E66D68DE7" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\Microsoft.PowerShell.Security\Microsoft.PowerShell.Security.psd1" />
16561671
</Component>
1672+
<Component Id="cmp97D2E588E938462194C7549B3A0084FE">
1673+
<File Id="filFD228E44C4974694AB25D8B06EDE7BD2" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\Microsoft.PowerShell.Security\Security.types.ps1xml" />
1674+
</Component>
16571675
</Directory>
16581676
<Directory Id="dirDD3349AACE61FF0B4AEC004BF05FF2F9" Name="PSDiagnostics">
16591677
<Component Id="cmpF79A92F228AF5EA2BA60CC33BE9DC6A0">
@@ -3123,8 +3141,14 @@
31233141
<Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
31243142
<File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
31253143
</Component>
3126-
<Component Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0">
3127-
<File Id="filCDB455902F6848C4ADC51ECA2BD8D99E" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.32404.dll" />
3144+
<Component Id="cmp9412841190084AEC978D2EB614E6AAE5">
3145+
<File Id="fil6B817BFD321945E780CA22E762DD9A9C" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.37506.dll" />
3146+
</Component>
3147+
<Component Id="cmp41C949169E9341CC9297641456FEE2CC">
3148+
<File Id="fil39EC96E6757D4C49B8AE32A532B205D5" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Runtime.InteropServices.JavaScript.dll" />
3149+
</Component>
3150+
<Component Id="cmp0721DF55B34849B78C98AE00D863CBFF">
3151+
<File Id="fil72E7B79A9B10498CBE884076BC863617" KeyPath="yes" Source="$(var.ProductSourcePath)\clrgc.dll" />
31283152
</Component>
31293153
</DirectoryRef>
31303154
</Fragment>
@@ -4129,7 +4153,15 @@
41294153
<ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
41304154
<ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
41314155
<ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
4132-
<ComponentRef Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0" />
4156+
<ComponentRef Id="cmp97D2E588E938462194C7549B3A0084FE" />
4157+
<ComponentRef Id="cmp9412841190084AEC978D2EB614E6AAE5" />
4158+
<ComponentRef Id="cmp41C949169E9341CC9297641456FEE2CC" />
4159+
<ComponentRef Id="cmp7C72179331DD48BCB12BF205F34B76AD" />
4160+
<ComponentRef Id="cmpBB2921B987554B68B26862747C3BD398" />
4161+
<ComponentRef Id="cmp0721DF55B34849B78C98AE00D863CBFF" />
4162+
<ComponentRef Id="cmpD182C2F62588471F82252B0038C75327" />
4163+
<ComponentRef Id="cmpF3EB02BB62A34F509B22CC370C430A20" />
4164+
<ComponentRef Id="cmp16FC1857F01A4E388616BA7AA8CC5F73" />
41334165
</ComponentGroup>
41344166
</Fragment>
41354167
</Wix>

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.100-preview.6.22352.1"
3+
"version": "7.0.100-preview.7.22377.5"
44
}
55
}

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747

4848
<ItemGroup>
4949
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
50-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.6.22356.1" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.7.22375.6" />
5151
</ItemGroup>
5252

5353
</Project>

‎src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
</ItemGroup>
3232

3333
<ItemGroup>
34-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-2.final" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.6.22356.1" />
36-
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.6.22356.1" />
34+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-3.final" />
35+
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.7.22375.6" />
36+
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.7.22375.6" />
3737
<PackageReference Include="NJsonSchema" Version="10.7.2" />
3838
</ItemGroup>
3939

‎src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<ItemGroup>
1010
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
11-
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.6.22356.1" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.7.22375.6" />
1212
</ItemGroup>
1313

1414
</Project>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
1919
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
2020
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
21-
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.6.22356.1" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.6.22356.1" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.6.22356.1" />
21+
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.7.22375.6" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.7.22375.6" />
23+
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.7.22375.6" />
2424
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
2525
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0-preview1.22261.2" />
2626
<PackageReference Include="System.ServiceModel.Http" Version="4.10.0-preview1.22261.2" />
@@ -30,7 +30,7 @@
3030
<PackageReference Include="System.Private.ServiceModel" Version="4.10.0-preview1.22261.2" />
3131
<!-- the source could not be found for the following package(s) -->
3232
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
33-
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.6.22356.1" />
33+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.7.22375.6" />
3434
</ItemGroup>
3535

3636
</Project>

‎src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
1111
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
1212
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
13-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.6.22356.1" />
13+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.7.22375.6" />
1414
</ItemGroup>
1515

1616
<PropertyGroup>

‎src/System.Management.Automation/System.Management.Automation.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
<!-- the Application Insights package -->
1717
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.20.0" />
1818
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
19-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.6.22356.1" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.6.22356.1" />
21-
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.6.22356.1" />
19+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.7.22375.6" />
20+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.7.22375.6" />
21+
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.7.22375.6" />
2222
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
23-
<PackageReference Include="System.Management" Version="7.0.0-preview.6.22356.1" />
23+
<PackageReference Include="System.Management" Version="7.0.0-preview.7.22375.6" />
2424
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="7.0.0-preview.2.22152.2" />
2525
<PackageReference Include="System.Security.AccessControl" Version="6.0.2-mauipre.1.22102.15" />
26-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.6.22356.1" />
27-
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.6.22356.1" />
28-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22356.1" />
26+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.7.22375.6" />
27+
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.7.22375.6" />
28+
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.7.22375.6" />
2929
<!-- the following package(s) are from the powershell org -->
3030
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
3131
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.3.0-preview.1" />

‎test/powershell/Language/Interop/DotNet/DotNetInterop.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ namespace DotNetInterop
121121
}
122122

123123
It "Calling constructor of a ByRef-like type via dotnet adapter should fail gracefully - <Number>" -TestCases @(
124-
@{ Number = 1; Script = { [System.Span[string]]::new.Invoke("abc") } }
124+
@{ Number = 1; Script = { [System.Span[string]]::new.Invoke([ref]$null) } }
125125
@{ Number = 2; Script = { [DotNetInterop.MyByRefLikeType]::new.Invoke(2) } }
126126
) {
127127
param($Script)

‎test/powershell/engine/ParameterBinding/ParameterBinding.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Describe "Parameter Binding Tests" -Tags "CI" {
130130
$e = { test-singleintparameter -Parameter1 'exampleInvalidParam' } |
131131
Should -Throw -ErrorId "ParameterArgumentTransformationError,test-singleintparameter" -PassThru
132132
$e.CategoryInfo | Should -Match "ParameterBindingArgumentTransformationException"
133-
$e.Exception.Message | Should -Match "Input string was not in a correct format"
133+
$e.Exception.Message | Should -Match "The input string 'exampleInvalidParam' was not in a correct format"
134134
$e.Exception.Message | Should -Match "Parameter1"
135135
}
136136

0 commit comments

Comments
 (0)