diff --git a/assets/wix/files.wxs b/assets/wix/files.wxs
index 020d9c09fd..6c41d4345f 100644
--- a/assets/wix/files.wxs
+++ b/assets/wix/files.wxs
@@ -1554,18 +1554,9 @@
-
-
-
-
-
-
-
-
-
@@ -3138,8 +3129,8 @@
-
-
+
+
@@ -4092,15 +4083,12 @@
-
-
-
@@ -4148,8 +4136,8 @@
-
+
diff --git a/global.json b/global.json
index e097be7392..ab3a127e05 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
{
"sdk": {
- "version": "7.0.100-preview.4.22252.9"
+ "version": "7.0.100-preview.5.22307.18"
}
}
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 b0e6f222c4..edc444a7da 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 454bd02639..957f5eb820 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
@@ -32,8 +32,8 @@
-
-
+
+
diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
index 091903f011..90d007adb2 100644
--- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
+++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/FormatAndOutput/format-hex/Format-Hex.cs
@@ -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;
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 76028af5a3..63de1f196d 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 b4f715464c..6e7b7d4535 100644
--- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
@@ -18,19 +18,19 @@
-
-
-
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
+
diff --git a/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj b/src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj
index 073b47d158..8423367605 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 76a93854de..bbcba5f46f 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/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
index 5274b08d61..d424da9dea 100644
--- a/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
+++ b/test/perf/dotnet-tools/ResultsComparer/ResultsComparer.csproj
@@ -6,7 +6,7 @@
latest
-
+
diff --git a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1 b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
index e8b2b60b96..1431a9ac50 100644
--- a/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
+++ b/test/powershell/Host/TabCompletion/TabCompletion.Tests.ps1
@@ -1382,7 +1382,7 @@ ConstructorTestClass(int i, bool b)
It '' -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" {
diff --git a/test/tools/TestService/TestService.csproj b/test/tools/TestService/TestService.csproj
index ce9637897b..04bb9ad279 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 242e5f7624..2618f63975 100644
--- a/test/tools/WebListener/WebListener.csproj
+++ b/test/tools/WebListener/WebListener.csproj
@@ -7,8 +7,8 @@
-
-
+
+