Skip to content

Commit

Permalink
Reorganisation of projects to prepare for NuGet publishing
Browse files Browse the repository at this point in the history
  • Loading branch information
Brhsoftco committed Oct 7, 2024
1 parent aeea508 commit 4ff755f
Show file tree
Hide file tree
Showing 17 changed files with 189 additions and 43 deletions.
16 changes: 16 additions & 0 deletions PlexDL.Common.Enums/PlexDL.Common.Enums.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>$id$</id>
<version>1.7.3</version>
<title>PlexDL.Common.Enums</title>
<authors>BRH Media</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<projectUrl>https://github.com/BRH-Media/PlexDL</projectUrl>
<description>Contains enumerables required for PlexDL dependencies</description>
<releaseNotes>Initial release</releaseNotes>
<copyright>Copyright (c) BRH Media (Baeleigh Harris) 2024</copyright>
<tags>PlexDL enums package</tags>
</metadata>
</package>
2 changes: 1 addition & 1 deletion PlexDL.Common.Enums/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PlexDL.Common.Enums")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("Contains enumerables required for PlexDL dependencies")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("BRH Media")]
[assembly: AssemblyProduct("PlexDL.Common.Enums")]
Expand Down
78 changes: 78 additions & 0 deletions PlexDL.Common.Pxz.Explorer/PlexDL.Common.Pxz.Explorer.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PlexDL.Common.Pxz.Explorer</RootNamespace>
<AssemblyName>PlexDL.Common.Pxz.Explorer</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="UI\PxzExplorer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\PxzExplorer.Designer.cs">
<DependentUpon>PxzExplorer.cs</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PlexDL.Common.Components\PlexDL.Common.Components.csproj">
<Project>{3c18fc31-d361-42fb-ae18-42faacd4e419}</Project>
<Name>PlexDL.Common.Components</Name>
</ProjectReference>
<ProjectReference Include="..\PlexDL.Common.Enums\PlexDL.Common.Enums.csproj">
<Project>{2c0b4243-5d9e-454a-9a7b-dcac2787b13e}</Project>
<Name>PlexDL.Common.Enums</Name>
</ProjectReference>
<ProjectReference Include="..\PlexDL.Common.Pxz\PlexDL.Common.Pxz.csproj">
<Project>{1764ca80-f851-4e2c-acc8-37696d499d3b}</Project>
<Name>PlexDL.Common.Pxz</Name>
</ProjectReference>
<ProjectReference Include="..\PlexDL.WaitWindow\PlexDL.WaitWindow.csproj">
<Project>{6d5d6fdd-9371-4ebb-8875-eebe170a47cd}</Project>
<Name>PlexDL.WaitWindow</Name>
</ProjectReference>
<ProjectReference Include="..\UIHelpers\UIHelpers.csproj">
<Project>{e3ce262b-b962-44ff-abc0-5ebfb403d51d}</Project>
<Name>UIHelpers</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="UI\PxzExplorer.resx">
<DependentUpon>PxzExplorer.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
36 changes: 36 additions & 0 deletions PlexDL.Common.Pxz.Explorer/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PlexDL.Common.Pxz.Explorer")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("PlexDL.Common.Pxz.Explorer")]
[assembly: AssemblyCopyright("Copyright © 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("0a32fb9a-6aa2-4b4a-bd51-3ab9f2706232")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
File renamed without changes.
File renamed without changes.
26 changes: 1 addition & 25 deletions PlexDL.Common.Pxz/PlexDL.Common.Pxz.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,8 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Data" />
<Reference Include="System.DirectoryServices.AccountManagement" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="System.Xml.Linq" />
</ItemGroup>
Expand All @@ -51,12 +49,6 @@
<Compile Include="Enums\PxzRecordType.cs" />
<Compile Include="Extensions\VerifyChecksumExt.cs" />
<Compile Include="Extensions\ToXmlExt.cs" />
<Compile Include="UI\PxzExplorer.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="UI\PxzExplorer.Designer.cs">
<DependentUpon>PxzExplorer.cs</DependentUpon>
</Compile>
<Compile Include="Serializers.cs" />
<Compile Include="Structures\PxzAuthor.cs" />
<Compile Include="Structures\File\Record\PxzRecordChecksum.cs" />
Expand All @@ -71,10 +63,6 @@
<Compile Include="Utilities.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PlexDL.Common.Components\PlexDL.Common.Components.csproj">
<Project>{3c18fc31-d361-42fb-ae18-42faacd4e419}</Project>
<Name>PlexDL.Common.Components</Name>
</ProjectReference>
<ProjectReference Include="..\PlexDL.Common.Enums\PlexDL.Common.Enums.csproj">
<Project>{2c0b4243-5d9e-454a-9a7b-dcac2787b13e}</Project>
<Name>PlexDL.Common.Enums</Name>
Expand All @@ -83,22 +71,10 @@
<Project>{aba08e30-bcbb-4eb8-a187-8c8b7037bc48}</Project>
<Name>PlexDL.Common.Security</Name>
</ProjectReference>
<ProjectReference Include="..\PlexDL.WaitWindow\PlexDL.WaitWindow.csproj">
<Project>{6d5d6fdd-9371-4ebb-8875-eebe170a47cd}</Project>
<Name>PlexDL.WaitWindow</Name>
</ProjectReference>
<ProjectReference Include="..\UIHelpers\UIHelpers.csproj">
<Project>{e3ce262b-b962-44ff-abc0-5ebfb403d51d}</Project>
<Name>UIHelpers</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="UI\PxzExplorer.resx">
<DependentUpon>PxzExplorer.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
20 changes: 20 additions & 0 deletions PlexDL.Common.Pxz/PlexDL.Common.Pxz.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>$id$</id>
<version>1.7.3</version>
<title>PlexDL.Common.Pxz</title>
<authors>BRH Media</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<projectUrl>https://github.com/BRH-Media/PlexDL</projectUrl>
<description>Provides decoding and encoding for the PXZ (PlexDL XML-Zipped) Format</description>
<releaseNotes>Initial release</releaseNotes>
<copyright>Copyright (c) BRH Media (Baeleigh Harris) 2024</copyright>
<tags>PlexDL pxz packing xml zip enums security png</tags>
<dependencies>
<dependency id="PlexDL.Common.Enums" version="1.7.3"></dependency>
<dependency id="PlexDL.Common.Security" version="1.7.3"></dependency>
</dependencies>
</metadata>
</package>
2 changes: 1 addition & 1 deletion PlexDL.Common.Pxz/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PlexDL.Common.Pxz")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("Provides decoding and encoding for the PXZ (PlexDL XML-Zipped) Format")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("BRH Media")]
[assembly: AssemblyProduct("PlexDL.Common.Pxz")]
Expand Down
18 changes: 4 additions & 14 deletions PlexDL.Common.Pxz/Structures/File/PxzFile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
using PlexDL.Common.Pxz.Enums;
using PlexDL.Common.Pxz.Extensions;
using PlexDL.Common.Pxz.Structures.File.Record;
using PlexDL.Common.Pxz.UI;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Xml.Serialization;
using UIHelpers;

// ReSharper disable UnusedMember.Global
// ReSharper disable ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
Expand Down Expand Up @@ -133,14 +131,6 @@ public List<PxzRecord> SelectType(PxzRecordType type)
return new List<PxzRecord>();
}

/// <summary>
/// Show the PXZ Explorer with the current PXZ file loaded
/// </summary>
public void ShowInformation()
{
PxzExplorer.ShowPxzExplorer(this);
}

/// <summary>
/// Load a record from the PXZ index
/// </summary>
Expand Down Expand Up @@ -279,7 +269,7 @@ public void Load(string path)
if (idxFile == null)
{
if (!ParseSilent)
UIMessages.Error(@"PXZ index couldn't be found or it isn't valid");
throw new Exception(@"PXZ index couldn't be found or it isn't valid");
return;
}

Expand Down Expand Up @@ -336,12 +326,12 @@ public void Load(string path)
//check authenticity flag, and warn if it's been altered
if (tamperedWith)
if (!ParseSilent)
UIMessages.Warning("Content has been modified\n\nThe MD5 checksums stored do not match the checksums calculated, which is an indication that the contents may have been altered outside of the PXZ handler. The file will continue loading after you close this message.");
throw new Exception("Content has been modified\n\nThe MD5 checksums stored do not match the checksums calculated, which is an indication that the contents may have been altered outside of the PXZ handler. The file will continue loading after you close this message.");
}
catch (Exception ex)
catch (Exception)
{
if (!ParseSilent)
UIMessages.Error(ex.ToString());
throw;
}
}
}
Expand Down
19 changes: 19 additions & 0 deletions PlexDL.Common.Security/PlexDL.Common.Security.nuspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package >
<metadata>
<id>$id$</id>
<version>1.7.3</version>
<title>PlexDL.Common.Security</title>
<authors>BRH Media</authors>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<projectUrl>https://github.com/BRH-Media/PlexDL</projectUrl>
<description>Provides security functionality (i.e., encryption/decryption) for various PlexDL functions</description>
<releaseNotes>Initial release</releaseNotes>
<copyright>Copyright (c) BRH Media (Baeleigh Harris) 2024</copyright>
<tags>PlexDL enums security package</tags>
<dependencies>
<dependency id="PlexDL.Common.Enums" version="1.7.3"></dependency>
</dependencies>
</metadata>
</package>
2 changes: 1 addition & 1 deletion PlexDL.Common.Security/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("PlexDL.Common.Security")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("Provides security functionality (i.e., encryption/decryption) for various PlexDL functions")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("BRH Media")]
[assembly: AssemblyProduct("PlexDL.Common.Security")]
Expand Down
6 changes: 6 additions & 0 deletions PlexDL.sln
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexDL.Common.BarcodeHandle
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexDL.Common.Shodan", "PlexDL.Common.Shodan\PlexDL.Common.Shodan.csproj", "{5CA1F4F9-C5CB-4AFF-96CD-9B8F78968EAA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PlexDL.Common.Pxz.Explorer", "PlexDL.Common.Pxz.Explorer\PlexDL.Common.Pxz.Explorer.csproj", "{0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -133,6 +135,10 @@ Global
{5CA1F4F9-C5CB-4AFF-96CD-9B8F78968EAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5CA1F4F9-C5CB-4AFF-96CD-9B8F78968EAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5CA1F4F9-C5CB-4AFF-96CD-9B8F78968EAA}.Release|Any CPU.Build.0 = Release|Any CPU
{0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A32FB9A-6AA2-4B4A-BD51-3AB9F2706232}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 4 additions & 0 deletions PlexDL/PlexDL.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -354,6 +354,10 @@
<Project>{2c0b4243-5d9e-454a-9a7b-dcac2787b13e}</Project>
<Name>PlexDL.Common.Enums</Name>
</ProjectReference>
<ProjectReference Include="..\PlexDL.Common.Pxz.Explorer\PlexDL.Common.Pxz.Explorer.csproj">
<Project>{0a32fb9a-6aa2-4b4a-bd51-3ab9f2706232}</Project>
<Name>PlexDL.Common.Pxz.Explorer</Name>
</ProjectReference>
<ProjectReference Include="..\PlexDL.Common.Pxz\PlexDL.Common.Pxz.csproj">
<Project>{1764ca80-f851-4e2c-acc8-37696d499d3b}</Project>
<Name>PlexDL.Common.Pxz</Name>
Expand Down
2 changes: 1 addition & 1 deletion PlexDL/UI/Forms/Home.cs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
using PlexDL.Common.Logging;
using PlexDL.Common.Net;
using PlexDL.Common.PlayerLaunchers;
using PlexDL.Common.Pxz.UI;
using PlexDL.Common.Renderers.Forms.GridView;
using PlexDL.Common.SearchFramework;
using PlexDL.Common.Security;
Expand All @@ -38,6 +37,7 @@
using System.Threading;
using System.Windows.Forms;
using System.Xml;
using PlexDL.Common.Pxz.UI;
using UIHelpers;
using Directory = System.IO.Directory;

Expand Down
1 change: 1 addition & 0 deletions PlexDL/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Microsoft.Bcl.Build" version="1.0.21" targetFramework="net472" />
<package id="NuGet.CommandLine" version="6.11.1" targetFramework="net472" developmentDependency="true" />
</packages>

0 comments on commit 4ff755f

Please sign in to comment.