Update .NET runtime in Linux agent install scripts.

immense · Jan 9, 2021 · 6e1f951 · 6e1f951
1 parent 5aa8a61
commit 6e1f951
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 48 deletions.
diff --git a/Server/wwwroot/Downloads/Install-Manjaro-x64.sh b/Server/wwwroot/Downloads/Install-Manjaro-x64.sh
@@ -22,7 +22,7 @@ do
 done
 
 pacman -Sy
-pacman -S dotnet-runtime-3.1 --noconfirm
+pacman -S dotnet-runtime-5.0 --noconfirm
 pacman -S libx11 --noconfirm
 pacman -S unzip --noconfirm
 pacman -S libc6 --noconfirm

diff --git a/Server/wwwroot/Downloads/Install-Ubuntu-x64.sh b/Server/wwwroot/Downloads/Install-Ubuntu-x64.sh
@@ -28,7 +28,7 @@ dpkg -i packages-microsoft-prod.deb
 apt-get update
 apt-get -y install apt-transport-https
 apt-get update
-apt-get -y install dotnet-runtime-3.1
+apt-get -y install dotnet-runtime-5.0
 rm packages-microsoft-prod.deb
 
 apt-get -y install libx11-dev

diff --git a/Server/wwwroot/src/RemoteControl/DtoMessageHandler.ts b/Server/wwwroot/src/RemoteControl/DtoMessageHandler.ts
@@ -67,53 +67,65 @@ export class DtoMessageHandler {
         if (captureFrame.EndOfCapture) {
             ViewerApp.MessageSender.SendFrameReceived();
 
-            Object.keys(this.PartialCaptures).forEach(x => {
-                let partial = this.PartialCaptures[x];
-                let firstFrame = partial[0];
-                let frameBytes = partial.map(x => x.ImageBytes);
-
-                var url = window.URL.createObjectURL(new Blob(frameBytes));
-                var img = document.createElement("img");
-                img.onload = () => {
-                    UI.Screen2DContext.drawImage(img,
-                        firstFrame.Left,
-                        firstFrame.Top,
-                        firstFrame.Width,
-                        firstFrame.Height);
-                    window.URL.revokeObjectURL(url);
-                };
-                img.src = url;
-            })
-
-            this.PartialCaptures = {};
+            //Object.keys(this.PartialCaptures).forEach(async x => {
+            //    let partial = this.PartialCaptures[x];
+            //    let firstFrame = partial[0];
+            //    let frameBytes = partial.map(x => x.ImageBytes);
+
+            //    let bitmap = await createImageBitmap(new Blob(frameBytes));
+
+            //    UI.Screen2DContext.drawImage(bitmap,
+            //        firstFrame.Left,
+            //        firstFrame.Top,
+            //        firstFrame.Width,
+            //        firstFrame.Height);
+
+            //    bitmap.close();
+
+            //    var url = window.URL.createObjectURL(new Blob(frameBytes));
+            //    var img = document.createElement("img");
+            //    img.onload = () => {
+            //        UI.Screen2DContext.drawImage(img,
+            //            firstFrame.Left,
+            //            firstFrame.Top,
+            //            firstFrame.Width,
+            //            firstFrame.Height);
+            //        window.URL.revokeObjectURL(url);
+            //    };
+            //    img.src = url;
+            //})
+
+            //this.PartialCaptures = {};
+        }
+        else if (captureFrame.EndOfFrame) {
+            let key = `${captureFrame.Left},${captureFrame.Top}`;
+            let frameBytes = this.PartialCaptures[key].map(x => x.ImageBytes);
+
+            var url = window.URL.createObjectURL(new Blob(frameBytes));
+            var img = document.createElement("img");
+            img.onload = () => {
+                UI.Screen2DContext.drawImage(img,
+                    captureFrame.Left,
+                    captureFrame.Top,
+                    captureFrame.Width,
+                    captureFrame.Height);
+                window.URL.revokeObjectURL(url);
+
+                delete this.PartialCaptures[key];
+            };
+            img.src = url;
+
+
+            //let bitmap = await createImageBitmap(new Blob(frameBytes));
+
+            //UI.Screen2DContext.drawImage(bitmap,
+            //    captureFrame.Left,
+            //    captureFrame.Top,
+            //    captureFrame.Width,
+            //    captureFrame.Height);
+
+            //bitmap.close();
         }
-        //else if (captureFrame.EndOfFrame) {
-        //    let key = `${captureFrame.Left},${captureFrame.Top}`;
-        //    let frameBytes = this.PartialCaptures[key].map(x => x.ImageBytes);
-
-        //    //var url = window.URL.createObjectURL(new Blob(frameBytes));
-        //    //var img = document.createElement("img");
-        //    //img.onload = () => {
-        //    //    UI.StagingRenderer.drawImage(img,
-        //    //        captureFrame.Left,
-        //    //        captureFrame.Top,
-        //    //        captureFrame.Width,
-        //    //        captureFrame.Height);
-        //    //    window.URL.revokeObjectURL(url);
-        //    //};
-        //    //img.src = url;
-
-
-        //    let bitmap = await createImageBitmap(new Blob(frameBytes));
-
-        //    UI.StagingRenderer.drawImage(bitmap,
-        //        captureFrame.Left,
-        //        captureFrame.Top,
-        //        captureFrame.Width,
-        //        captureFrame.Height);
-
-        //    bitmap.close();
-        //}
         else {
             let key = `${captureFrame.Left},${captureFrame.Top}`;
             if (this.PartialCaptures[key]) {