Skip to content

Commit

Permalink
update installer to output with version in name
Browse files Browse the repository at this point in the history
fix plex data folder for log watcher when not in default location
  • Loading branch information
cjmurph committed Jun 12, 2022
1 parent a8abf5f commit 781356f
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 4 deletions.
2 changes: 0 additions & 2 deletions PlexMediaServerService.sln
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,12 @@ Global
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Debug|Any CPU.ActiveCfg = Debug|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Debug|Any CPU.Build.0 = Debug|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Debug|Mixed Platforms.Build.0 = Debug|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Debug|x86.ActiveCfg = Debug|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Debug|x86.Build.0 = Debug|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Release|Any CPU.ActiveCfg = Release|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Release|Any CPU.Build.0 = Release|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Release|Any CPU.Deploy.0 = Release|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Release|Mixed Platforms.ActiveCfg = Release|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Release|Mixed Platforms.Build.0 = Release|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Release|x86.ActiveCfg = Release|x86
{5CACEAFA-5C9F-4A66-8FB9-DD35FB95B5CD}.Release|x86.Build.0 = Release|x86
{BC4E3797-D804-4EE1-B8B5-D4D4ED4CEE59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion PlexServiceCommon/PlexDirHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static string GetPlexDataDir()
return result;
}

path = (string) pmsDataKey.GetValue("LocalAppdataPath");
path = Path.Combine((string) pmsDataKey.GetValue("LocalAppdataPath"), "Plex Media Server");
result = path;

return result;
Expand Down
20 changes: 19 additions & 1 deletion PlexServiceInstaller/PlexServiceInstaller.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProductVersion>3.9</ProductVersion>
<ProjectGuid>5caceafa-5c9f-4a66-8fb9-dd35fb95b5cd</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>PlexServiceInstaller</OutputName>
<OutputName>PlexService</OutputName>
<OutputType>Package</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
Expand Down Expand Up @@ -87,6 +87,24 @@
<Content Include="WixCommonUiExtension.dll" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" />
<Target Name="BeforeBuild">
<GetAssemblyIdentity AssemblyFiles="$(SolutionDir)PlexService\bin\$(Configuration)\PlexService.exe">
<Output TaskParameter="Assemblies" ItemName="AssemblyVersions" />
</GetAssemblyIdentity>
<CreateProperty Value="$(OutputName)_%(AssemblyVersions.Version)">
<Output TaskParameter="Value" PropertyName="TargetName" />
</CreateProperty>
<CreateProperty Value="$(TargetName)$(TargetExt)">
<Output TaskParameter="Value" PropertyName="TargetFileName" />
</CreateProperty>
<CreateProperty Value="$(TargetDir)\$(TargetFileName)">
<Output TaskParameter="Value" PropertyName="TargetPath" />
</CreateProperty>
</Target>
<PropertyGroup>
<PostBuildEvent>if not exist "$(ProjectDir)msi" mkdir "$(ProjectDir)msi"
copy "!(TargetPath)" "$(ProjectDir)msi" /Y /V</PostBuildEvent>
</PropertyGroup>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Wix.targets.
Expand Down
Binary file added PlexServiceInstaller/msi/PlexService_1.2.0.0.msi
Binary file not shown.

0 comments on commit 781356f

Please sign in to comment.