From 17b23e3ebca6d8b325506692ed2b4e9d270128ff Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 6 Jul 2022 17:35:59 -0700
Subject: [PATCH] Update .NET SDK version from `7.0.100-preview.5.22307.18` to
`7.0.100-preview.6.22352.1` (#17634)
---
assets/wix/files.wxs | 6 +++---
build.psm1 | 7 +++++++
global.json | 2 +-
...Microsoft.PowerShell.Commands.Management.csproj | 2 +-
.../Microsoft.PowerShell.Commands.Utility.csproj | 6 +++---
.../Microsoft.PowerShell.CoreCLR.Eventing.csproj | 2 +-
.../Microsoft.PowerShell.SDK.csproj | 8 ++++----
.../Microsoft.WSMan.Management.csproj | 2 +-
.../System.Management.Automation.csproj | 14 +++++++-------
test/powershell/engine/Api/TypeInference.Tests.ps1 | 2 +-
test/tools/TestService/TestService.csproj | 2 +-
test/tools/WebListener/WebListener.csproj | 4 ++--
12 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 6c41d4345f..614eaa2f8b 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -3129,8 +3129,8 @@
-
-
+
+
@@ -4137,7 +4137,7 @@
-
+
diff --git a/build.psm1 b/build.psm1
index ef27381211..9f4e1641b9 100644
--- a/build.psm1
+++ b/build.psm1
@@ -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)
@@ -1806,6 +1812,7 @@ function Start-PSxUnit {
Publish-TestResults -Path $xUnitTestResultsFile -Type 'XUnit' -Title 'Xunit Sequential'
}
finally {
+ $env:DOTNET_ROOT = $originalDOTNET_ROOT
Pop-Location
}
}
diff --git a/global.json b/global.json
index ab3a127e05..05030bdd29 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "7.0.100-preview.5.22307.18"
+ "version": "7.0.100-preview.6.22352.1"
}
}
diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
index edc444a7da..f05e342cbf 100644
--- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
@@ -47,7 +47,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
index 957f5eb820..606e6ffebf 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -31,9 +31,9 @@
-
-
-
+
+
+
diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
index 63de1f196d..509e7162ec 100644
--- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
@@ -8,7 +8,7 @@
-
+
diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
index 6e7b7d4535..45f77f0dd8 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,9 +18,9 @@
-
-
-
+
+
+
@@ -30,7 +30,7 @@
-
+
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 8423367605..1df5496da7 100644
--- a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
+++ b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
@@ -10,7 +10,7 @@
-
+
diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj
index bbcba5f46f..b396d79abf 100644
--- a/src/System.Management.Automation/System.Management.Automation.csproj
+++ b/src/System.Management.Automation/System.Management.Automation.csproj
@@ -16,16 +16,16 @@
-
-
-
+
+
+
-
+
-
-
-
+
+
+
diff --git a/test/powershell/engine/Api/TypeInference.Tests.ps1 b/test/powershell/engine/Api/TypeInference.Tests.ps1
index 2d86b9153c..b5f2f64567 100644
--- a/test/powershell/engine/Api/TypeInference.Tests.ps1
+++ b/test/powershell/engine/Api/TypeInference.Tests.ps1
@@ -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"
$names = $res[0].Members.Name
$names -contains "BaseName" | Should -BeTrue
$names -contains "Name" | Should -BeTrue
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index 04bb9ad279..1c5ddecbbc 100644
--- a/test/tools/TestService/TestService.csproj
+++ b/test/tools/TestService/TestService.csproj
@@ -13,7 +13,7 @@
-
+
diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj
index 2618f63975..5cccca789e 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
-
-
+
+