vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Migrate asm publicization to msbuild (#132)

Browse Source 
* Make publish-release workflow fail on missing build artifacts
* Remove assembly publicization step from CI
* Add AssemblyPublicizer MSBuild task
* Add explanation for SatelliteResourceLanguages prop
* Move and document workaround for duplicate-file-on-publish OSX issue
* Move the Luatrauma.props import to the bottom of project files, this should give us a chance to override properties/items defined in the project file.
This commit is contained in:
peelz
2023-05-25 15:31:46 -04:00
committed by GitHub
parent f32da0bff7
commit a5baf9cfba
8 changed files with 53 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Barotrauma/BarotraumaClient/LinuxClient.csproj
+5 -5
View File
@@ -1,10 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\BarotraumaShared\Luatrauma.props" />
<ItemGroup>
<None Include="..\BarotraumaShared\Luatrauma.props" />
</ItemGroup>
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
@@ -209,4 +204,9 @@
</PropertyGroup>
<Import Project="../BarotraumaShared/DeployGameAnalytics.props" />
<Import Project="../BarotraumaShared/Luatrauma.props" />
<ItemGroup>
<None Include="../BarotraumaShared/Luatrauma.props" />
</ItemGroup>
</Project>
Barotrauma/BarotraumaClient/MacClient.csproj
+5 -6
View File
@@ -1,10 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\BarotraumaShared\Luatrauma.props" />
<ItemGroup>
<None Include="..\BarotraumaShared\Luatrauma.props" />
</ItemGroup>
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
@@ -19,7 +14,6 @@
<Configurations>Debug;Release;Unstable</Configurations>
<InvariantGlobalization>true</InvariantGlobalization>
<WarningsAsErrors>;NU1605;CS0114;CS0108;CS8597;CS8600;CS8601;CS8602;CS8603;CS8604;CS8605;CS8606;CS8607;CS8608;CS8609;CS8610;CS8611;CS8612;CS8613;CS8614;CS8615;CS8616;CS8617;CS8618;CS8619;CS8620;CS8621;CS8622;CS8624;CS8625;CS8626;CS8629;CS8631;CS8632;CS8633;CS8634;CS8638;CS8643;CS8644;CS8645;CS8653;CS8654;CS8655;CS8667;CS8669;CS8670;CS8714;CS8717;CS8765</WarningsAsErrors>
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -220,4 +214,9 @@
</PropertyGroup>
<Import Project="../BarotraumaShared/DeployGameAnalytics.props" />
<Import Project="../BarotraumaShared/Luatrauma.props" />
<ItemGroup>
<None Include="../BarotraumaShared/Luatrauma.props" />
</ItemGroup>
</Project>
Barotrauma/BarotraumaClient/WindowsClient.csproj
+6 -6
View File
@@ -1,10 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\BarotraumaShared\Luatrauma.props" />
<ItemGroup>
<None Include="..\BarotraumaShared\Luatrauma.props" />
</ItemGroup>
<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0</TargetFramework>
@@ -241,4 +236,9 @@
</PropertyGroup>
<Import Project="../BarotraumaShared/DeployGameAnalytics.props" />
</Project>
<Import Project="../BarotraumaShared/Luatrauma.props" />
<ItemGroup>
<None Include="../BarotraumaShared/Luatrauma.props" />
</ItemGroup>
</Project>
Barotrauma/BarotraumaServer/LinuxServer.csproj
+5 -5
View File
@@ -1,10 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\BarotraumaShared\Luatrauma.props" />
<ItemGroup>
<None Include="..\BarotraumaShared\Luatrauma.props" />
</ItemGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
@@ -149,4 +144,9 @@
<WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
</Target>
<Import Project="../BarotraumaShared/Luatrauma.props" />
<ItemGroup>
<None Include="../BarotraumaShared/Luatrauma.props" />
</ItemGroup>
</Project>
Barotrauma/BarotraumaServer/MacServer.csproj
+5 -5
View File
@@ -1,10 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\BarotraumaShared\Luatrauma.props" />
<ItemGroup>
<None Include="..\BarotraumaShared\Luatrauma.props" />
</ItemGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
@@ -161,4 +156,9 @@
<WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
</Target>
<Import Project="../BarotraumaShared/Luatrauma.props" />
<ItemGroup>
<None Include="../BarotraumaShared/Luatrauma.props" />
</ItemGroup>
</Project>
Barotrauma/BarotraumaServer/WindowsServer.csproj
+5 -5
View File
@@ -1,10 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\BarotraumaShared\Luatrauma.props" />
<ItemGroup>
<None Include="..\BarotraumaShared\Luatrauma.props" />
</ItemGroup>
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
@@ -156,4 +151,9 @@
<WriteCodeFragment Language="C#" OutputFile="$(CustomAssemblyInfoFile)" AssemblyAttributes="@(AssemblyAttributes)" />
</Target>
<Import Project="../BarotraumaShared/Luatrauma.props" />
<ItemGroup>
<None Include="../BarotraumaShared/Luatrauma.props" />
</ItemGroup>
</Project>
Barotrauma/BarotraumaShared/Luatrauma.props
+16 -1
View File
@@ -1,5 +1,6 @@
<Project>
<ItemGroup>
<PackageReference Include="Luatrauma.Internal.AssemblyPublicizer.MSBuild" Version="0.1.4" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.1.0" />
<PackageReference Include="Lib.Harmony" Version="2.2.2" />
<PackageReference Include="Sigil" Version="5.0.0" />
@@ -7,7 +8,21 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)..\..\Libraries\moonsharp\MoonSharp.VsCodeDebugger\MoonSharp.VsCodeDebugger.csproj" />
</ItemGroup>
<!--
The `Microsoft.CodeAnalysis.CSharp.Scripting` package includes satellites
assemblies, which end up polluting the build folder.
This suppresses the extra satellite assemblies.
-->
<PropertyGroup>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>
</PropertyGroup>
<!--
Upstream ships vendored OpenAL and SDL2 dylibs, which clobber the ones
defined in Libraries/MonoGame.Framework/DesktopGL/MonoGame.Framework.dll.config
This lets us work around the (otherwise fatal) error.
-->
<PropertyGroup Condition="'$(MSBuildProjectName)' == 'MacClient'">
<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
</PropertyGroup>
</Project>