From bd2c8c5452a2304788fa46a07da7a9d503b70871 Mon Sep 17 00:00:00 2001 From: Jared Goodwin Date: Wed, 19 Jun 2019 20:35:36 -0700 Subject: [PATCH] WIP --- .gitignore | 3 ++- Desktop.Win.Installer/Desktop.Win.Installer.vdproj | 8 ++++---- Desktop.Win/Desktop.Win.csproj | 14 ++++++++++++-- Desktop.Win/Properties/AssemblyInfo.cs | 2 ++ Utilities/Publish.ps1 | 2 +- 5 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index da2d9046..14a9b63d 100644 --- a/.gitignore +++ b/.gitignore @@ -266,4 +266,5 @@ __pycache__/ /Server/Server.db /Server/Recordings/* /Server/ffmpeg.exe -/Server/Properties/PublishProfiles \ No newline at end of file +/Server/Properties/PublishProfiles +*.msi diff --git a/Desktop.Win.Installer/Desktop.Win.Installer.vdproj b/Desktop.Win.Installer/Desktop.Win.Installer.vdproj index 5cad529a..3d212032 100644 --- a/Desktop.Win.Installer/Desktop.Win.Installer.vdproj +++ b/Desktop.Win.Installer/Desktop.Win.Installer.vdproj @@ -2482,7 +2482,7 @@ { "Name" = "8:.NET Framework" "Message" = "8:[VSDNETMSG]" - "FrameworkVersion" = "8:.NETFramework,Version=v4.6.1" + "FrameworkVersion" = "8:.NETFramework,Version=v4.7.2" "AllowLaterVersions" = "11:FALSE" "InstallUrl" = "8:http://go.microsoft.com/fwlink/?LinkId=671728" } @@ -7148,7 +7148,7 @@ } "{3C67513D-01DD-4637-8A68-80971EB9504F}:_CF8239574F86487C9D3AFD7CEECA3BB5" { - "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -7186,7 +7186,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Remotely Desktop" "ProductCode" = "8:{9ED3CF93-A3C5-4E86-8071-A8CEEC860767}" - "PackageCode" = "8:{0742D5DA-72E4-49D9-975E-4C071BBED7AC}" + "PackageCode" = "8:{1152E147-B2C4-44AA-B6B7-4D345A5D9E71}" "UpgradeCode" = "8:{B974F227-4132-4FF3-AD07-D359623501C3}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" @@ -7207,7 +7207,7 @@ "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:0" + "TargetPlatform" = "3:1" "PreBuildEvent" = "8:" "PostBuildEvent" = "8:" "RunPostBuildEvent" = "3:0" diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj index 051ab7f5..a78639a9 100644 --- a/Desktop.Win/Desktop.Win.csproj +++ b/Desktop.Win/Desktop.Win.csproj @@ -27,9 +27,16 @@ Days false false - true - 1.0.0.%2a + false + https://lucency.co/Contact + https://lucency.co/Contact + Remotely Desktop + Translucency Software + Remotely + 0 + 1.0.0.0 false + true true true @@ -69,6 +76,9 @@ true bin\x64\Release\ + + true + ..\packages\MessagePack.1.7.3.7\lib\net47\MessagePack.dll diff --git a/Desktop.Win/Properties/AssemblyInfo.cs b/Desktop.Win/Properties/AssemblyInfo.cs index a9b0d810..cc856084 100644 --- a/Desktop.Win/Properties/AssemblyInfo.cs +++ b/Desktop.Win/Properties/AssemblyInfo.cs @@ -53,3 +53,5 @@ using System.Windows; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")] +[assembly: Guid("0f554d14-3bec-473a-80fc-3a52ff97065e")] + diff --git a/Utilities/Publish.ps1 b/Utilities/Publish.ps1 index 2256903e..14a43caa 100644 --- a/Utilities/Publish.ps1 +++ b/Utilities/Publish.ps1 @@ -117,7 +117,7 @@ while ((Test-Path -Path "$PublishDir\Remotely-Linux.zip") -eq $false){ Move-Item -Path "$PublishDir\Remotely-Linux.zip" -Destination "$Root\Server\wwwroot\Downloads\Remotely-Linux.zip" -Force # Copy desktop app to Downloads folder. -&"$DevEnv" "$Root\Desktop.Win.Installer\Desktop.Win.Installer.vdproj" /build "Release|x86" +&"$DevEnv" "$Root\Desktop.Win.Installer\Desktop.Win.Installer.vdproj" /build "Release|x64" Copy-Item -Path ".\Desktop.Win.Installer\Release\Remotely_Desktop_Installer.msi" -Destination ".\Server\wwwroot\Downloads\Remotely_Desktop_Installer.msi" -Force