Skip to content

Commit f14d183

Browse files
authored
.Net framework update 4.7.2 ➔ 4.8.1 (#1049)
1 parent 2d5eca0 commit f14d183

File tree

17 files changed

+101
-51
lines changed

17 files changed

+101
-51
lines changed

Memoria.Client/App.config

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
4-
<bypassTrustedAppStrongNames enabled="false" />
4+
<bypassTrustedAppStrongNames enabled="false"/>
55
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
66
<dependentAssembly>
7-
<assemblyIdentity name="Mono.Security" publicKeyToken="0738eb9f132ed756" />
8-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
7+
<assemblyIdentity name="Mono.Security" publicKeyToken="0738eb9f132ed756"/>
8+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
99
<!--<codeBase version="2.0.5.0" href="unity\Mono.Security.dll"/>-->
1010
</dependentAssembly>
1111
<dependentAssembly>
12-
<assemblyIdentity name="mscorlib" publicKeyToken="7cec85d7bea7798e" />
13-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
12+
<assemblyIdentity name="mscorlib" publicKeyToken="7cec85d7bea7798e"/>
13+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
1414
<!--<codeBase version="2.0.5.0" href="unity\mscorlib.dll"/>-->
1515
</dependentAssembly>
1616
<dependentAssembly>
17-
<assemblyIdentity name="System" publicKeyToken="7cec85d7bea7798e" />
18-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
17+
<assemblyIdentity name="System" publicKeyToken="7cec85d7bea7798e"/>
18+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
1919
<!--<codeBase version="2.0.5.0" href="unity\System.dll"/>-->
2020
</dependentAssembly>
2121
<dependentAssembly>
22-
<assemblyIdentity name="System.Core" publicKeyToken="7cec85d7bea7798e" />
23-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
22+
<assemblyIdentity name="System.Core" publicKeyToken="7cec85d7bea7798e"/>
23+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
2424
<!--<codeBase version="2.0.5.0" href="unity\System.Core.dll"/>-->
2525
</dependentAssembly>
2626
<dependentAssembly>
27-
<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral" />
28-
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
27+
<assemblyIdentity name="System" publicKeyToken="b77a5c561934e089" culture="neutral"/>
28+
<bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0"/>
2929
</dependentAssembly>
3030
</assemblyBinding>
3131
</runtime>
32-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>
32+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

Memoria.Client/Memoria.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Memoria.Client</RootNamespace>
1111
<AssemblyName>Memoria.Client</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1515
<WarningLevel>4</WarningLevel>

Memoria.Client/Properties/Resources.Designer.cs

Lines changed: 13 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Memoria.Client/Properties/Settings.Designer.cs

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Memoria.Compiler/Memoria.Compiler.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Memoria.Compiler</RootNamespace>
1111
<AssemblyName>Memoria.Compiler</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
<AllowedReferenceRelatedFileExtensions>.pdb</AllowedReferenceRelatedFileExtensions>

Memoria.Compiler/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

Memoria.Debugger/Memoria.Debugger.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>Memoria.Debugger</RootNamespace>
1111
<AssemblyName>Memoria.Debugger</AssemblyName>
12-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
1515
</PropertyGroup>

Memoria.Debugger/app.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8.1"/></startup></configuration>

Memoria.Launcher/Launcher/UiGrid.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,11 @@ public static void MakeTooltip(FrameworkElement uiElement, String text = "", Str
199199
};
200200
if (uiElement.ToolTip == null || uiElement.ToolTip is string)
201201
{
202+
uiElement.ToolTipOpening += (object sender, ToolTipEventArgs e) =>
203+
{
204+
// Allegedly fixes the System.ArgumentNullException within System.Windows.Controls.ToolTipService.GetBetweenShowDelay
205+
e.Handled = true;
206+
};
202207
uiElement.MouseEnter += (sender, e) =>
203208
{
204209
if (uiElement.ToolTip is ToolTip)
@@ -296,6 +301,11 @@ public void MakeFontPreview(ComboBox uiElement)
296301
ForceCursor = true,
297302
Opacity = 1
298303
};
304+
uiElement.ToolTipOpening += (object sender, ToolTipEventArgs e) =>
305+
{
306+
// Allegedly fixes the System.ArgumentNullException within System.Windows.Controls.ToolTipService.GetBetweenShowDelay
307+
e.Handled = true;
308+
};
299309
uiElement.MouseEnter += (sender, e) =>
300310
{
301311
if (uiElement.SelectedValue != null && !uiElement.SelectedValue.ToString().StartsWith("Final Fantasy IX"))

Memoria.Launcher/Memoria.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<ProjectGuid>{95BC3C2C-0C8B-41B6-92E8-49D301119BE8}</ProjectGuid>
77
<OutputType>WinExe</OutputType>
88
<AssemblyName>Memoria.Launcher</AssemblyName>
9-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
9+
<TargetFrameworkVersion>v4.8.1</TargetFrameworkVersion>
1010
<FileAlignment>512</FileAlignment>
1111
<TargetFrameworkProfile />
1212
<IsWebBootstrapper>false</IsWebBootstrapper>

0 commit comments

Comments
 (0)