Skip to content

Commit f89170c

Browse files
Bishbash777Bishbash777
authored
Net 4.8 upgrade (#27)
* Framework 4.8 Upgrade and small memory access change * update tests to 4.8 * update mod_id for torch mod
1 parent 73ee686 commit f89170c

16 files changed

Lines changed: 83 additions & 26 deletions

‎Torch.Mod/TorchModCore.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace Torch.Mod
1111
[MySessionComponentDescriptor(MyUpdateOrder.AfterSimulation)]
1212
public class TorchModCore : MySessionComponentBase
1313
{
14-
public const ulong MOD_ID = 1406994352;
14+
public const ulong MOD_ID = 2722000298;
1515
private static bool _init;
1616
public static bool Debug;
1717

‎Torch.Server.Tests/Torch.Server.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AppDesignerFolder>Properties</AppDesignerFolder>
88
<RootNamespace>Torch.Server.Tests</RootNamespace>
99
<AssemblyName>Torch.Server.Tests</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1111
<FileAlignment>512</FileAlignment>
1212
<TargetFrameworkProfile />
1313
<NuGetPackageImportStamp>
@@ -104,4 +104,4 @@
104104
</ItemGroup>
105105
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106106
<Import Project="$(SolutionDir)\TransformOnBuild.targets" />
107-
</Project>
107+
</Project>

‎Torch.Server.Tests/app.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
6+
<assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0"/>
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>
11-
</configuration>
11+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

‎Torch.Server/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Torch.Server/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Torch.Server/Torch.Server.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AppDesignerFolder>Properties</AppDesignerFolder>
88
<RootNamespace>Torch.Server</RootNamespace>
99
<AssemblyName>Torch.Server</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1111
<FileAlignment>512</FileAlignment>
1212
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1313
<WarningLevel>4</WarningLevel>
@@ -381,6 +381,7 @@
381381
<Generator>ResXFileCodeGenerator</Generator>
382382
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
383383
</EmbeddedResource>
384+
<None Include="app.config" />
384385
<None Include="packages.config" />
385386
<None Include="Properties\Settings.settings">
386387
<Generator>SettingsSingleFileGenerator</Generator>
@@ -533,4 +534,4 @@
533534
<PropertyGroup>
534535
<PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
535536
</PropertyGroup>
536-
</Project>
537+
</Project>

‎Torch.Server/app.config‎

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

‎Torch.Server/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" />
3+
<package id="ControlzEx" version="3.0.2.4" targetFramework="net461" requireReinstallation="true" />
44
<package id="MahApps.Metro" version="1.6.1" targetFramework="net461" />
55
<package id="Markdown.Xaml" version="1.0.0" targetFramework="net461" />
66
<package id="Microsoft.Win32.Registry" version="4.4.0" targetFramework="net461" />

‎Torch.Tests/Torch.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<AppDesignerFolder>Properties</AppDesignerFolder>
88
<RootNamespace>Torch.Tests</RootNamespace>
99
<AssemblyName>Torch.Tests</AssemblyName>
10-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
10+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1111
<FileAlignment>512</FileAlignment>
1212
<TargetFrameworkProfile />
1313
<NuGetPackageImportStamp>
@@ -95,4 +95,4 @@
9595
</ItemGroup>
9696
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
9797
<Import Project="$(SolutionDir)\TransformOnBuild.targets" />
98-
</Project>
98+
</Project>

‎Torch.Tests/app.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral" />
7-
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0" />
6+
<assemblyIdentity name="protobuf-net" publicKeyToken="257b51d87d2e4d67" culture="neutral"/>
7+
<bindingRedirect oldVersion="0.0.0.0-2.4.0.0" newVersion="2.4.0.0"/>
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>
11-
</configuration>
11+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

0 commit comments

Comments
 (0)