Skip to content

Commit

Permalink
Fixed Ref Package (#594)
Browse files Browse the repository at this point in the history
* Fixed Ref packages not being referenced correctly
* Exclude other projects from ReleaseRef
* Added ReleaseRef archives
  • Loading branch information
Aragas committed Mar 3, 2024
1 parent aa94c99 commit 39d924d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 4 deletions.
3 changes: 0 additions & 3 deletions Harmony.sln
Expand Up @@ -122,7 +122,6 @@ Global
{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseFat|Any CPU.ActiveCfg = Release|Any CPU
{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseFat|Any CPU.Build.0 = Release|Any CPU
{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseRef|Any CPU.ActiveCfg = Release|Any CPU
{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseRef|Any CPU.Build.0 = Release|Any CPU
{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseThin|Any CPU.ActiveCfg = Release|Any CPU
{DEE74EFC-29A8-4704-8536-7DA38D3999F7}.ReleaseThin|Any CPU.Build.0 = Release|Any CPU
{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.DebugFat|Any CPU.ActiveCfg = Default|Any CPU
Expand All @@ -132,7 +131,6 @@ Global
{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseFat|Any CPU.ActiveCfg = Default|Any CPU
{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseFat|Any CPU.Build.0 = Default|Any CPU
{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseRef|Any CPU.ActiveCfg = Default|Any CPU
{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseRef|Any CPU.Build.0 = Default|Any CPU
{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseThin|Any CPU.ActiveCfg = Default|Any CPU
{9B9DD18C-6EB7-497F-8ED5-699515A840C5}.ReleaseThin|Any CPU.Build.0 = Default|Any CPU
{11F828EC-7C50-48F4-A30D-9BED06837F3A}.DebugFat|Any CPU.ActiveCfg = Debug|Any CPU
Expand All @@ -142,7 +140,6 @@ Global
{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseFat|Any CPU.ActiveCfg = Release|Any CPU
{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseFat|Any CPU.Build.0 = Release|Any CPU
{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseRef|Any CPU.ActiveCfg = Release|Any CPU
{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseRef|Any CPU.Build.0 = Release|Any CPU
{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseThin|Any CPU.ActiveCfg = Release|Any CPU
{11F828EC-7C50-48F4-A30D-9BED06837F3A}.ReleaseThin|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
Expand Down
10 changes: 9 additions & 1 deletion Harmony/Harmony.csproj
Expand Up @@ -98,8 +98,14 @@
<PackageReference Include="System.Reflection.Emit" Version="4.7.0" PrivateAssets="all" IncludeAssets="compile" />
</ItemGroup>
<ItemGroup Condition="$(Configuration)!='ReleaseRef' And $(TargetFramework)=='netstandard2.0'">
<PackageReference Include="Lib.Harmony.Ref" Version="$(HarmonyVersion)" IncludeAssets="contentFiles" />
<PackageReference Include="Lib.Harmony.Ref" Version="$(HarmonyVersion)" GeneratePath="true" />
</ItemGroup>
<Target Name="CustomBeforeBuild" AfterTargets="ResolvePackageDependenciesForBuild" Condition="$(Configuration)!='ReleaseRef'">
<ItemGroup>
<ReferenceToBeRemoved Include="@(Reference)" Condition="'%(Reference.PathInPackage)' == 'ref/netstandard2.0/0Harmony.dll'" />
<Reference Remove="@(ReferenceToBeRemoved)" />
</ItemGroup>
</Target>
<!-- netstandard2.0 reference assemblies -->

<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
Expand Down Expand Up @@ -140,6 +146,7 @@

<Target Name="CleanZip" AfterTargets="Clean">
<ItemGroup>
<OldZipFiles Include="$(MSBuildThisFileDirectory)bin\Harmony-Ref.*.zip" Condition="'$(Configuration)'=='ReleaseRef'"/>
<OldZipFiles Include="$(MSBuildThisFileDirectory)bin\Harmony-Thin.*.zip" Condition="'$(Configuration)'=='ReleaseThin'"/>
<OldZipFiles Include="$(MSBuildThisFileDirectory)bin\Harmony-Fat.*.zip" Condition="'$(Configuration)'=='ReleaseFat'"/>
</ItemGroup>
Expand All @@ -156,6 +163,7 @@
</Target>

<Target Name="Zip" AfterTargets="RemoveExtraDlls" DependsOnTargets="CleanZip">
<ZipDirectory SourceDirectory="$(MSBuildThisFileDirectory)bin\$(Configuration)" DestinationFile="$(MSBuildThisFileDirectory)bin\Harmony-Ref.$(Version).zip" Overwrite="true" Condition="'$(Configuration)'=='ReleaseRef'"/>
<ZipDirectory SourceDirectory="$(MSBuildThisFileDirectory)bin\$(Configuration)" DestinationFile="$(MSBuildThisFileDirectory)bin\Harmony-Thin.$(Version).zip" Overwrite="true" Condition="'$(Configuration)'=='ReleaseThin'"/>
<ZipDirectory SourceDirectory="$(MSBuildThisFileDirectory)bin\$(Configuration)" DestinationFile="$(MSBuildThisFileDirectory)bin\Harmony-Fat.$(Version).zip" Overwrite="true" Condition="'$(Configuration)'=='ReleaseFat'"/>
</Target>
Expand Down

0 comments on commit 39d924d

Please sign in to comment.