Skip to content

Commit

Permalink
Include System.Runtime.Serialization in merge
Browse files Browse the repository at this point in the history
In some versions of Unity games, `System.Runtime.Serialization` is omitted from the distribution. Since our version of Newtonsoft.Json requires this, it will now be merged into the output assembly of the Patcher.
  • Loading branch information
toebeann committed Apr 3, 2023
1 parent 0eb22a7 commit 3dfd18b
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 23 deletions.
2 changes: 0 additions & 2 deletions Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>

<Target Name="ZipBuild" AfterTargets="AfterBuild">
<Copy SourceFiles="$(TargetPath)" DestinationFolder="..\bin\zip\BepInEx\patchers\Tobey\UnityAudio\" />
<ZipDirectory SourceDirectory="..\bin\zip\" DestinationFile="..\bin\$(RootNamespace).zip" Overwrite="true" />
</Target>

<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
4 changes: 2 additions & 2 deletions Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]

[assembly: InternalsVisibleTo("Tobey.UnityAudio.Patcher")]
[assembly: InternalsVisibleTo("Tobey.UnityAudio.Plugin")]
18 changes: 2 additions & 16 deletions Patcher/Patcher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -35,30 +35,16 @@
<WarningLevel>4</WarningLevel>
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>

<Target Name="ZipBuild" AfterTargets="ILRepack">
<Copy SourceFiles="$(TargetPath)" DestinationFolder="..\bin\zip\BepInEx\patchers\Tobey\UnityAudio\" />
<ZipDirectory SourceDirectory="..\bin\zip\" DestinationFile="..\bin\$(RootNamespace).zip" Overwrite="true" />
</Target>

<ItemGroup>
<Reference Include="System">
<Private>False</Private>
</Reference>
<Reference Include="System.Core">
<Private>False</Private>
</Reference>
<Reference Include="System.Xml.Linq">
<Private>False</Private>
</Reference>
<Reference Include="System.Data.DataSetExtensions">
<Private>False</Private>
</Reference>
<Reference Include="System.Data">
<Private>False</Private>
</Reference>
<Reference Include="System.Xml">
<Private>False</Private>
<Reference Include="System.Runtime.Serialization">
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Patcher/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.1.0")]
[assembly: AssemblyFileVersion("1.0.1.0")]
2 changes: 1 addition & 1 deletion Plugin/Plugin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net35</TargetFramework>
<AssemblyName>Tobey.UnityAudio.Plugin</AssemblyName>
<Description>Attempts to play a sound at the camera once the game has loaded</Description>
<Version>1.0.0</Version>
<Version>1.0.1</Version>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<LangVersion>latest</LangVersion>
<Product>Unity Audio Patcher</Product>
Expand Down

0 comments on commit 3dfd18b

Please sign in to comment.