From 2f3d9e07cbd48baefc9e42b59372951337176e56 Mon Sep 17 00:00:00 2001
From: spherallic <spherallic@gmail.com>
Date: Sun, 21 May 2023 23:03:10 +0200
Subject: [PATCH] Various project changes to make UDBScript work again
---
Source/Core/Builder.csproj | 8 ++++++--
Source/Core/app.config | 4 ++++
Source/Native/BuilderNative.vcxproj | 4 ++++
Source/Plugins/UDBScript/UDBScript.csproj | 1 +
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/Source/Core/Builder.csproj b/Source/Core/Builder.csproj
index 9071d6910..1d951f455 100644
--- a/Source/Core/Builder.csproj
+++ b/Source/Core/Builder.csproj
@@ -707,9 +707,13 @@
<Reference Include="System.Design" />
<Reference Include="System.Drawing" />
<Reference Include="System.Management" />
- <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL" />
+ <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
- <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
+ <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="TabControlEX, Version=0.0.3271.41578, Culture=neutral, PublicKeyToken=1db242dc828e4b4e">
diff --git a/Source/Core/app.config b/Source/Core/app.config
index 04f0eefb6..f09e44f8e 100644
--- a/Source/Core/app.config
+++ b/Source/Core/app.config
@@ -7,6 +7,10 @@
<loadFromRemoteSources enabled="true"/>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<probing privatePath="Plugins\Dependencies"/>
+ <dependentAssembly>
+ <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+ <bindingRedirect oldVersion="0.0.0.0-4.5.4.0" newVersion="4.0.1.2"/>
+ </dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
diff --git a/Source/Native/BuilderNative.vcxproj b/Source/Native/BuilderNative.vcxproj
index 0d2210788..a49c706bf 100644
--- a/Source/Native/BuilderNative.vcxproj
+++ b/Source/Native/BuilderNative.vcxproj
@@ -39,19 +39,23 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
+ <PlatformToolset>v143</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/Source/Plugins/UDBScript/UDBScript.csproj b/Source/Plugins/UDBScript/UDBScript.csproj
index 3e2025ecb..c2bb446d8 100644
--- a/Source/Plugins/UDBScript/UDBScript.csproj
+++ b/Source/Plugins/UDBScript/UDBScript.csproj
@@ -68,6 +68,7 @@
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
<Reference Include="System.Numerics" />
--
GitLab