Merge branch 'main' into rework

# Conflicts:
#	Glamourer.GameData/Customization/CustomizationOptions.cs
#	Glamourer.GameData/Util/IconStorage.cs
#	Glamourer/Api/PenumbraAttach.cs
#	Glamourer/CharacterSave.cs
#	Glamourer/Designs/DesignManager.cs
#	Glamourer/Designs/FixedDesigns.cs
#	Glamourer/Glamourer.csproj
#	Glamourer/Gui/Interface.cs
#	Glamourer/Gui/InterfaceDesigns.cs
#	Glamourer/Gui/InterfaceEquipment.cs
#	Glamourer/Offsets.cs
#	Penumbra.PlayerWatch/Penumbra.PlayerWatch.csproj
This commit is contained in:
Ottermandias 2023-01-12 14:57:17 +01:00
commit b2cede67b8
7 changed files with 39 additions and 22 deletions

View file

@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0-windows</TargetFramework>
<TargetFramework>net7.0-windows</TargetFramework>
<LangVersion>preview</LangVersion>
<PlatformTarget>x64</PlatformTarget>
<RootNamespace>Glamourer</RootNamespace>
@ -119,7 +119,7 @@
</None>
</ItemGroup>
<Target Name="PostBuild" AfterTargets="PostBuildEvent">
<Exec Command="if $(Configuration) == Release powershell Compress-Archive -Force $(TargetPath), $(TargetDir)$(SolutionName).json, $(TargetDir)$(SolutionName).GameData.dll, $(TargetDir)Penumbra.GameData.dll, $(TargetDir)Penumbra.Api.dll $(SolutionDir)$(SolutionName).zip" />
<Exec Command="if $(Configuration) == Release powershell Compress-Archive -Force $(TargetPath), $(TargetDir)$(SolutionName).json, $(TargetDir)$(SolutionName).GameData.dll, $(TargetDir)Penumbra.GameData.dll, $(TargetDir)Penumbra.Api.dll, $(TargetDir)Penumbra.String.dll $(SolutionDir)$(SolutionName).zip" />
<Exec Command="if $(Configuration) == Release powershell Copy-Item -Force $(TargetDir)$(SolutionName).json -Destination $(SolutionDir)" />
</Target>
</Project>