Updated .NET to 4.7.2

This commit is contained in:
Faryan Rezagholi
2019-10-03 00:18:27 +02:00
parent 4c08d06e93
commit 0e233e7027
11 changed files with 98 additions and 99 deletions

View File

@@ -1,36 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0" />
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0" />
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
</configuration>
</configuration>

View File

@@ -12,7 +12,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mRemoteNG.Specs</RootNamespace>
<AssemblyName>mRemoteNG.Specs</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>

View File

@@ -18,8 +18,8 @@
<package id="SpecFlow.NUnit.Runners" version="3.0.224" targetFramework="net46" />
<package id="System.Reflection.Emit" version="4.3.0" targetFramework="net46" />
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net46" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net46" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net46" />
<package id="Utf8Json" version="1.3.7" targetFramework="net46" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" requireReinstallation="true" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net46" requireReinstallation="true" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net46" requireReinstallation="true" />
<package id="Utf8Json" version="1.3.7" targetFramework="net46" requireReinstallation="true" />
</packages>

View File

@@ -19,7 +19,7 @@ namespace mRemoteNGTests.Properties {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {

View File

@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0" />
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
<assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0" />
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" /></startup></configuration>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>

View File

@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>mRemoteNGTests</RootNamespace>
<AssemblyName>mRemoteNGTests</AssemblyName>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

View File

@@ -17,6 +17,6 @@
<package id="ObjectListView.Official" version="2.9.1" targetFramework="net46" />
<package id="OpenCover" version="4.7.922" targetFramework="net46" />
<package id="ReportGenerator" version="3.0.2" targetFramework="net46" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net46" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net46" requireReinstallation="true" />
<package id="System.Threading.Tasks.Extensions" version="4.5.2" targetFramework="net46" requireReinstallation="true" />
</packages>

View File

@@ -19,7 +19,7 @@ namespace mRemoteNG {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {

View File

@@ -19,7 +19,7 @@ namespace mRemoteNG {
// class via a tool like ResGen or Visual Studio.
// To add or remove a member, edit your .ResX file then rerun ResGen
// with the /str option, or rebuild your VS project.
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class ColorMapTheme {

View File

@@ -1,39 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
<section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
</sectionGroup>
<sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="mRemoteNG.Resources.Themes.ColorMap" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
<section name="mRemoteNG.Resources.Themes.ColorMap" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
<section name="mRemoteNG.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
</sectionGroup>
</configSections>
<appSettings>
<add key="EnableWindowsFormsHighDpiAutoResizing" value="true" />
<add key="EnableWindowsFormsHighDpiAutoResizing" value="true"/>
</appSettings>
<log4net>
<logger name="Logger">
<level value="DEBUG" />
<level value="DEBUG"/>
</logger>
<root>
<level value="ALL" />
<appender-ref ref="LogFileAppender" />
<level value="ALL"/>
<appender-ref ref="LogFileAppender"/>
</root>
<appender name="LogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="${APPDATA}\mRemoteNG\mRemoteNG.log" />
<appendToFile value="true" />
<rollingStyle value="Size" />
<maxSizeRollBackups value="5" />
<maximumFileSize value="10MB" />
<staticLogFileName value="true" />
<file value="${APPDATA}\mRemoteNG\mRemoteNG.log"/>
<appendToFile value="true"/>
<rollingStyle value="Size"/>
<maxSizeRollBackups value="5"/>
<maximumFileSize value="10MB"/>
<staticLogFileName value="true"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="%date [%thread] %-6level- %message%newline" />
<conversionPattern value="%date [%thread] %-6level- %message%newline"/>
</layout>
</appender>
</log4net>
@@ -56,7 +55,7 @@
<value>True</value>
</setting>
<setting name="CustomPuttyPath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="SwitchToMCOnInformation" serializeAs="String">
<value>True</value>
@@ -71,7 +70,7 @@
<value>False</value>
</setting>
<setting name="CustomConsPath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="SaveConsOnExit" serializeAs="String">
<value>True</value>
@@ -98,13 +97,13 @@
<value>noinfo</value>
</setting>
<setting name="DefaultUsername" serializeAs="String">
<value />
<value/>
</setting>
<setting name="DefaultPassword" serializeAs="String">
<value />
<value/>
</setting>
<setting name="DefaultDomain" serializeAs="String">
<value />
<value/>
</setting>
<setting name="UseCustomPuttyPath" serializeAs="String">
<value>False</value>
@@ -122,7 +121,7 @@
<value>False</value>
</setting>
<setting name="UpdateProxyAddress" serializeAs="String">
<value />
<value/>
</setting>
<setting name="UpdateProxyPort" serializeAs="String">
<value>80</value>
@@ -131,13 +130,13 @@
<value>False</value>
</setting>
<setting name="UpdateProxyAuthUser" serializeAs="String">
<value />
<value/>
</setting>
<setting name="UpdateProxyAuthPass" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultDescription" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultProtocol" serializeAs="String">
<value>RDP</value>
@@ -230,13 +229,13 @@
<value>False</value>
</setting>
<setting name="SQLHost" serializeAs="String">
<value />
<value/>
</setting>
<setting name="SQLUser" serializeAs="String">
<value />
<value/>
</setting>
<setting name="SQLPass" serializeAs="String">
<value />
<value/>
</setting>
<setting name="InhDefaultCacheBitmaps" serializeAs="String">
<value>False</value>
@@ -314,10 +313,10 @@
<value>False</value>
</setting>
<setting name="ConDefaultPreExtApp" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultPostExtApp" serializeAs="String">
<value />
<value/>
</setting>
<setting name="InhDefaultPreExtApp" serializeAs="String">
<value>False</value>
@@ -356,10 +355,10 @@
<value>EncHextile</value>
</setting>
<setting name="ConDefaultVNCProxyIP" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultVNCProxyPassword" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultVNCProxyPort" serializeAs="String">
<value>0</value>
@@ -368,7 +367,7 @@
<value>ProxyNone</value>
</setting>
<setting name="ConDefaultVNCProxyUsername" serializeAs="String">
<value />
<value/>
</setting>
<setting name="InhDefaultVNCAuthMode" serializeAs="String">
<value>False</value>
@@ -422,7 +421,7 @@
<value>False</value>
</setting>
<setting name="XULRunnerPath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultRenderingEngine" serializeAs="String">
<value>IE</value>
@@ -431,7 +430,7 @@
<value>False</value>
</setting>
<setting name="ConDefaultMacAddress" serializeAs="String">
<value />
<value/>
</setting>
<setting name="InhDefaultMacAddress" serializeAs="String">
<value>False</value>
@@ -440,13 +439,13 @@
<value>False</value>
</setting>
<setting name="ConDefaultUserField" serializeAs="String">
<value />
<value/>
</setting>
<setting name="InhDefaultUserField" serializeAs="String">
<value>False</value>
</setting>
<setting name="ConDefaultExtApp" serializeAs="String">
<value />
<value/>
</setting>
<setting name="InhDefaultExtApp" serializeAs="String">
<value>False</value>
@@ -494,19 +493,19 @@
<value>5</value>
</setting>
<setting name="OverrideUICulture" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultRDGatewayHostname" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultRDGatewayUsername" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultRDGatewayPassword" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultRDGatewayDomain" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultEnableFontSmoothing" serializeAs="String">
<value>False</value>
@@ -551,22 +550,22 @@
<value>release</value>
</setting>
<setting name="ThemeName" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ShowConfigHelpText" serializeAs="String">
<value>True</value>
</setting>
<setting name="PuttySavedSessionsName" serializeAs="String">
<value />
<value/>
</setting>
<setting name="PuttySavedSessionsPanel" serializeAs="String">
<value />
<value/>
</setting>
<setting name="CompatibilityWarnLenovoAutoScrollUtility" serializeAs="String">
<value>True</value>
</setting>
<setting name="ConDefaultLoadBalanceInfo" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultAutomaticResize" serializeAs="String">
<value>True</value>
@@ -626,7 +625,7 @@
<value>00000000-0000-0000-0000-000000000000</value>
</setting>
<setting name="LogFilePath" serializeAs="String">
<value />
<value/>
</setting>
<setting name="TextLogMessageWriterWriteDebugMsgs" serializeAs="String">
<value>False</value>
@@ -674,13 +673,13 @@
<value>True</value>
</setting>
<setting name="ConDefaultUsername" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultPassword" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultDomain" serializeAs="String">
<value />
<value/>
</setting>
<setting name="ConDefaultPanel" serializeAs="String">
<value>General</value>
@@ -704,7 +703,7 @@
<value>0, 0</value>
</setting>
<setting name="MultiSshToolbarParentDock" serializeAs="String">
<value />
<value/>
</setting>
<setting name="MultiSshToolbarVisible" serializeAs="String">
<value>False</value>
@@ -740,7 +739,7 @@
<value>False</value>
</setting>
<setting name="ConDefaultVmId" serializeAs="String">
<value />
<value/>
</setting>
<setting name="InhDefaultVmId" serializeAs="String">
<value>False</value>
@@ -777,24 +776,24 @@
</applicationSettings>
<runtime>
<generatePublisherEvidence enabled="false" />
<generatePublisherEvidence enabled="false"/>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0" />
<assemblyIdentity name="WeifenLuo.WinFormsUI.Docking" publicKeyToken="5cded1a1a0a7b481" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.0.6.0" newVersion="3.0.6.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0" />
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-1.8.5.0" newVersion="1.8.5.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0" />
<assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-3.8.0.0" newVersion="3.8.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
</startup>
</configuration>
</configuration>

View File

@@ -26,7 +26,7 @@
<ManifestKeyFile>mRemoteV1_TemporaryKey.pfx</ManifestKeyFile>
<GenerateManifests>false</GenerateManifests>
<SignManifests>false</SignManifests>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>