Skip to content

Commit 17b23e3

Browse files
github-actions[bot]github-actions[bot]
authored
Update .NET SDK version from 7.0.100-preview.5.22307.18 to 7.0.100-preview.6.22352.1 (PowerShell#17634)
1 parent 21ad3d7 commit 17b23e3

12 files changed

Lines changed: 32 additions & 25 deletions

File tree

‎assets/wix/files.wxs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3129,8 +3129,8 @@
31293129
<Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
31303130
<File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
31313131
</Component>
3132-
<Component Id="cmp7B3D20B284F74CE38B349854F6AB21FD">
3133-
<File Id="fil2100DA01A95645ADBBDD7C73ED75B0A1" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.30112.dll" />
3132+
<Component Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0">
3133+
<File Id="filCDB455902F6848C4ADC51ECA2BD8D99E" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.32404.dll" />
31343134
</Component>
31353135
</DirectoryRef>
31363136
</Fragment>
@@ -4137,7 +4137,7 @@
41374137
<ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
41384138
<ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
41394139
<ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
4140-
<ComponentRef Id="cmp7B3D20B284F74CE38B349854F6AB21FD" />
4140+
<ComponentRef Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0" />
41414141
</ComponentGroup>
41424142
</Fragment>
41434143
</Wix>

‎build.psm1‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1760,9 +1760,15 @@ function Start-PSxUnit {
17601760
throw "PowerShell must be built before running tests!"
17611761
}
17621762

1763+
$originalDOTNET_ROOT = $env:DOTNET_ROOT
1764+
17631765
try {
17641766
Push-Location $PSScriptRoot/test/xUnit
17651767

1768+
# Add workaround to unblock xUnit testing see issue: https://github.com/dotnet/sdk/issues/26462
1769+
$dotnetPath = if ($environment.IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
1770+
$env:DOTNET_ROOT = $dotnetPath
1771+
17661772
# Path manipulation to obtain test project output directory
17671773

17681774
if(-not $environment.IsWindows)
@@ -1806,6 +1812,7 @@ function Start-PSxUnit {
18061812
Publish-TestResults -Path $xUnitTestResultsFile -Type 'XUnit' -Title 'Xunit Sequential'
18071813
}
18081814
finally {
1815+
$env:DOTNET_ROOT = $originalDOTNET_ROOT
18091816
Pop-Location
18101817
}
18111818
}

‎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.5.22307.18"
3+
"version": "7.0.100-preview.6.22352.1"
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.5.22308.7" />
50+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.6.22356.1" />
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-1.final" />
35-
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.5.22308.7" />
36-
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.5.22308.7" />
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" />
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.5.22308.7" />
11+
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.6.22356.1" />
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.5.22308.7" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.5.22308.7" />
23-
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.5.22308.7" />
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" />
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.5.22308.7" />
33+
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.6.22356.1" />
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.5.22308.7" />
13+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.6.22356.1" />
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.5.22308.7" />
20-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.5.22308.7" />
21-
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.5.22308.7" />
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" />
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.5.22308.7" />
23+
<PackageReference Include="System.Management" Version="7.0.0-preview.6.22356.1" />
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.5.22308.7" />
27-
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.5.22308.7" />
28-
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.5.22308.7" />
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" />
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/engine/Api/TypeInference.Tests.ps1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ Describe "Type inference Tests" -tags "CI" {
504504
It "Infers typeof Select-Object when Parameter is ExcludeProperty" {
505505
$res = [AstTypeInference]::InferTypeOf( { [io.fileinfo]::new("file") | Select-Object -ExcludeProperty *Time*, E* }.Ast)
506506
$res.Count | Should -Be 1
507-
$res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:ResolvedTarget:Target:VersionInfo"
507+
$res[0].Name | Should -BeExactly "System.Management.Automation.PSObject#Attributes:BaseName:Directory:DirectoryName:FullName:IsReadOnly:Length:LengthString:LinkTarget:LinkType:Mode:ModeWithoutHardLink:Name:NameString:ResolvedTarget:Target:UnixFileMode:VersionInfo"
508508
$names = $res[0].Members.Name
509509
$names -contains "BaseName" | Should -BeTrue
510510
$names -contains "Name" | Should -BeTrue

0 commit comments

Comments
 (0)