Skip to content

Commit 111ba67

Browse files
committed
Fix Unity project CI
1 parent a2cb6ca commit 111ba67

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

Source/CustomAvatar-Editor/CustomAvatar-Editor.csproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,4 +81,12 @@
8181
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
8282
</PackageReference>
8383
</ItemGroup>
84+
<!-- Copy the assembly and PDB to the Unity Project's folder -->
85+
<Target Name="CopyToUnityProject" AfterTargets="CopyToArtifact" Condition="'$(UnityProjectDir)' != ''">
86+
<Message Text="$(MSBuildProjectName) -&gt; $(UnityProjectDir)" Importance="high" />
87+
<ItemGroup>
88+
<FilesToCopy Include="$(ArtifactDir)\**\*" />
89+
</ItemGroup>
90+
<Copy SourceFiles="@(FilesToCopy)" DestinationFiles="@(FilesToCopy->'$(UnityProjectDir)\Assets\Libraries\%(RecursiveDir)%(Filename)%(Extension)')" Condition="!Exists('$(UnityProjectDir)\Assets\Libraries\%(RecursiveDir)%(Filename)%(Extension)') OR '%(Extension)' != '.meta'" />
91+
</Target>
8492
</Project>

Source/CustomAvatar-Editor/Directory.Build.targets

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<Version Condition="$(BuildMetadata) != ''">$(Version)+$(BuildMetadata)</Version>
1717

1818
<ArtifactDir>$(TargetDir)Artifact\</ArtifactDir>
19-
<ArtifactTargetDir>$(ArtifactDir)Plugins\</ArtifactTargetDir>
20-
<ArtifactTargetDir Condition="'$(BeatSaberOutputType)' == 'Library'">$(ArtifactDir)Libs\</ArtifactTargetDir>
2119
</PropertyGroup>
2220

2321
<!-- If we're building for a tag in CI, make sure it matches the version defined here -->
@@ -50,25 +48,14 @@
5048
<Message Text="$(MSBuildProjectName) -&gt; $(ArtifactDir)" Importance="high" />
5149

5250
<MakeDir Directories="$(ArtifactDir)" />
53-
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(ArtifactTargetDir)" />
54-
<Copy SourceFiles="$(TargetDir)$(TargetName).pdb" DestinationFolder="$(ArtifactTargetDir)" Condition="Exists('$(TargetDir)$(TargetName).pdb')" />
55-
<Copy SourceFiles="$(TargetDir)$(TargetName).xml" DestinationFolder="$(ArtifactTargetDir)" Condition="Exists('$(TargetDir)$(TargetName).xml') AND '$(CopyDocumentationFileToArtifact)' == 'True'" />
51+
<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(ArtifactDir)" />
52+
<Copy SourceFiles="$(TargetDir)$(TargetName).pdb" DestinationFolder="$(ArtifactDir)" Condition="Exists('$(TargetDir)$(TargetName).pdb')" />
53+
<Copy SourceFiles="$(TargetDir)$(TargetName).xml" DestinationFolder="$(ArtifactDir)" Condition="Exists('$(TargetDir)$(TargetName).xml') AND '$(CopyDocumentationFileToArtifact)' == 'True'" />
5654
<Copy SourceFiles="$(TargetDir)$(TargetName).manifest" DestinationFolder="$(ArtifactDir)Plugins" Condition="Exists('$(TargetDir)$(TargetName).manifest')" />
5755

5856
<Copy SourceFiles="@(AdditionalArtifactFiles)" DestinationFolder="$(ArtifactDir)%(AdditionalArtifactFiles.TargetDir)\%(AdditionalArtifactFiles.RecursiveDir)" />
5957
</Target>
6058

61-
<!-- Copy the assembly and PDB to the Beat Saber folder -->
62-
<Target Name="CopyToPlugins" AfterTargets="CopyToArtifact" Condition="'$(BeatSaberDir)' != '' AND '$(CI)' == '' AND '$(NCrunch)' != '1'">
63-
<Message Text="$(MSBuildProjectName) -&gt; $(BeatSaberDir)" Importance="high" />
64-
65-
<ItemGroup>
66-
<FilesToCopy Include="$(ArtifactDir)\**\*" />
67-
</ItemGroup>
68-
69-
<Copy SourceFiles="@(FilesToCopy)" DestinationFolder="$(BeatSaberDir)%(RecursiveDir)" />
70-
</Target>
71-
7259
<!-- Set GitHub Actions output variables -->
7360
<Target Name="SetGitHubActionsOutput" AfterTargets="CopyToArtifact" Condition="'$(GITHUB_ACTIONS)' == 'true'">
7461
<Message Text="Writing to GitHub output" Importance="high" />

0 commit comments

Comments
 (0)