Update to PowerShell Core 7.

immense · Mar 11, 2020 · 6aa9655 · 6aa9655
1 parent a556e95
commit 6aa9655
Show file tree

Hide file tree

Showing 9 changed files with 8,571 additions and 5,386 deletions.
diff --git a/Agent/Agent.csproj b/Agent/Agent.csproj
@@ -28,16 +28,16 @@
     <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="3.1.2" />
     <PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.2" />
-    <PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="6.2.4" />
-    <PackageReference Include="Microsoft.PowerShell.Commands.Management" Version="6.2.4" />
-    <PackageReference Include="Microsoft.PowerShell.Commands.Utility" Version="6.2.4" />
-    <PackageReference Include="Microsoft.PowerShell.CoreCLR.Eventing" Version="6.2.4" />
-    <PackageReference Include="Microsoft.PowerShell.SDK" Version="6.2.4" />
-    <PackageReference Include="Microsoft.PowerShell.Security" Version="6.2.4" />
-    <PackageReference Include="Microsoft.WSMan.Management" Version="6.2.4" />
-    <PackageReference Include="Microsoft.WSMan.Runtime" Version="6.2.4" />
+    <PackageReference Include="Microsoft.PowerShell.Commands.Diagnostics" Version="7.0.0" />
+    <PackageReference Include="Microsoft.PowerShell.Commands.Management" Version="7.0.0" />
+    <PackageReference Include="Microsoft.PowerShell.Commands.Utility" Version="7.0.0" />
+    <PackageReference Include="Microsoft.PowerShell.CoreCLR.Eventing" Version="7.0.0" />
+    <PackageReference Include="Microsoft.PowerShell.SDK" Version="7.0.0" />
+    <PackageReference Include="Microsoft.PowerShell.Security" Version="7.0.0" />
+    <PackageReference Include="Microsoft.WSMan.Management" Version="7.0.0" />
+    <PackageReference Include="Microsoft.WSMan.Runtime" Version="7.0.0" />
     <PackageReference Include="NETStandard.Library" Version="2.0.3" />
-    <PackageReference Include="System.Management.Automation" Version="6.2.4" />
+    <PackageReference Include="System.Management.Automation" Version="7.0.0" />
     <PackageReference Include="System.ServiceProcess.ServiceController" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/Desktop.Linux/ViewModels/MainWindowViewModel.cs b/Desktop.Linux/ViewModels/MainWindowViewModel.cs
@@ -142,7 +142,12 @@ public async Task Init()
             try
             {
                 SessionID = "Retrieving...";
-                Host = Config.GetConfig().Host;
+
+                if (string.IsNullOrWhiteSpace(Host))
+                {
+                    Host = Config.GetConfig().Host;
+                }
+
                 while (string.IsNullOrWhiteSpace(Host))
                 {
                     Host = "https://";

diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj
@@ -24,7 +24,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.MixedReality.WebRTC" Version="1.0.2" />
+    <PackageReference Include="Microsoft.MixedReality.WebRTC" Version="1.0.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Desktop.Win/ViewModels/MainWindowViewModel.cs b/Desktop.Win/ViewModels/MainWindowViewModel.cs
@@ -170,8 +170,10 @@ public async Task Init()
         {
             SessionID = "Retrieving...";
 
-            var config = Config.GetConfig();
-            Host = config.Host;
+            if (string.IsNullOrWhiteSpace(Host))
+            {
+                Host = Config.GetConfig().Host;
+            }
 
             while (string.IsNullOrWhiteSpace(Host))
             {
@@ -187,15 +189,15 @@ public async Task Init()
 
                 Conductor.CasterSocket.Connection.Closed += async (ex) =>
                 {
-                    App.Current.Dispatcher.Invoke(() =>
+                    await App.Current.Dispatcher.InvokeAsync(() =>
                     {
                         SessionID = "Disconnected";
                     });
                 };
 
                 Conductor.CasterSocket.Connection.Reconnecting += async (ex) =>
                 {
-                    App.Current.Dispatcher.Invoke(() =>
+                    await App.Current.Dispatcher.InvokeAsync(() =>
                     {
                         SessionID = "Reconnecting";
                     });

diff --git a/ScreenCast.Core/ScreenCast.Core.csproj b/ScreenCast.Core/ScreenCast.Core.csproj
@@ -36,7 +36,7 @@
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.EventLog" Version="3.1.2" />
-    <PackageReference Include="Microsoft.MixedReality.WebRTC" Version="1.0.2" />
+    <PackageReference Include="Microsoft.MixedReality.WebRTC" Version="1.0.3" />
     <PackageReference Include="System.Drawing.Common" Version="4.7.0" />
   </ItemGroup>
 

diff --git a/ScreenCast.Win/ScreenCast.Win.csproj b/ScreenCast.Win/ScreenCast.Win.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.MixedReality.WebRTC" Version="1.0.2" />
+    <PackageReference Include="Microsoft.MixedReality.WebRTC" Version="1.0.3" />
     <PackageReference Include="NAudio" Version="1.10.0" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.2" />