Skip to content

Update .NET SDK version from 7.0.100-preview.5.22307.18 to 7.0.100-preview.6.22352.1 #17634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 4 commits into from
Jul 7, 2022
Merged

Update .NET SDK version from 7.0.100-preview.5.22307.18 to 7.0.100-preview.6.22352.1 #17634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
83922ce
Update .NET SDK version from `7.0.100-preview.5.22307.18` to `7.0.100…
adityapatwardhan Jul 6, 2022
3f42bee
Add workaround for xUnit
adityapatwardhan Jul 6, 2022
2d54461
Remove ??=
adityapatwardhan Jul 6, 2022
0ce40a2
Fix test
adityapatwardhan Jul 6, 2022
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
6 changes: 3 additions & 3 deletions assets/wix/files.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3129,8 +3129,8 @@
<Component Id="cmp8A466581FE0540CEB2210C64DA5F970B">
<File Id="filE75D9761159B495A8DF7A1035E36EF05" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Formats.Tar.dll" />
</Component>
<Component Id="cmp7B3D20B284F74CE38B349854F6AB21FD">
<File Id="fil2100DA01A95645ADBBDD7C73ED75B0A1" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.30112.dll" />
<Component Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0">
<File Id="filCDB455902F6848C4ADC51ECA2BD8D99E" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_7.0.22.32404.dll" />
</Component>
</DirectoryRef>
</Fragment>
Expand Down Expand Up @@ -4137,7 +4137,7 @@
<ComponentRef Id="cmpF735DF855B6A444E8874E7FD15796C37" />
<ComponentRef Id="cmp8A466581FE0540CEB2210C64DA5F970B" />
<ComponentRef Id="cmp044F67223E6D490D8533691BF50B2B86" />
<ComponentRef Id="cmp7B3D20B284F74CE38B349854F6AB21FD" />
<ComponentRef Id="cmpCFB2D3927EB549CC9C65DA87B6BDC1F0" />
</ComponentGroup>
</Fragment>
</Wix>
7 changes: 7 additions & 0 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1760,9 +1760,15 @@ function Start-PSxUnit {
throw "PowerShell must be built before running tests!"
}

$originalDOTNET_ROOT = $env:DOTNET_ROOT

try {
Push-Location $PSScriptRoot/test/xUnit

# Add workaround to unblock xUnit testing see issue: https://github.com/dotnet/sdk/issues/26462
$dotnetPath = if ($environment.IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
$env:DOTNET_ROOT = $dotnetPath

# Path manipulation to obtain test project output directory

if(-not $environment.IsWindows)
Expand Down Expand Up @@ -1806,6 +1812,7 @@ function Start-PSxUnit {
Publish-TestResults -Path $xUnitTestResultsFile -Type 'XUnit' -Title 'Xunit Sequential'
}
finally {
$env:DOTNET_ROOT = $originalDOTNET_ROOT
Pop-Location
}
}
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"sdk": {
"version": "7.0.100-preview.5.22307.18"
"version": "7.0.100-preview.6.22352.1"
}
}
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.22308.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.6.22356.1" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-1.final" />
<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="Microsoft.CodeAnalysis.CSharp" Version="4.3.0-2.final" />
<PackageReference Include="System.Threading.AccessControl" Version="7.0.0-preview.6.22356.1" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0-preview.6.22356.1" />
<PackageReference Include="NJsonSchema" Version="10.7.2" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.22308.7" />
<PackageReference Include="System.Diagnostics.EventLog" Version="7.0.0-preview.6.22356.1" />
</ItemGroup>

</Project>
8 changes: 4 additions & 4 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<!-- 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.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" />
<PackageReference Include="System.IO.Packaging" Version="7.0.0-preview.6.22356.1" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="7.0.0-preview.6.22356.1" />
<PackageReference Include="System.Text.Encodings.Web" Version="7.0.0-preview.6.22356.1" />
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0-preview1.22261.2" />
<PackageReference Include="System.ServiceModel.Http" Version="4.10.0-preview1.22261.2" />
Expand All @@ -30,7 +30,7 @@
<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.5.22308.7" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.6.22356.1" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.5.22308.7" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="7.0.0-preview.6.22356.1" />
</ItemGroup>

<PropertyGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.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="Microsoft.Win32.Registry.AccessControl" Version="7.0.0-preview.6.22356.1" />
<PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0-preview.6.22356.1" />
<PackageReference Include="System.DirectoryServices" Version="7.0.0-preview.6.22356.1" />
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
<PackageReference Include="System.Management" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="System.Management" Version="7.0.0-preview.6.22356.1" />
<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.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" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="7.0.0-preview.6.22356.1" />
<PackageReference Include="System.Security.Permissions" Version="7.0.0-preview.6.22356.1" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22356.1" />
<!-- 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" />
Expand Down
2 changes: 1 addition & 1 deletion test/powershell/engine/Api/TypeInference.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ Describe "Type inference Tests" -tags "CI" {
It "Infers typeof Select-Object when Parameter is ExcludeProperty" {
$res = [AstTypeInference]::InferTypeOf( { [io.fileinfo]::new("file") | Select-Object -ExcludeProperty *Time*, E* }.Ast)
$res.Count | Should -Be 1
$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"
$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"

@daxian-dbw daxian-dbw Jul 6, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PowerShell has a UnixMode script property for FileInfo and DirectoryInfo on Unix platforms. I wonder if the new UnixFileMode would bring any issues for the existing script property ... like what if they are showing different results?
Can you check what is returned by UnixFileMode on Linux?

@adityapatwardhan adityapatwardhan Jul 7, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is how it looks:

PS /mnt/d/PSGit/PowerShell> Get-Item ./build.psm1 | fl UnixMode, UnixFileMode

UnixMode     : -rwxrwxrwx
UnixFileMode : OtherExecute, OtherWrite, OtherRead, GroupExecute, GroupWrite, GroupRead, UserExecute, UserWrite, UserRe
               ad

@adityapatwardhan adityapatwardhan Jul 7, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, this:

PS /mnt/d/PSGit/PowerShell> Get-Item ./a.txt | fl UnixMode, UnixFileMode

UnixMode     : -r-xr-xr-x
UnixFileMode : OtherExecute, OtherRead, GroupExecute, GroupRead, UserExecute, UserRead

They seems to be same. We may want to consider removing the script property. That is a different issue though

@daxian-dbw daxian-dbw Jul 7, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

$names = $res[0].Members.Name
$names -contains "BaseName" | Should -BeTrue
$names -contains "Name" | Should -BeTrue
Expand Down
2 changes: 1 addition & 1 deletion test/tools/TestService/TestService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.5.22308.7" />
<PackageReference Include="Microsoft.Windows.Compatibility" Version="7.0.0-preview.6.22356.1" />
</ItemGroup>

</Project>
4 changes: 2 additions & 2 deletions test/tools/WebListener/WebListener.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
</PropertyGroup>

<ItemGroup>
<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" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.0-preview.6.22330.3" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0-preview.6.22356.1" />
</ItemGroup>

<ItemGroup>
Expand Down