mirror of
https://github.com/mRemoteNG/mRemoteNG.git
synced 2026-02-17 22:11:48 +08:00
updated geckofx from 45 to 60
This commit is contained in:
@@ -219,14 +219,14 @@ namespace mRemoteNG.Connection.Protocol.Http
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(tabTitle))
|
||||
{
|
||||
tabP.TabText = tabTitle + @" - " + shortTitle;
|
||||
}
|
||||
else
|
||||
{
|
||||
tabP.TabText = shortTitle;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tabTitle))
|
||||
{
|
||||
tabP.TabText = tabTitle + @" - " + shortTitle;
|
||||
}
|
||||
else
|
||||
{
|
||||
tabP.TabText = shortTitle;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -265,14 +265,14 @@ namespace mRemoteNG.Connection.Protocol.Http
|
||||
}
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(tabTitle))
|
||||
{
|
||||
tabP.TabText = tabTitle + @" - " + shortTitle;
|
||||
}
|
||||
else
|
||||
{
|
||||
tabP.TabText = shortTitle;
|
||||
}
|
||||
if (!string.IsNullOrEmpty(tabTitle))
|
||||
{
|
||||
tabP.TabText = tabTitle + @" - " + shortTitle;
|
||||
}
|
||||
else
|
||||
{
|
||||
tabP.TabText = shortTitle;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@@ -282,7 +282,7 @@ namespace mRemoteNG.Connection.Protocol.Http
|
||||
|
||||
private void geckoBrowser_LauncherDialog_Download(object sender, Gecko.LauncherDialogEvent e)
|
||||
{
|
||||
var objTarget = Xpcom.CreateInstance<nsILocalFile>("@mozilla.org/file/local;1");
|
||||
var objTarget = Xpcom.CreateInstance<nsILocalFileWin>("@mozilla.org/file/local;1");
|
||||
using (var tmp = new nsAString(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + @"\mremoteng.download"))
|
||||
{
|
||||
objTarget.InitWithPath(tmp);
|
||||
|
||||
BIN
mRemoteV1/Firefox/AccessibleHandler.dll
Normal file
BIN
mRemoteV1/Firefox/AccessibleHandler.dll
Normal file
Binary file not shown.
Binary file not shown.
BIN
mRemoteV1/Firefox/IA2Marshal.dll
Normal file
BIN
mRemoteV1/Firefox/IA2Marshal.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
mRemoteV1/Firefox/mozavcodec.dll
Normal file
BIN
mRemoteV1/Firefox/mozavcodec.dll
Normal file
Binary file not shown.
BIN
mRemoteV1/Firefox/mozavutil.dll
Normal file
BIN
mRemoteV1/Firefox/mozavutil.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
mRemoteV1/Firefox/qipcap.dll
Normal file
BIN
mRemoteV1/Firefox/qipcap.dll
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -54,11 +54,11 @@
|
||||
<Reference Include="BouncyCastle.Crypto, Version=1.8.5.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
|
||||
<HintPath>..\packages\BouncyCastle.1.8.5\lib\BouncyCastle.Crypto.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Geckofx-Core, Version=45.0.34.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
|
||||
<HintPath>..\packages\Geckofx45.45.0.34\lib\net45\Geckofx-Core.dll</HintPath>
|
||||
<Reference Include="Geckofx-Core, Version=60.0.37.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
|
||||
<HintPath>..\packages\Geckofx60.32.60.0.37\lib\net45\Geckofx-Core.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Geckofx-Winforms, Version=45.0.34.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
|
||||
<HintPath>..\packages\Geckofx45.45.0.34\lib\net45\Geckofx-Winforms.dll</HintPath>
|
||||
<Reference Include="Geckofx-Winforms, Version=60.0.37.0, Culture=neutral, PublicKeyToken=3209ac31600d1857, processorArchitecture=x86">
|
||||
<HintPath>..\packages\Geckofx60.32.60.0.37\lib\net45\Geckofx-Winforms.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Google.Protobuf, Version=3.8.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Google.Protobuf.3.8.0\lib\net45\Google.Protobuf.dll</HintPath>
|
||||
@@ -1191,25 +1191,6 @@
|
||||
<None Include="Documentation\images\putty.png" />
|
||||
<Content Include="Documentation\mssql_db_setup.sql" />
|
||||
<Content Include="Documentation\mysql_db_setup.sql" />
|
||||
<Content Include="Firefox\AccessibleMarshal.dll" />
|
||||
<Content Include="Firefox\breakpadinjector.dll" />
|
||||
<Content Include="Firefox\d3dcompiler_47.dll" />
|
||||
<Content Include="Firefox\freebl3.dll" />
|
||||
<Content Include="Firefox\icudt58.dll" />
|
||||
<Content Include="Firefox\icuin58.dll" />
|
||||
<Content Include="Firefox\icuuc58.dll" />
|
||||
<Content Include="Firefox\lgpllibs.dll" />
|
||||
<Content Include="Firefox\libEGL.dll" />
|
||||
<Content Include="Firefox\libGLESv2.dll" />
|
||||
<Content Include="Firefox\mozglue.dll" />
|
||||
<Content Include="Firefox\nss3.dll" />
|
||||
<Content Include="Firefox\nssckbi.dll" />
|
||||
<Content Include="Firefox\nssdbm3.dll" />
|
||||
<Content Include="Firefox\plugin-container.exe" />
|
||||
<Content Include="Firefox\plugin-hang-ui.exe" />
|
||||
<Content Include="Firefox\sandboxbroker.dll" />
|
||||
<Content Include="Firefox\softokn3.dll" />
|
||||
<Content Include="Firefox\xul.dll" />
|
||||
<None Include="Documentation\images\config_top_bar.png" />
|
||||
<None Include="Documentation\images\connections_main.png" />
|
||||
<None Include="Documentation\images\connections_top_bar.png" />
|
||||
@@ -1229,6 +1210,26 @@
|
||||
<None Include="Documentation\images\connections_open.png" />
|
||||
<None Include="Documentation\images\screenshot_manager_rightclick_menu.png" />
|
||||
<None Include="Documentation\images\screenshot_manager_overview.png" />
|
||||
<Content Include="Firefox\AccessibleHandler.dll" />
|
||||
<Content Include="Firefox\AccessibleMarshal.dll" />
|
||||
<Content Include="Firefox\breakpadinjector.dll" />
|
||||
<Content Include="Firefox\d3dcompiler_47.dll" />
|
||||
<Content Include="Firefox\freebl3.dll" />
|
||||
<Content Include="Firefox\IA2Marshal.dll" />
|
||||
<Content Include="Firefox\lgpllibs.dll" />
|
||||
<Content Include="Firefox\libEGL.dll" />
|
||||
<Content Include="Firefox\libGLESv2.dll" />
|
||||
<Content Include="Firefox\mozavcodec.dll" />
|
||||
<Content Include="Firefox\mozavutil.dll" />
|
||||
<Content Include="Firefox\mozglue.dll" />
|
||||
<Content Include="Firefox\nss3.dll" />
|
||||
<Content Include="Firefox\nssckbi.dll" />
|
||||
<Content Include="Firefox\nssdbm3.dll" />
|
||||
<Content Include="Firefox\plugin-container.exe" />
|
||||
<Content Include="Firefox\plugin-hang-ui.exe" />
|
||||
<Content Include="Firefox\qipcap.dll" />
|
||||
<Content Include="Firefox\softokn3.dll" />
|
||||
<Content Include="Firefox\xul.dll" />
|
||||
<Content Include="Icons\Apple.ico">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</Content>
|
||||
@@ -1734,12 +1735,12 @@ powershell.exe -ExecutionPolicy Bypass -File "$(SolutionDir)Tools\postbuild_mrem
|
||||
<PropertyGroup>
|
||||
<PreBuildEvent>echo $(ConfigurationName) > buildenv.tmp</PreBuildEvent>
|
||||
</PropertyGroup>
|
||||
<Import Project="..\packages\Geckofx45.45.0.34\build\Geckofx45.targets" Condition="Exists('..\packages\Geckofx45.45.0.34\build\Geckofx45.targets')" />
|
||||
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
|
||||
<PropertyGroup>
|
||||
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
|
||||
</PropertyGroup>
|
||||
<Error Condition="!Exists('..\packages\Geckofx45.45.0.34\build\Geckofx45.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Geckofx45.45.0.34\build\Geckofx45.targets'))" />
|
||||
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.13.0\build\net35\NUnit3TestAdapter.props'))" />
|
||||
<Error Condition="!Exists('..\packages\Geckofx60.32.60.0.37\build\Geckofx60.32.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Geckofx60.32.60.0.37\build\Geckofx60.32.targets'))" />
|
||||
</Target>
|
||||
<Import Project="..\packages\Geckofx60.32.60.0.37\build\Geckofx60.32.targets" Condition="Exists('..\packages\Geckofx60.32.60.0.37\build\Geckofx60.32.targets')" />
|
||||
</Project>
|
||||
@@ -6,7 +6,7 @@
|
||||
<package id="DockPanelSuite.ThemeVS2012" version="3.0.6" targetFramework="net46" />
|
||||
<package id="DockPanelSuite.ThemeVS2013" version="3.0.6" targetFramework="net46" />
|
||||
<package id="DockPanelSuite.ThemeVS2015" version="3.0.6" targetFramework="net46" />
|
||||
<package id="Geckofx45" version="45.0.34" targetFramework="net46" />
|
||||
<package id="Geckofx60.32" version="60.0.37" targetFramework="net46" />
|
||||
<package id="Google.Protobuf" version="3.8.0" targetFramework="net46" />
|
||||
<package id="log4net" version="2.0.8" targetFramework="net46" />
|
||||
<package id="Markdig" version="0.17.0" targetFramework="net46" />
|
||||
|
||||
Reference in New Issue
Block a user