Skip to content

Commit

Permalink
chore: removed Harmony from Nuget dependencies and fixed packages
Browse files Browse the repository at this point in the history
  • Loading branch information
@MSchmoecker
MSchmoecker committed May 5, 2024
1 parent a59b7b0 commit a608304
Show file tree
Hide file tree
Showing 10 changed files with 6 additions and 84 deletions.
6 changes: 3 additions & 3 deletions JotunnBuildTask/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.11.3.0" newVersion="0.11.3.0" />
<bindingRedirect oldVersion="0.0.0.0-0.11.5.0" newVersion="0.11.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil.Mdb" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.11.3.0" newVersion="0.11.3.0" />
<bindingRedirect oldVersion="0.0.0.0-0.11.5.0" newVersion="0.11.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil.Pdb" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.11.3.0" newVersion="0.11.3.0" />
<bindingRedirect oldVersion="0.0.0.0-0.11.5.0" newVersion="0.11.5.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
21 changes: 0 additions & 21 deletions JotunnDoc/JotunnDoc.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,6 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Mdb, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Pdb, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Rocks, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="MonoMod.RuntimeDetour, Version=22.1.29.1, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MonoMod.RuntimeDetour.22.1.29.1\lib\net452\MonoMod.RuntimeDetour.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MonoMod.Utils, Version=22.1.29.1, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MonoMod.Utils.22.1.29.1\lib\net452\MonoMod.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand Down Expand Up @@ -89,7 +69,6 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\JotunnLib\JotunnLib.csproj">
Expand Down
6 changes: 0 additions & 6 deletions JotunnDoc/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.11.5.0" newVersion="0.11.5.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
7 changes: 0 additions & 7 deletions JotunnDoc/packages.config
View file

This file was deleted.

8 changes: 2 additions & 6 deletions JotunnLib/JotunnLib.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@
<None Remove="Unity\AssetBundles\minimapmanager" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="HarmonyX" Version="2.9.0" />
<PackageReference Include="NuGet.Build.Tasks.Pack" Version="5.10.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
Expand Down Expand Up @@ -110,20 +109,17 @@
<OutputPath>bin\Release\</OutputPath>
<DocumentationFile>bin\Release\$(TargetFramework)\Jotunn.xml</DocumentationFile>
</PropertyGroup>

<ItemGroup>
<Content Include="$(SolutionDir)JotunnBuildTask\bin\$(ConfigurationName)\net462\JotunnBuildTask.dll" Pack="true" PackagePath="build" />
<Content Include="$(SolutionDir)JotunnBuildTask\bin\$(ConfigurationName)\net462\Mono.Cecil.dll" Pack="true" PackagePath="build" />
<Content Include="$(SolutionDir)JotunnBuildTask\bin\$(ConfigurationName)\net462\Mono.Cecil.Mdb.dll" Pack="true" PackagePath="build" />
<Content Include="$(SolutionDir)JotunnBuildTask\bin\$(ConfigurationName)\net462\Mono.Cecil.Pdb.dll" Pack="true" PackagePath="build" />
<Content Include="$(SolutionDir)JotunnBuildTask\bin\$(ConfigurationName)\net462\Mono.Cecil.Rocks.dll" Pack="true" PackagePath="build" />
<Content Include="$(SolutionDir)JotunnLib\BuildProps\JotunnLib.props" Pack="true" PackagePath="build" />
<Content Include="$(SolutionDir)JotunnLib\BuildProps\JotunnLibRefsCorlib.props" Pack="true" PackagePath="build" />
<Content Include="$(SolutionDir)JotunnLib\BuildProps\Paths.props" Pack="true" PackagePath="build" />
<Content Include="$(TargetDir)Jotunn.pdb" Pack="true" PackagePath="lib/$(TargetFramework)" />
<Content Include="$(SolutionDir)resources\JVL_Logo_128x128.png" Pack="true" PackagePath="images" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Unity\AssetBundles\colorpicker" />
<EmbeddedResource Include="Unity\AssetBundles\jotunn" />
Expand Down
6 changes: 0 additions & 6 deletions JotunnLib/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.11.3.0" newVersion="0.11.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
2 changes: 1 addition & 1 deletion JotunnTests/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.11.4.0" newVersion="0.11.4.0" />
<bindingRedirect oldVersion="0.0.0.0-0.11.5.0" newVersion="0.11.5.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
Expand Down
21 changes: 0 additions & 21 deletions TestMod/TestMod.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,26 +38,6 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Mdb, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Mdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Pdb, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Pdb.dll</HintPath>
</Reference>
<Reference Include="Mono.Cecil.Rocks, Version=0.11.5.0, Culture=neutral, PublicKeyToken=50cebf1cceb9d05e, processorArchitecture=MSIL">
<HintPath>..\packages\Mono.Cecil.0.11.5\lib\net40\Mono.Cecil.Rocks.dll</HintPath>
</Reference>
<Reference Include="MonoMod.RuntimeDetour, Version=22.1.29.1, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MonoMod.RuntimeDetour.22.1.29.1\lib\net452\MonoMod.RuntimeDetour.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MonoMod.Utils, Version=22.1.29.1, Culture=neutral, PublicKeyToken=null">
<HintPath>..\packages\MonoMod.Utils.22.1.29.1\lib\net452\MonoMod.Utils.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
Expand Down Expand Up @@ -102,7 +82,6 @@
<None Include="Assets\testblueprints" />
<None Include="Assets\Translations\English\backpack.english.json" />
<None Include="Assets\Translations\English\translations.json" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="AssetsEmbedded\pieces" />
Expand Down
6 changes: 0 additions & 6 deletions TestMod/app.config
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Mono.Cecil" publicKeyToken="50cebf1cceb9d05e" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-0.11.5.0" newVersion="0.11.5.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>
7 changes: 0 additions & 7 deletions TestMod/packages.config
View file

This file was deleted.

0 comments on commit a608304

Please sign in to comment.