Skip to content
This repository was archived by the owner on Oct 21, 2022. It is now read-only.

Commit 08140ac

Browse files
dani0105dani0105
committed
Fixe libraries installl
1 parent 3f588ca commit 08140ac

6 files changed

Lines changed: 32 additions & 89 deletions

File tree

‎ModLoader.sln‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29709.97
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModLoader", "ModLoader\ModLoader.csproj", "{3BB62E16-1126-4ED9-AF39-64B88C642B14}"
7-
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModloaderTests", "ModloaderTests\ModloaderTests.csproj", "{D8E7EDBC-B900-4351-ACD6-050C52388C05}"
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModLoader", "ModLoader\ModLoader.csproj", "{A947DC7D-08BE-4D3A-8D81-D94DD376ECB8}"
97
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1210
Debug|Any CPU = Debug|Any CPU
1311
Release|Any CPU = Release|Any CPU
1412
EndGlobalSection
1513
GlobalSection(ProjectConfigurationPlatforms) = postSolution
16-
{3BB62E16-1126-4ED9-AF39-64B88C642B14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
17-
{3BB62E16-1126-4ED9-AF39-64B88C642B14}.Debug|Any CPU.Build.0 = Debug|Any CPU
18-
{3BB62E16-1126-4ED9-AF39-64B88C642B14}.Release|Any CPU.ActiveCfg = Release|Any CPU
19-
{3BB62E16-1126-4ED9-AF39-64B88C642B14}.Release|Any CPU.Build.0 = Release|Any CPU
20-
{D8E7EDBC-B900-4351-ACD6-050C52388C05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
21-
{D8E7EDBC-B900-4351-ACD6-050C52388C05}.Debug|Any CPU.Build.0 = Debug|Any CPU
22-
{D8E7EDBC-B900-4351-ACD6-050C52388C05}.Release|Any CPU.ActiveCfg = Release|Any CPU
23-
{D8E7EDBC-B900-4351-ACD6-050C52388C05}.Release|Any CPU.Build.0 = Release|Any CPU
14+
{A947DC7D-08BE-4D3A-8D81-D94DD376ECB8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{A947DC7D-08BE-4D3A-8D81-D94DD376ECB8}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{A947DC7D-08BE-4D3A-8D81-D94DD376ECB8}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{A947DC7D-08BE-4D3A-8D81-D94DD376ECB8}.Release|Any CPU.Build.0 = Release|Any CPU
2418
EndGlobalSection
2519
GlobalSection(SolutionProperties) = preSolution
2620
HideSolutionNode = FALSE
2721
EndGlobalSection
2822
GlobalSection(ExtensibilityGlobals) = postSolution
29-
SolutionGuid = {2C567E92-8BA9-4DC1-82A3-92CF35730008}
23+
SolutionGuid = {876EE832-26A6-41EC-A767-303DCF72610D}
3024
EndGlobalSection
3125
EndGlobal

‎ModLoader/ModLoader.csproj‎

Lines changed: 23 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\ILMerge.3.0.41\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" />
3+
<Import Project="..\packages\ILMerge.3.0.29\build\ILMerge.props" Condition="Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
8-
<ProjectGuid>{3BB62E16-1126-4ED9-AF39-64B88C642B14}</ProjectGuid>
8+
<ProjectGuid>{A947DC7D-08BE-4D3A-8D81-D94DD376ECB8}</ProjectGuid>
99
<OutputType>Library</OutputType>
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>ModLoader</RootNamespace>
1212
<AssemblyName>ModLoader</AssemblyName>
13-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<Deterministic>true</Deterministic>
1616
<NuGetPackageImportStamp>
@@ -34,6 +34,15 @@
3434
<WarningLevel>4</WarningLevel>
3535
</PropertyGroup>
3636
<ItemGroup>
37+
<Reference Include="0Harmony, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">
38+
<HintPath>..\packages\Lib.Harmony.2.2.0\lib\net45\0Harmony.dll</HintPath>
39+
</Reference>
40+
<Reference Include="Assembly-CSharp">
41+
<HintPath>..\Dependencies\Assembly-CSharp.dll</HintPath>
42+
</Reference>
43+
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44+
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
45+
</Reference>
3746
<Reference Include="System" />
3847
<Reference Include="System.Core" />
3948
<Reference Include="System.Xml.Linq" />
@@ -42,32 +51,22 @@
4251
<Reference Include="System.Data" />
4352
<Reference Include="System.Net.Http" />
4453
<Reference Include="System.Xml" />
45-
<Reference Include="Assembly-CSharp, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<SpecificVersion>False</SpecificVersion>
47-
<HintPath>..\Dependencies\Assembly-CSharp.dll</HintPath>
48-
</Reference>
49-
<Reference Include="UnityEngine, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
50-
<SpecificVersion>False</SpecificVersion>
54+
<Reference Include="UnityEngine">
5155
<HintPath>..\Dependencies\UnityEngine.dll</HintPath>
5256
</Reference>
53-
<Reference Include="UnityEngine.AssetBundleModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
54-
<SpecificVersion>False</SpecificVersion>
57+
<Reference Include="UnityEngine.AssetBundleModule">
5558
<HintPath>..\Dependencies\UnityEngine.AssetBundleModule.dll</HintPath>
5659
</Reference>
57-
<Reference Include="UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
58-
<SpecificVersion>False</SpecificVersion>
60+
<Reference Include="UnityEngine.CoreModule">
5961
<HintPath>..\Dependencies\UnityEngine.CoreModule.dll</HintPath>
6062
</Reference>
61-
<Reference Include="UnityEngine.IMGUIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
62-
<SpecificVersion>False</SpecificVersion>
63+
<Reference Include="UnityEngine.IMGUIModule">
6364
<HintPath>..\Dependencies\UnityEngine.IMGUIModule.dll</HintPath>
6465
</Reference>
65-
<Reference Include="UnityEngine.InputLegacyModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
66-
<SpecificVersion>False</SpecificVersion>
66+
<Reference Include="UnityEngine.InputLegacyModule">
6767
<HintPath>..\Dependencies\UnityEngine.InputLegacyModule.dll</HintPath>
6868
</Reference>
69-
<Reference Include="UnityEngine.InputModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
70-
<SpecificVersion>False</SpecificVersion>
69+
<Reference Include="UnityEngine.InputModule">
7170
<HintPath>..\Dependencies\UnityEngine.InputModule.dll</HintPath>
7271
</Reference>
7372
<Reference Include="UnityEngine.TextCoreModule">
@@ -76,21 +75,19 @@
7675
<Reference Include="UnityEngine.TextRenderingModule">
7776
<HintPath>..\Dependencies\UnityEngine.TextRenderingModule.dll</HintPath>
7877
</Reference>
79-
<Reference Include="UnityEngine.UI, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
80-
<SpecificVersion>False</SpecificVersion>
78+
<Reference Include="UnityEngine.UI">
8179
<HintPath>..\Dependencies\UnityEngine.UI.dll</HintPath>
8280
</Reference>
83-
<Reference Include="UnityEngine.UIModule, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
84-
<SpecificVersion>False</SpecificVersion>
81+
<Reference Include="UnityEngine.UIModule">
8582
<HintPath>..\Dependencies\UnityEngine.UIModule.dll</HintPath>
8683
</Reference>
8784
</ItemGroup>
8885
<ItemGroup>
86+
<Compile Include="Console.cs" />
8987
<Compile Include="ConsoleGUI.cs" />
90-
<Compile Include="ModsMenu.cs" />
9188
<Compile Include="Helper.cs" />
9289
<Compile Include="Loader.cs" />
93-
<Compile Include="Console.cs" />
90+
<Compile Include="ModsMenu.cs" />
9491
<Compile Include="Patcher.cs" />
9592
<Compile Include="Properties\AssemblyInfo.cs" />
9693
<Compile Include="SFSMod.cs" />
@@ -103,14 +100,8 @@
103100
<PropertyGroup>
104101
<ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
105102
</PropertyGroup>
106-
<Error Condition="!Exists('..\packages\ILMerge.3.0.41\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.41\build\ILMerge.props'))" />
103+
<Error Condition="!Exists('..\packages\ILMerge.3.0.29\build\ILMerge.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ILMerge.3.0.29\build\ILMerge.props'))" />
107104
</Target>
108-
<ItemGroup>
109-
<PackageReference Include="ILMerge" Version="3.0.29" />
110-
<PackageReference Include="Lib.Harmony">
111-
<Version>2.2.0</Version>
112-
</PackageReference>
113-
</ItemGroup>
114105
<Target Name="AfterBuild">
115106
<!-- the ILMergePath property points to the location of ILMerge.exe console application -->
116107
<Exec Command="$(ILMergeConsolePath) /out:bin/Release/ModLoaderMac.dll bin/Release/0Harmony.dll bin/Release/ModLoader.dll" />

‎ModLoader/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
[assembly: ComVisible(false)]
2121

2222
// El siguiente GUID sirve como id. de typelib si este proyecto se expone a COM.
23-
[assembly: Guid("3bb62e16-1126-4ed9-af39-64b88c642b14")]
23+
[assembly: Guid("a947dc7d-08be-4d3a-8d81-d94dd376ecb8")]
2424

2525
// La información de versión de un ensamblado consta de los cuatro valores siguientes:
2626
//

‎ModLoader/packages.config‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="ILMerge" version="3.0.41" targetFramework="net45" />
3+
<package id="ILMerge" version="3.0.29" targetFramework="net45" />
44
<package id="Lib.Harmony" version="2.2.0" targetFramework="net45" />
5+
<package id="Newtonsoft.Json" version="13.0.1" targetFramework="net45" />
56
</packages>

‎ModloaderTests/LoaderTests.cs‎

Lines changed: 0 additions & 24 deletions
This file was deleted.

‎ModloaderTests/ModloaderTests.csproj‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)