diff --git a/Desktop.Win.Installer/Desktop.Win.Installer.vdproj b/Desktop.Win.Installer/Desktop.Win.Installer.vdproj index 2cbe99e9..5cad529a 100644 --- a/Desktop.Win.Installer/Desktop.Win.Installer.vdproj +++ b/Desktop.Win.Installer/Desktop.Win.Installer.vdproj @@ -22,7 +22,7 @@ "Entry" { "MsmKey" = "8:_0361093EE5C2C026C10C3872F73D2554" - "OwnerKey" = "8:_4E9F873CCA4DB49EDF1D8EE63A09A08C" + "OwnerKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -231,6 +231,18 @@ } "Entry" { + "MsmKey" = "8:_2237EB663823236B9A5E7624BA6CF14F" + "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_2237EB663823236B9A5E7624BA6CF14F" + "OwnerKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_25DBC7EDB520FD689F82F76D2F9F3674" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -291,6 +303,30 @@ } "Entry" { + "MsmKey" = "8:_32BEA10568C6B5591E11411368048E84" + "OwnerKey" = "8:_D14DBCEA9C7358E7B31390CB3117BB73" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32BEA10568C6B5591E11411368048E84" + "OwnerKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32BEA10568C6B5591E11411368048E84" + "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_32BEA10568C6B5591E11411368048E84" + "OwnerKey" = "8:_5E405EE393676C75E13A5BBAE170A97B" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_332D2EDF73600AEAF593D862E5957714" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -369,18 +405,6 @@ } "Entry" { - "MsmKey" = "8:_4E9F873CCA4DB49EDF1D8EE63A09A08C" - "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_4E9F873CCA4DB49EDF1D8EE63A09A08C" - "OwnerKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_4F322FB93812A91BB9E226584D319F82" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -447,6 +471,12 @@ } "Entry" { + "MsmKey" = "8:_57175814B378A9EEA88A8771C0230BBE" + "OwnerKey" = "8:_B02E14F8387B113E6CD51B3D8C6CD6CC" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_573A9292013B6B3CB126CFD365B1DF1D" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -465,6 +495,18 @@ } "Entry" { + "MsmKey" = "8:_593E421BCB43695BB1E9A29F2397D504" + "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_593E421BCB43695BB1E9A29F2397D504" + "OwnerKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_5AFA1527E5628027C7507DCDB9D4703B" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -489,6 +531,24 @@ } "Entry" { + "MsmKey" = "8:_5E405EE393676C75E13A5BBAE170A97B" + "OwnerKey" = "8:_D14DBCEA9C7358E7B31390CB3117BB73" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5E405EE393676C75E13A5BBAE170A97B" + "OwnerKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_5E405EE393676C75E13A5BBAE170A97B" + "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_5FF910128787A0B9E747011D764EA76E" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -586,13 +646,13 @@ "Entry" { "MsmKey" = "8:_6BB26C7DBCB41B1726A03D2EEC0DDD09" - "OwnerKey" = "8:_7F3FED3DD69F59FA5C5064CB2306A305" + "OwnerKey" = "8:_B02E14F8387B113E6CD51B3D8C6CD6CC" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_6BB26C7DBCB41B1726A03D2EEC0DDD09" - "OwnerKey" = "8:_4E9F873CCA4DB49EDF1D8EE63A09A08C" + "OwnerKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -789,6 +849,18 @@ } "Entry" { + "MsmKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" + "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" + "OwnerKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_6F867B1EEE2624DBCFF9955E2073AB8E" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -849,24 +921,6 @@ } "Entry" { - "MsmKey" = "8:_7F3FED3DD69F59FA5C5064CB2306A305" - "OwnerKey" = "8:_4E9F873CCA4DB49EDF1D8EE63A09A08C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7F3FED3DD69F59FA5C5064CB2306A305" - "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_7F3FED3DD69F59FA5C5064CB2306A305" - "OwnerKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_834C73DB3C4476B6BB36954C321C3EE4" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -879,30 +933,6 @@ } "Entry" { - "MsmKey" = "8:_85DFE095E5A23D1741475C50CBBBB629" - "OwnerKey" = "8:_A4DD3C0B3F5C7A7FF5831A00A37AFBA0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_85DFE095E5A23D1741475C50CBBBB629" - "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_85DFE095E5A23D1741475C50CBBBB629" - "OwnerKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_85DFE095E5A23D1741475C50CBBBB629" - "OwnerKey" = "8:_BD15FFD40CD26BDC86DA44DF2A93FB6C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_86BB5272D8DED3CF700DC3B2CF87CC86" "OwnerKey" = "8:_8D591CFBE6FB5ECEEABAC7BCF078288C" "MsmSig" = "8:_UNDEFINED" @@ -1083,18 +1113,6 @@ } "Entry" { - "MsmKey" = "8:_A4DD3C0B3F5C7A7FF5831A00A37AFBA0" - "OwnerKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_A4DD3C0B3F5C7A7FF5831A00A37AFBA0" - "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_A6BDF12500D07C7CF303287E4D8F1EF4" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -1132,7 +1150,7 @@ "Entry" { "MsmKey" = "8:_AFA2C20A10EB99FCA4F376849DCA887B" - "OwnerKey" = "8:_7F3FED3DD69F59FA5C5064CB2306A305" + "OwnerKey" = "8:_B02E14F8387B113E6CD51B3D8C6CD6CC" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1144,13 +1162,13 @@ "Entry" { "MsmKey" = "8:_AFE3B7D7111C4E925067DC39859D523B" - "OwnerKey" = "8:_7F3FED3DD69F59FA5C5064CB2306A305" + "OwnerKey" = "8:_B02E14F8387B113E6CD51B3D8C6CD6CC" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_AFE3B7D7111C4E925067DC39859D523B" - "OwnerKey" = "8:_4E9F873CCA4DB49EDF1D8EE63A09A08C" + "OwnerKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1173,6 +1191,24 @@ } "Entry" { + "MsmKey" = "8:_B02E14F8387B113E6CD51B3D8C6CD6CC" + "OwnerKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B02E14F8387B113E6CD51B3D8C6CD6CC" + "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_B02E14F8387B113E6CD51B3D8C6CD6CC" + "OwnerKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_B0999DF85ACCCBD600F2ABABA19D06EF" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -1257,24 +1293,6 @@ } "Entry" { - "MsmKey" = "8:_BD15FFD40CD26BDC86DA44DF2A93FB6C" - "OwnerKey" = "8:_A4DD3C0B3F5C7A7FF5831A00A37AFBA0" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BD15FFD40CD26BDC86DA44DF2A93FB6C" - "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_BD15FFD40CD26BDC86DA44DF2A93FB6C" - "OwnerKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_BD9581A60ECDFA8DC67EB8665AEF0053" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -1396,7 +1414,7 @@ "Entry" { "MsmKey" = "8:_CFBEA0F04A1C53AF0491000B65CC52C6" - "OwnerKey" = "8:_4E9F873CCA4DB49EDF1D8EE63A09A08C" + "OwnerKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1413,6 +1431,18 @@ } "Entry" { + "MsmKey" = "8:_D14DBCEA9C7358E7B31390CB3117BB73" + "OwnerKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_D14DBCEA9C7358E7B31390CB3117BB73" + "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_D673201D2BF2D2A553708AD713446645" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -1431,6 +1461,12 @@ } "Entry" { + "MsmKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" + "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { "MsmKey" = "8:_DAD7B3937F2E34C334D920B60095E2B3" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -1443,24 +1479,6 @@ } "Entry" { - "MsmKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" - "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DE7CA265EA5BE503585300B4F0FECB54" - "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_DE7CA265EA5BE503585300B4F0FECB54" - "OwnerKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { "MsmKey" = "8:_E0EE73D656208E793D0EFB7BCC30753A" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" @@ -1612,13 +1630,13 @@ "Entry" { "MsmKey" = "8:_FFED6337716D17BD1C5755D7F1354347" - "OwnerKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" + "OwnerKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_FFED6337716D17BD1C5755D7F1354347" - "OwnerKey" = "8:_4E9F873CCA4DB49EDF1D8EE63A09A08C" + "OwnerKey" = "8:_6D1F13F97E6C0AD24F9298C9116385F0" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -1636,37 +1654,43 @@ "Entry" { "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_D81A2456F2371E2CC04B4773EE7AE625" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_2237EB663823236B9A5E7624BA6CF14F" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" + "OwnerKey" = "8:_593E421BCB43695BB1E9A29F2397D504" + "MsmSig" = "8:_UNDEFINED" + } + "Entry" + { + "MsmKey" = "8:_UNDEFINED" "OwnerKey" = "8:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DD8F45541244BCB5DD1F8689A1F9709D" + "OwnerKey" = "8:_D14DBCEA9C7358E7B31390CB3117BB73" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_A4DD3C0B3F5C7A7FF5831A00A37AFBA0" + "OwnerKey" = "8:_5E405EE393676C75E13A5BBAE170A97B" "MsmSig" = "8:_UNDEFINED" } "Entry" { "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_BD15FFD40CD26BDC86DA44DF2A93FB6C" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_85DFE095E5A23D1741475C50CBBBB629" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_UNDEFINED" - "OwnerKey" = "8:_DE7CA265EA5BE503585300B4F0FECB54" + "OwnerKey" = "8:_32BEA10568C6B5591E11411368048E84" "MsmSig" = "8:_UNDEFINED" } "Entry" @@ -2993,6 +3017,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_2237EB663823236B9A5E7624BA6CF14F" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_2237EB663823236B9A5E7624BA6CF14F" + { + "Name" = "8:NAudio.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:NAudio.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_25DBC7EDB520FD689F82F76D2F9F3674" { "AssemblyRegister" = "3:1" @@ -3241,6 +3296,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_32BEA10568C6B5591E11411368048E84" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_32BEA10568C6B5591E11411368048E84" + { + "Name" = "8:SharpDX.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:SharpDX.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_332D2EDF73600AEAF593D862E5957714" { "AssemblyRegister" = "3:1" @@ -3644,37 +3730,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4E9F873CCA4DB49EDF1D8EE63A09A08C" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Remotely_ScreenCast.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64" - "ScatterAssemblies" - { - "_4E9F873CCA4DB49EDF1D8EE63A09A08C" - { - "Name" = "8:Remotely_ScreenCast.Core.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Remotely_ScreenCast.Core.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_4F322FB93812A91BB9E226584D319F82" { "AssemblyRegister" = "3:1" @@ -4016,6 +4071,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_593E421BCB43695BB1E9A29F2397D504" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:System.Drawing.Common, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_593E421BCB43695BB1E9A29F2397D504" + { + "Name" = "8:System.Drawing.Common.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:System.Drawing.Common.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5AFA1527E5628027C7507DCDB9D4703B" { "AssemblyRegister" = "3:1" @@ -4140,6 +4226,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5E405EE393676C75E13A5BBAE170A97B" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_5E405EE393676C75E13A5BBAE170A97B" + { + "Name" = "8:SharpDX.DXGI.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:SharpDX.DXGI.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_5FF910128787A0B9E747011D764EA76E" { "AssemblyRegister" = "3:1" @@ -4419,6 +4536,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6D1F13F97E6C0AD24F9298C9116385F0" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Remotely_ScreenCast.Core, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_6D1F13F97E6C0AD24F9298C9116385F0" + { + "Name" = "8:Remotely_ScreenCast.Core.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Remotely_ScreenCast.Core.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_6F867B1EEE2624DBCFF9955E2073AB8E" { "AssemblyRegister" = "3:1" @@ -4698,37 +4846,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_7F3FED3DD69F59FA5C5064CB2306A305" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Remotely_Shared, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64" - "ScatterAssemblies" - { - "_7F3FED3DD69F59FA5C5064CB2306A305" - { - "Name" = "8:Remotely_Shared.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Remotely_Shared.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_834C73DB3C4476B6BB36954C321C3EE4" { "AssemblyRegister" = "3:1" @@ -4791,37 +4908,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_85DFE095E5A23D1741475C50CBBBB629" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:SharpDX, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_85DFE095E5A23D1741475C50CBBBB629" - { - "Name" = "8:SharpDX.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:SharpDX.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_86BB5272D8DED3CF700DC3B2CF87CC86" { "AssemblyRegister" = "3:1" @@ -5442,37 +5528,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A4DD3C0B3F5C7A7FF5831A00A37AFBA0" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:SharpDX.Direct3D11, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_A4DD3C0B3F5C7A7FF5831A00A37AFBA0" - { - "Name" = "8:SharpDX.Direct3D11.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:SharpDX.Direct3D11.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A6BDF12500D07C7CF303287E4D8F1EF4" { "AssemblyRegister" = "3:1" @@ -5690,6 +5745,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B02E14F8387B113E6CD51B3D8C6CD6CC" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Remotely_Shared, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_B02E14F8387B113E6CD51B3D8C6CD6CC" + { + "Name" = "8:Remotely_Shared.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Remotely_Shared.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_B0999DF85ACCCBD600F2ABABA19D06EF" { "AssemblyRegister" = "3:1" @@ -5907,37 +5993,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BD15FFD40CD26BDC86DA44DF2A93FB6C" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:SharpDX.DXGI, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_BD15FFD40CD26BDC86DA44DF2A93FB6C" - { - "Name" = "8:SharpDX.DXGI.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:SharpDX.DXGI.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_BD9581A60ECDFA8DC67EB8665AEF0053" { "AssemblyRegister" = "3:1" @@ -6279,6 +6334,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D14DBCEA9C7358E7B31390CB3117BB73" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:SharpDX.Direct3D11, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b4dcf0f35e5521f1, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_D14DBCEA9C7358E7B31390CB3117BB73" + { + "Name" = "8:SharpDX.Direct3D11.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:SharpDX.Direct3D11.dll" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D673201D2BF2D2A553708AD713446645" { "AssemblyRegister" = "3:1" @@ -6372,6 +6458,37 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } + "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_D81A2456F2371E2CC04B4773EE7AE625" + { + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Remotely_ScreenCast, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL" + "ScatterAssemblies" + { + "_D81A2456F2371E2CC04B4773EE7AE625" + { + "Name" = "8:Remotely_ScreenCast.exe" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:Remotely_ScreenCast.exe" + "TargetName" = "8:" + "Tag" = "8:" + "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" + "Condition" = "8:" + "Transitive" = "11:FALSE" + "Vital" = "11:TRUE" + "ReadOnly" = "11:FALSE" + "Hidden" = "11:FALSE" + "System" = "11:FALSE" + "Permanent" = "11:FALSE" + "SharedLegacy" = "11:FALSE" + "PackageAs" = "3:1" + "Register" = "3:1" + "Exclude" = "11:FALSE" + "IsDependency" = "11:TRUE" + "IsolateTo" = "8:" + } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DAD7B3937F2E34C334D920B60095E2B3" { "AssemblyRegister" = "3:1" @@ -6434,68 +6551,6 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DD8F45541244BCB5DD1F8689A1F9709D" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Remotely_ScreenCast, Version=1.0.0.0, Culture=neutral, processorArchitecture=AMD64" - "ScatterAssemblies" - { - "_DD8F45541244BCB5DD1F8689A1F9709D" - { - "Name" = "8:Remotely_ScreenCast.exe" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Remotely_ScreenCast.exe" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_DE7CA265EA5BE503585300B4F0FECB54" - { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:NAudio, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL" - "ScatterAssemblies" - { - "_DE7CA265EA5BE503585300B4F0FECB54" - { - "Name" = "8:NAudio.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:NAudio.dll" - "TargetName" = "8:" - "Tag" = "8:" - "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:1" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } "{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_E0EE73D656208E793D0EFB7BCC30753A" { "AssemblyRegister" = "3:1" @@ -7093,7 +7148,7 @@ } "{3C67513D-01DD-4637-8A68-80971EB9504F}:_CF8239574F86487C9D3AFD7CEECA3BB5" { - "DefaultLocation" = "8:[ProgramFiles64Folder][Manufacturer]\\[ProductName]" + "DefaultLocation" = "8:[ProgramFilesFolder][Manufacturer]\\[ProductName]" "Name" = "8:#1925" "AlwaysCreate" = "11:FALSE" "Condition" = "8:" @@ -7131,7 +7186,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:Remotely Desktop" "ProductCode" = "8:{9ED3CF93-A3C5-4E86-8071-A8CEEC860767}" - "PackageCode" = "8:{2A32D4C1-EF05-4E83-AA61-A7B9E75B5727}" + "PackageCode" = "8:{0742D5DA-72E4-49D9-975E-4C071BBED7AC}" "UpgradeCode" = "8:{B974F227-4132-4FF3-AD07-D359623501C3}" "AspNetVersion" = "8:4.0.30319.0" "RestartWWWService" = "11:FALSE" @@ -7152,7 +7207,7 @@ "ARPIconIndex" = "3:0" "SearchPath" = "8:" "UseSystemSearchPath" = "11:TRUE" - "TargetPlatform" = "3:1" + "TargetPlatform" = "3:0" "PreBuildEvent" = "8:" "PostBuildEvent" = "8:" "RunPostBuildEvent" = "3:0" @@ -7680,7 +7735,7 @@ { "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_C7E9DFBF8AEF4BA7A4F3E11ABA130C40" { - "SourcePath" = "8:..\\Desktop.Win\\obj\\x64\\Debug\\Remotely_Desktop.exe" + "SourcePath" = "8:..\\Desktop.Win\\obj\\Release\\Remotely_Desktop.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_CF8239574F86487C9D3AFD7CEECA3BB5" diff --git a/Desktop.Win/Desktop.Win.csproj b/Desktop.Win/Desktop.Win.csproj index 9de3e48f..051ab7f5 100644 --- a/Desktop.Win/Desktop.Win.csproj +++ b/Desktop.Win/Desktop.Win.csproj @@ -143,6 +143,10 @@ + + + ..\packages\System.Drawing.Common.4.5.1\lib\net461\System.Drawing.Common.dll + ..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll diff --git a/Desktop.Win/MainWindow.xaml.cs b/Desktop.Win/MainWindow.xaml.cs index 7c4a9654..5e1f6ff5 100644 --- a/Desktop.Win/MainWindow.xaml.cs +++ b/Desktop.Win/MainWindow.xaml.cs @@ -47,6 +47,7 @@ namespace Remotely.Desktop.Win private async void Window_Loaded(object sender, RoutedEventArgs e) { await MainWindowViewModel.Current.Init(); + MainWindowViewModel.Current.CheckForAdminRights(); } private async void HostHyperlink_Click(object sender, RoutedEventArgs e) diff --git a/Desktop.Win/ViewModels/HostNamePromptViewModel.cs b/Desktop.Win/ViewModels/HostNamePromptViewModel.cs index 42d25f1b..b6f6ad71 100644 --- a/Desktop.Win/ViewModels/HostNamePromptViewModel.cs +++ b/Desktop.Win/ViewModels/HostNamePromptViewModel.cs @@ -1,4 +1,5 @@ -using System; +using PropertyChanged; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Linq; @@ -7,7 +8,8 @@ using System.Threading.Tasks; namespace Remotely.Desktop.Win.ViewModels { - public class HostNamePromptViewModel : INotifyPropertyChanged + [AddINotifyPropertyChangedInterface] + public class HostNamePromptViewModel { public static HostNamePromptViewModel Current { get; private set; } public HostNamePromptViewModel() @@ -15,7 +17,5 @@ namespace Remotely.Desktop.Win.ViewModels Current = this; } public string Host { get; set; } - - public event PropertyChangedEventHandler PropertyChanged; } } diff --git a/Desktop.Win/ViewModels/MainWindowViewModel.cs b/Desktop.Win/ViewModels/MainWindowViewModel.cs index 6b9863f8..a9db4462 100644 --- a/Desktop.Win/ViewModels/MainWindowViewModel.cs +++ b/Desktop.Win/ViewModels/MainWindowViewModel.cs @@ -44,8 +44,6 @@ namespace Remotely.Desktop.Win.ViewModels public static MainWindowViewModel Current { get; private set; } - public AudioCapturer AudioCapturer { get; private set; } - public bool AllowHostChange { get @@ -54,6 +52,7 @@ namespace Remotely.Desktop.Win.ViewModels } } + public AudioCapturer AudioCapturer { get; private set; } public Conductor Conductor { get; } public Config Config { get; private set; } @@ -74,6 +73,21 @@ namespace Remotely.Desktop.Win.ViewModels public ObservableCollection Viewers { get; } = new ObservableCollection(); + public void CheckForAdminRights() + { + if (!new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator)) + { + var result = MessageBox.Show(Application.Current.MainWindow, "Remotely isn't running with administrator rights. Would you like to re-launch as an admin?", "Run as Admin", MessageBoxButton.YesNo, MessageBoxImage.Question); + if (result == MessageBoxResult.Yes) + { + var psi = new ProcessStartInfo(Assembly.GetExecutingAssembly().Location); + psi.Verb = "RunAs"; + Process.Start(psi); + Environment.Exit(0); + } + } + } + public void FirePropertyChanged(string propertyName) { PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); @@ -104,32 +118,14 @@ namespace Remotely.Desktop.Win.ViewModels catch (Exception ex) { Logger.Write(ex); - MessageBox.Show("Failed to connect to server.", "Connection Failed", MessageBoxButton.OK, MessageBoxImage.Warning); + MessageBox.Show(Application.Current.MainWindow, "Failed to connect to server.", "Connection Failed", MessageBoxButton.OK, MessageBoxImage.Warning); return; } Conductor.SetMessageHandlers(new WinInput()); await Conductor.CasterSocket.SendDeviceInfo(Conductor.ServiceID, Environment.MachineName); await Conductor.CasterSocket.GetSessionID(); - - CheckForAdminRights(); } - - private void CheckForAdminRights() - { - if (!new WindowsPrincipal(WindowsIdentity.GetCurrent()).IsInRole(WindowsBuiltInRole.Administrator)) - { - var result = MessageBox.Show("Remotely isn't running with administrator rights. Would you like to re-launch as an admin?", "Run as Admin", MessageBoxButton.YesNo, MessageBoxImage.Question); - if (result == MessageBoxResult.Yes) - { - var psi = new ProcessStartInfo(Assembly.GetExecutingAssembly().Location); - psi.Verb = "RunAs"; - Process.Start(psi); - Environment.Exit(0); - } - } - } - public void PromptForHostName() { var prompt = new HostNamePrompt(); @@ -177,10 +173,10 @@ namespace Remotely.Desktop.Win.ViewModels { App.Current.Dispatcher.Invoke(() => { - var result = MessageBox.Show($"You've received a connection request from {screenCastRequest.RequesterName}. Accept?", "Connection Request", MessageBoxButton.YesNo, MessageBoxImage.Question); + var result = MessageBox.Show(Application.Current.MainWindow, $"You've received a connection request from {screenCastRequest.RequesterName}. Accept?", "Connection Request", MessageBoxButton.YesNo, MessageBoxImage.Question); if (result == MessageBoxResult.Yes) { - Task.Run(async() => + Task.Run(async () => { ICapturer capturer; try diff --git a/Desktop.Win/packages.config b/Desktop.Win/packages.config index 52349066..47c9fe05 100644 --- a/Desktop.Win/packages.config +++ b/Desktop.Win/packages.config @@ -24,6 +24,7 @@ + diff --git a/Remotely.sln b/Remotely.sln index 29b0c9fd..f6bd51e6 100644 --- a/Remotely.sln +++ b/Remotely.sln @@ -155,6 +155,7 @@ Global {943613A9-3B59-4929-B5D3-4B1D95D7E4C1}.Release|x64.ActiveCfg = Release {943613A9-3B59-4929-B5D3-4B1D95D7E4C1}.Release|x64.Build.0 = Release {943613A9-3B59-4929-B5D3-4B1D95D7E4C1}.Release|x86.ActiveCfg = Release + {943613A9-3B59-4929-B5D3-4B1D95D7E4C1}.Release|x86.Build.0 = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Server/CurrentVersion.txt b/Server/CurrentVersion.txt index 9f5075a5..b2082ab8 100644 --- a/Server/CurrentVersion.txt +++ b/Server/CurrentVersion.txt @@ -1 +1 @@ -2019.06.15.1805 +2019.06.19.1959 diff --git a/Server/Pages/Clients.cshtml b/Server/Pages/Clients.cshtml index 0d238fcd..b2ce36fb 100644 --- a/Server/Pages/Clients.cshtml +++ b/Server/Pages/Clients.cshtml @@ -31,16 +31,16 @@
-

Portable Remote Control

+

Screen-Sharing Client

- Instant desktop sharing with no installation or hassles. + Instant desktop sharing. No account required.
Windows (32/64-Bit)

Download:
- Windows Portable EXE + Windows Installer

diff --git a/Server/Pages/RemoteControl.cshtml b/Server/Pages/RemoteControl.cshtml index 7313f790..9164206a 100644 --- a/Server/Pages/RemoteControl.cshtml +++ b/Server/Pages/RemoteControl.cshtml @@ -102,7 +102,7 @@