cabele/AmagnoVirtualPrinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed project names

Browse source
This commit is contained in:
Marco Batzinger 2021-01-22 10:55:33 +01:00
parent b4c4aa4010
commit a29e57e66d
130 changed files with 501 additions and 504 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Agent/VirtualPrinter.Agent.Console/VirtualPrinter.Agent.Console.csproj → Agent/AmagnoVirtualPrinter.Agent.Console/AmagnoVirtualPrinter.Agent.Console.csproj
View file

@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{3D3A379B-F9B8-466D-A04D-FD5EF948FF1C}</ProjectGuid> <ProjectGuid>{3D3A379B-F9B8-466D-A04D-FD5EF948FF1C}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>VirtualPrinter.Agent.Console</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.Agent.Console</RootNamespace>
<AssemblyName>VirtualPrinter.AgentConsole</AssemblyName> <AssemblyName>AmagnoVirtualPrinter.AgentConsole</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -42,25 +42,25 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Common\VirtualPrinter.Agent.Autofac\VirtualPrinter.Agent.Autofac.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Agent.Autofac\AmagnoVirtualPrinter.Agent.Autofac.csproj">
<Project>{1b2f0781-82d7-4576-b936-c6a26053d6ed}</Project> <Project>{1b2f0781-82d7-4576-b936-c6a26053d6ed}</Project>
<Name>VirtualPrinter.Agent.Autofac</Name> <Name>AmagnoVirtualPrinter.Agent.Autofac</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Agent.Core\VirtualPrinter.Agent.Core.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Agent.Core\AmagnoVirtualPrinter.Agent.Core.csproj">
<Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project> <Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project>
<Name>VirtualPrinter.Agent.Core</Name> <Name>AmagnoVirtualPrinter.Agent.Core</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Agent.Lib\VirtualPrinter.Agent.Lib.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Agent.Lib\AmagnoVirtualPrinter.Agent.Lib.csproj">
<Project>{94e8105f-5001-403b-b9f1-b0b0b236ad65}</Project> <Project>{94e8105f-5001-403b-b9f1-b0b0b236ad65}</Project>
<Name>VirtualPrinter.Agent.Lib</Name> <Name>AmagnoVirtualPrinter.Agent.Lib</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj">
<Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project> <Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project>
<Name>VirtualPrinter.Logging</Name> <Name>AmagnoVirtualPrinter.Logging</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\UI\VirtualPrinter.ProgressInfo.Autofac\VirtualPrinter.ProgressInfo.Autofac.csproj"> <ProjectReference Include="..\..\UI\AmagnoVirtualPrinter.ProgressInfo.Autofac\AmagnoVirtualPrinter.ProgressInfo.Autofac.csproj">
<Project>{17e2cf8a-462c-4130-9faf-f1ca5fc4e06d}</Project> <Project>{17e2cf8a-462c-4130-9faf-f1ca5fc4e06d}</Project>
<Name>VirtualPrinter.ProgressInfo.Autofac</Name> <Name>AmagnoVirtualPrinter.ProgressInfo.Autofac</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

14
Agent/VirtualPrinter.Agent.Console/Program.cs → Agent/AmagnoVirtualPrinter.Agent.Console/Program.cs
View file

@ -1,13 +1,11 @@
using System; using System;
using AmagnoVirtualPrinter.Agent.Autofac;
using AmagnoVirtualPrinter.Agent.Core;
using AmagnoVirtualPrinter.Logging;
using AmagnoVirtualPrinter.ProgressInfo.Autofac;
using Autofac; using Autofac;
using VirtualPrinter.Agent.Autofac; namespace AmagnoVirtualPrinter.Agent.Console
using VirtualPrinter.Agent.Core;
using VirtualPrinter.Logging;
using VirtualPrinter.ProgressInfo.Autofac;
namespace VirtualPrinter.Agent.Console
{ {
internal static class Program internal static class Program
{ {
@ -23,7 +21,7 @@ namespace VirtualPrinter.Agent.Console
var container = builder.Build(); var container = builder.Build();
var service = container.Resolve<IVirtualPrinterService>(); var service = container.Resolve<IAmagnoVirtualPrinterService>();
service.Start(); service.Start();

4
Agent/VirtualPrinter.Agent.Console/Properties/AssemblyInfo.cs → Agent/AmagnoVirtualPrinter.Agent.Console/Properties/AssemblyInfo.cs
View file

@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die einer Assembly zugeordnet sind. // die einer Assembly zugeordnet sind.
[assembly: AssemblyTitle("VirtualPrinter.AgentConsole")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.AgentConsole")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

45
Agent/VirtualPrinter.Agent.Service/VirtualPrinter.Agent.Service.csproj → Agent/AmagnoVirtualPrinter.Agent.Service/AmagnoVirtualPrinter.Agent.Service.csproj
View file

@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{8C4F0640-4628-4CEA-8E31-143D68A3A70F}</ProjectGuid> <ProjectGuid>{8C4F0640-4628-4CEA-8E31-143D68A3A70F}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>VirtualPrinter.Agent.Service</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.Agent.Service</RootNamespace>
<AssemblyName>VPDAgent</AssemblyName> <AssemblyName>AmagnoPrinterAgent</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -47,7 +47,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>VirtualPrinter.Agent.Service.Program</StartupObject> <StartupObject>AmagnoVirtualPrinter.Agent.Service.Program</StartupObject>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -65,48 +65,39 @@
<Compile Include="ProjectInstaller.Designer.cs"> <Compile Include="ProjectInstaller.Designer.cs">
<DependentUpon>ProjectInstaller.cs</DependentUpon> <DependentUpon>ProjectInstaller.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="VirtualPrinterService.cs">
<SubType>Component</SubType>
</Compile>
<Compile Include="VirtualPrinterService.Designer.cs">
<DependentUpon>VirtualPrinterService.cs</DependentUpon>
</Compile>
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> <Compile Include="AmagnoVirtualPrinterService.cs">
<ItemGroup> <SubType>Component</SubType>
<None Include="..\Common\VirtualPrinter.Logging\NLog.config"> </Compile>
<Link>NLog.config</Link> <Compile Include="AmagnoVirtualPrinterService.Designer.cs" />
</None>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="ProjectInstaller.resx"> <EmbeddedResource Include="ProjectInstaller.resx">
<DependentUpon>ProjectInstaller.cs</DependentUpon> <DependentUpon>ProjectInstaller.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="VirtualPrinterService.resx"> <EmbeddedResource Include="AmagnoVirtualPrinterService.resx" />
<DependentUpon>VirtualPrinterService.cs</DependentUpon>
</EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Common\VirtualPrinter.Agent.Autofac\VirtualPrinter.Agent.Autofac.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Agent.Autofac\AmagnoVirtualPrinter.Agent.Autofac.csproj">
<Project>{1b2f0781-82d7-4576-b936-c6a26053d6ed}</Project> <Project>{1b2f0781-82d7-4576-b936-c6a26053d6ed}</Project>
<Name>VirtualPrinter.Agent.Autofac</Name> <Name>AmagnoVirtualPrinter.Agent.Autofac</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Agent.Core\VirtualPrinter.Agent.Core.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Agent.Core\AmagnoVirtualPrinter.Agent.Core.csproj">
<Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project> <Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project>
<Name>VirtualPrinter.Agent.Core</Name> <Name>AmagnoVirtualPrinter.Agent.Core</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Agent.Lib\VirtualPrinter.Agent.Lib.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Agent.Lib\AmagnoVirtualPrinter.Agent.Lib.csproj">
<Project>{94e8105f-5001-403b-b9f1-b0b0b236ad65}</Project> <Project>{94e8105f-5001-403b-b9f1-b0b0b236ad65}</Project>
<Name>VirtualPrinter.Agent.Lib</Name> <Name>AmagnoVirtualPrinter.Agent.Lib</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj">
<Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project> <Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project>
<Name>VirtualPrinter.Logging</Name> <Name>AmagnoVirtualPrinter.Logging</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\UI\VirtualPrinter.ProgressInfo.Autofac\VirtualPrinter.ProgressInfo.Autofac.csproj"> <ProjectReference Include="..\..\UI\AmagnoVirtualPrinter.ProgressInfo.Autofac\AmagnoVirtualPrinter.ProgressInfo.Autofac.csproj">
<Project>{17e2cf8a-462c-4130-9faf-f1ca5fc4e06d}</Project> <Project>{17e2cf8a-462c-4130-9faf-f1ca5fc4e06d}</Project>
<Name>VirtualPrinter.ProgressInfo.Autofac</Name> <Name>AmagnoVirtualPrinter.ProgressInfo.Autofac</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
Agent/VirtualPrinter.Agent.Service/VirtualPrinterService.Designer.cs → Agent/AmagnoVirtualPrinter.Agent.Service/AmagnoVirtualPrinterService.Designer.cs generated
View file

@ -1,6 +1,6 @@
namespace VirtualPrinter.Agent.Service namespace AmagnoVirtualPrinter.Agent.Service
{ {
partial class VirtualPrinterService partial class AmagnoVirtualPrinterService
{ {
/// <summary> /// <summary>
/// Required designer variable. /// Required designer variable.
@ -29,9 +29,9 @@
private void InitializeComponent() private void InitializeComponent()
{ {
// //
// VirtualPrinterService // AmagnoVirtualPrinterService
// //
this.ServiceName = VirtualPrinterService.PrinterServiceName; this.ServiceName = AmagnoVirtualPrinterService.PrinterServiceName;
} }

22
Agent/VirtualPrinter.Agent.Service/VirtualPrinterService.cs → Agent/AmagnoVirtualPrinter.Agent.Service/AmagnoVirtualPrinterService.cs
View file

@ -3,28 +3,28 @@ using System.ServiceProcess;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
namespace VirtualPrinter.Agent.Service namespace AmagnoVirtualPrinter.Agent.Service
{ {
public partial class VirtualPrinterService : ServiceBase public partial class AmagnoVirtualPrinterService : ServiceBase
{ {
public const string PrinterServiceName = "VirtualPrinterService"; public const string PrinterServiceName = "AmagnoPrinterService";
public const string PrinterDescription = "Handles virtual printers"; public const string PrinterDescription = "Handles virtual printers";
[NotNull] [NotNull]
private readonly IVirtualPrinterService _virtualPrinterService; private readonly IAmagnoVirtualPrinterService _amagnoPrinterService;
public VirtualPrinterService([NotNull]IVirtualPrinterService virtualPrinterService) public AmagnoVirtualPrinterService([NotNull]IAmagnoVirtualPrinterService amagnoVirtualPrinterService)
{ {
if (virtualPrinterService == null) if (amagnoVirtualPrinterService == null)
{ {
throw new ArgumentNullException(nameof(virtualPrinterService)); throw new ArgumentNullException(nameof(amagnoVirtualPrinterService));
} }
InitializeComponent(); InitializeComponent();
_virtualPrinterService = virtualPrinterService; _amagnoPrinterService = amagnoVirtualPrinterService;
} }
protected override void OnStart(string[] args) protected override void OnStart(string[] args)
@ -35,7 +35,7 @@ namespace VirtualPrinter.Agent.Service
public void OnServiceStart() public void OnServiceStart()
{ {
// Insert additional code here to define processing. // Insert additional code here to define processing.
_virtualPrinterService.Start(); _amagnoPrinterService.Start();
} }
protected override void OnStop() protected override void OnStop()
@ -46,7 +46,7 @@ namespace VirtualPrinter.Agent.Service
public void OnServiceStop() public void OnServiceStop()
{ {
// Insert additional code here to define processing. // Insert additional code here to define processing.
_virtualPrinterService.Stop(); _amagnoPrinterService.Stop();
} }
} }
} }

0
Agent/VirtualPrinter.Agent.Service/VirtualPrinterService.resx → Agent/AmagnoVirtualPrinter.Agent.Service/AmagnoVirtualPrinterService.resx
View file

10
Agent/VirtualPrinter.Agent.Service/Program.cs → Agent/AmagnoVirtualPrinter.Agent.Service/Program.cs
View file

@ -2,11 +2,11 @@
using Autofac; using Autofac;
using VirtualPrinter.Agent.Autofac; using AmagnoVirtualPrinter.Agent.Autofac;
using VirtualPrinter.Logging; using AmagnoVirtualPrinter.Logging;
using VirtualPrinter.ProgressInfo.Autofac; using AmagnoVirtualPrinter.ProgressInfo.Autofac;
namespace VirtualPrinter.Agent.Service namespace AmagnoVirtualPrinter.Agent.Service
{ {
/// <summary> /// <summary>
/// The Windows service that is registered during an installation /// The Windows service that is registered during an installation
@ -20,7 +20,7 @@ namespace VirtualPrinter.Agent.Service
builder.RegisterModule(new VirtualPrinterModule()); builder.RegisterModule(new VirtualPrinterModule());
builder.RegisterModule(new ProgressInfoModule()); builder.RegisterModule(new ProgressInfoModule());
builder.RegisterModule(new LoggerModule()); builder.RegisterModule(new LoggerModule());
builder.RegisterType<VirtualPrinterService>().As<ServiceBase>(); builder.RegisterType<AmagnoVirtualPrinterService>().As<ServiceBase>();
var container = builder.Build(); var container = builder.Build();

6
Agent/VirtualPrinter.Agent.Service/ProjectInstaller.Designer.cs → Agent/AmagnoVirtualPrinter.Agent.Service/ProjectInstaller.Designer.cs generated
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Service namespace AmagnoVirtualPrinter.Agent.Service
{ {
partial class ProjectInstaller partial class ProjectInstaller
{ {
@ -39,8 +39,8 @@
// //
// serviceInstaller1 // serviceInstaller1
// //
this.serviceInstaller1.ServiceName = VirtualPrinterService.PrinterServiceName; this.serviceInstaller1.ServiceName = AmagnoVirtualPrinterService.PrinterServiceName;
this.serviceInstaller1.Description = VirtualPrinterService.PrinterDescription; this.serviceInstaller1.Description = AmagnoVirtualPrinterService.PrinterDescription;
this.serviceInstaller1.ServicesDependedOn = new[] {"Spooler"}; this.serviceInstaller1.ServicesDependedOn = new[] {"Spooler"};
this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic; this.serviceInstaller1.StartType = System.ServiceProcess.ServiceStartMode.Automatic;
// //

2
Agent/VirtualPrinter.Agent.Service/ProjectInstaller.cs → Agent/AmagnoVirtualPrinter.Agent.Service/ProjectInstaller.cs
View file

@ -1,7 +1,7 @@
using System.ComponentModel; using System.ComponentModel;
using System.Configuration.Install; using System.Configuration.Install;
namespace VirtualPrinter.Agent.Service namespace AmagnoVirtualPrinter.Agent.Service
{ {
[RunInstaller(true)] [RunInstaller(true)]
public partial class ProjectInstaller : Installer public partial class ProjectInstaller : Installer

0
Agent/VirtualPrinter.Agent.Service/ProjectInstaller.resx → Agent/AmagnoVirtualPrinter.Agent.Service/ProjectInstaller.resx
View file

6
Agent/VirtualPrinter.Agent.Service/Properties/AssemblyInfo.cs → Agent/AmagnoVirtualPrinter.Agent.Service/Properties/AssemblyInfo.cs
View file

@ -2,10 +2,10 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
[assembly: AssemblyTitle("VirtualPrinter.Agent.Service")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.Agent.Service")]
[assembly: AssemblyDescription("The agent for the virtual printer")] [assembly: AssemblyDescription("The agent for the virtual printer")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
@ -19,4 +19,4 @@ using System.Runtime.InteropServices;
[assembly: AssemblyFileVersion("1.0.0.0")] [assembly: AssemblyFileVersion("1.0.0.0")]
// For testing // For testing
[assembly: InternalsVisibleTo("VirtualPrinter.Test")] [assembly: InternalsVisibleTo("AmagnoVirtualPrinter.Test")]

20
Agent/VirtualPrinter.Delivery/VirtualPrinter.Delivery.csproj → Agent/AmagnoVirtualPrinter.Delivery/AmagnoVirtualPrinter.Delivery.csproj
View file

@ -6,7 +6,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{74FA80B3-7CF1-4B68-8AA3-4C3D37BBE855}</ProjectGuid> <ProjectGuid>{74FA80B3-7CF1-4B68-8AA3-4C3D37BBE855}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>VirtualPrinter.Delivery</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.Delivery</RootNamespace>
<AssemblyName>delivery</AssemblyName> <AssemblyName>delivery</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
@ -32,7 +32,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>VirtualPrinter.Delivery.Program</StartupObject> <StartupObject>AmagnoVirtualPrinter.Delivery.Program</StartupObject>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
@ -51,21 +51,21 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Common\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj">
<Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project> <Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project>
<Name>VirtualPrinter.Logging</Name> <Name>AmagnoVirtualPrinter.Logging</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Utils\VirtualPrinter.Utils.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Utils\AmagnoVirtualPrinter.Utils.csproj">
<Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project> <Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project>
<Name>VirtualPrinter.Utils</Name> <Name>AmagnoVirtualPrinter.Utils</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj">
<Project>{AA25364D-22D5-44B0-86A5-6FB14C686308}</Project> <Project>{AA25364D-22D5-44B0-86A5-6FB14C686308}</Project>
<Name>VirtualPrinter.Logging</Name> <Name>AmagnoVirtualPrinter.Logging</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Utils\VirtualPrinter.Utils.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Utils\AmagnoVirtualPrinter.Utils.csproj">
<Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project> <Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project>
<Name>VirtualPrinter.Utils</Name> <Name>AmagnoVirtualPrinter.Utils</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
Agent/VirtualPrinter.Delivery/GhostScriptRedirector.cs → Agent/AmagnoVirtualPrinter.Delivery/GhostScriptRedirector.cs
View file

@ -2,11 +2,11 @@
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Printing; using System.Printing;
using AmagnoVirtualPrinter.Logging;
using AmagnoVirtualPrinter.Utils;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Logging;
using VirtualPrinter.Utils;
namespace VirtualPrinter.Delivery namespace AmagnoVirtualPrinter.Delivery
{ {
/// <summary> /// <summary>
/// Redirects instructions to Ghostscript /// Redirects instructions to Ghostscript

4
Agent/VirtualPrinter.Delivery/Program.cs → Agent/AmagnoVirtualPrinter.Delivery/Program.cs
View file

@ -2,9 +2,9 @@
using JetBrains.Annotations; using JetBrains.Annotations;
using static VirtualPrinter.Delivery.Redirector; using static AmagnoVirtualPrinter.Delivery.Redirector;
namespace VirtualPrinter.Delivery namespace AmagnoVirtualPrinter.Delivery
{ {
internal class Program internal class Program
{ {

4
Agent/VirtualPrinter.Delivery/Properties/AssemblyInfo.cs → Agent/AmagnoVirtualPrinter.Delivery/Properties/AssemblyInfo.cs
View file

@ -1,10 +1,10 @@
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
[assembly: AssemblyTitle("VirtualPrinter.Delivery")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.Delivery")]
[assembly: AssemblyDescription("The delivery man for the virtual printer")] [assembly: AssemblyDescription("The delivery man for the virtual printer")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
Agent/VirtualPrinter.Delivery/Redirector.cs → Agent/AmagnoVirtualPrinter.Delivery/Redirector.cs
View file

@ -4,7 +4,7 @@ using System.Printing;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Delivery namespace AmagnoVirtualPrinter.Delivery
{ {
public static class Redirector public static class Redirector
{ {

28
VirtualPrinter.sln → AmagnoVirtualPrinter.sln
View file

@ -3,37 +3,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.30114.105 VisualStudioVersion = 16.0.30114.105
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.SetupDriver", "Installer\VirtualPrinter.SetupDriver\VirtualPrinter.SetupDriver.csproj", "{12402F90-A2AE-4549-9142-F90650E2082A}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.SetupDriver", "Installer\AmagnoVirtualPrinter.SetupDriver\AmagnoVirtualPrinter.SetupDriver.csproj", "{12402F90-A2AE-4549-9142-F90650E2082A}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.Agent.Service", "Agent\VirtualPrinter.Agent.Service\VirtualPrinter.Agent.Service.csproj", "{8C4F0640-4628-4CEA-8E31-143D68A3A70F}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.Agent.Service", "Agent\AmagnoVirtualPrinter.Agent.Service\AmagnoVirtualPrinter.Agent.Service.csproj", "{8C4F0640-4628-4CEA-8E31-143D68A3A70F}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.Delivery", "Agent\VirtualPrinter.Delivery\VirtualPrinter.Delivery.csproj", "{74FA80B3-7CF1-4B68-8AA3-4C3D37BBE855}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.Delivery", "Agent\AmagnoVirtualPrinter.Delivery\AmagnoVirtualPrinter.Delivery.csproj", "{74FA80B3-7CF1-4B68-8AA3-4C3D37BBE855}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.Agent.Console", "Agent\VirtualPrinter.Agent.Console\VirtualPrinter.Agent.Console.csproj", "{3D3A379B-F9B8-466D-A04D-FD5EF948FF1C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.Agent.Console", "Agent\AmagnoVirtualPrinter.Agent.Console\AmagnoVirtualPrinter.Agent.Console.csproj", "{3D3A379B-F9B8-466D-A04D-FD5EF948FF1C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.Agent.Lib", "Common\VirtualPrinter.Agent.Lib\VirtualPrinter.Agent.Lib.csproj", "{94E8105F-5001-403B-B9F1-B0B0B236AD65}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.Agent.Lib", "Common\AmagnoVirtualPrinter.Agent.Lib\AmagnoVirtualPrinter.Agent.Lib.csproj", "{94E8105F-5001-403B-B9F1-B0B0B236AD65}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.Agent.Autofac", "Common\VirtualPrinter.Agent.Autofac\VirtualPrinter.Agent.Autofac.csproj", "{1B2F0781-82D7-4576-B936-C6A26053D6ED}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.Agent.Autofac", "Common\AmagnoVirtualPrinter.Agent.Autofac\AmagnoVirtualPrinter.Agent.Autofac.csproj", "{1B2F0781-82D7-4576-B936-C6A26053D6ED}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Agent", "Agent", "{E801472E-AAD2-4255-AA2F-F48DC4445B0B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Agent", "Agent", "{E801472E-AAD2-4255-AA2F-F48DC4445B0B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.ProgressInfo", "UI\VirtualPrinter.ProgressInfo\VirtualPrinter.ProgressInfo.csproj", "{6579D542-EF21-4CF7-A9EC-7360ECEB3BBB}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.ProgressInfo", "UI\AmagnoVirtualPrinter.ProgressInfo\AmagnoVirtualPrinter.ProgressInfo.csproj", "{6579D542-EF21-4CF7-A9EC-7360ECEB3BBB}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{CE239FC1-5CD0-4F49-A7E3-28CFAD7A5DF4}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "UI", "UI", "{CE239FC1-5CD0-4F49-A7E3-28CFAD7A5DF4}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.ProgressInfo.Lib", "UI\VirtualPrinter.ProgressInfo.Lib\VirtualPrinter.ProgressInfo.Lib.csproj", "{D66F55E5-B3F7-4C61-A4F2-B55C4D412E01}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.ProgressInfo.Lib", "UI\AmagnoVirtualPrinter.ProgressInfo.Lib\AmagnoVirtualPrinter.ProgressInfo.Lib.csproj", "{D66F55E5-B3F7-4C61-A4F2-B55C4D412E01}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.ProgressInfo.Autofac", "UI\VirtualPrinter.ProgressInfo.Autofac\VirtualPrinter.ProgressInfo.Autofac.csproj", "{17E2CF8A-462C-4130-9FAF-F1CA5FC4E06D}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.ProgressInfo.Autofac", "UI\AmagnoVirtualPrinter.ProgressInfo.Autofac\AmagnoVirtualPrinter.ProgressInfo.Autofac.csproj", "{17E2CF8A-462C-4130-9FAF-F1CA5FC4E06D}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.ProgressInfo.Core", "UI\VirtualPrinter.ProgressInfo.Core\VirtualPrinter.ProgressInfo.Core.csproj", "{24D28558-C825-43E6-85D2-7C59F4A97698}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.ProgressInfo.Core", "UI\AmagnoVirtualPrinter.ProgressInfo.Core\AmagnoVirtualPrinter.ProgressInfo.Core.csproj", "{24D28558-C825-43E6-85D2-7C59F4A97698}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.Agent.Core", "Common\VirtualPrinter.Agent.Core\VirtualPrinter.Agent.Core.csproj", "{135C85EB-2116-4CC4-8CCB-B6804B9D6467}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.Agent.Core", "Common\AmagnoVirtualPrinter.Agent.Core\AmagnoVirtualPrinter.Agent.Core.csproj", "{135C85EB-2116-4CC4-8CCB-B6804B9D6467}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.Utils", "Common\VirtualPrinter.Utils\VirtualPrinter.Utils.csproj", "{CD1C8E9D-5335-41AC-B0C0-88FD7C7C55F3}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.Utils", "Common\AmagnoVirtualPrinter.Utils\AmagnoVirtualPrinter.Utils.csproj", "{CD1C8E9D-5335-41AC-B0C0-88FD7C7C55F3}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.Logging", "Common\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj", "{AA25364D-22D5-44B0-86A5-6FB14C686308}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.Logging", "Common\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj", "{AA25364D-22D5-44B0-86A5-6FB14C686308}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VirtualPrinter.WixSharpInstaller", "Installer\VirtualPrinter.WixSharpInstaller\VirtualPrinter.WixSharpInstaller.csproj", "{A668846E-54C7-483D-9CF7-48F77EA398CA}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AmagnoVirtualPrinter.WixSharpInstaller", "Installer\AmagnoVirtualPrinter.WixSharpInstaller\AmagnoVirtualPrinter.WixSharpInstaller.csproj", "{A668846E-54C7-483D-9CF7-48F77EA398CA}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{5EE0067B-1ED5-44FB-941D-8F4B039FDD2E}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installer", "Installer", "{5EE0067B-1ED5-44FB-941D-8F4B039FDD2E}"

24
Common/VirtualPrinter.Agent.Autofac/VirtualPrinter.Agent.Autofac.csproj → Common/AmagnoVirtualPrinter.Agent.Autofac/AmagnoVirtualPrinter.Agent.Autofac.csproj
View file

@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1B2F0781-82D7-4576-B936-C6A26053D6ED}</ProjectGuid> <ProjectGuid>{1B2F0781-82D7-4576-B936-C6A26053D6ED}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>VirtualPrinter.Agent.Autofac</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.Agent.Autofac</RootNamespace>
<AssemblyName>VirtualPrinter.Agent.Autofac</AssemblyName> <AssemblyName>AmagnoVirtualPrinter.Agent.Autofac</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -52,21 +52,21 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VirtualPrinter.Agent.Core\VirtualPrinter.Agent.Core.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Agent.Core\AmagnoVirtualPrinter.Agent.Core.csproj">
<Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project> <Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project>
<Name>VirtualPrinter.Agent.Core</Name> <Name>AmagnoVirtualPrinter.Agent.Core</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VirtualPrinter.Agent.Lib\VirtualPrinter.Agent.Lib.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Agent.Lib\AmagnoVirtualPrinter.Agent.Lib.csproj">
<Project>{94e8105f-5001-403b-b9f1-b0b0b236ad65}</Project> <Project>{94e8105f-5001-403b-b9f1-b0b0b236ad65}</Project>
<Name>VirtualPrinter.Agent.Lib</Name> <Name>AmagnoVirtualPrinter.Agent.Lib</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj">
<Project>{AA25364D-22D5-44B0-86A5-6FB14C686308}</Project> <Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project>
<Name>VirtualPrinter.Logging</Name> <Name>AmagnoVirtualPrinter.Logging</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VirtualPrinter.Utils\VirtualPrinter.Utils.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Utils\AmagnoVirtualPrinter.Utils.csproj">
<Project>{CD1C8E9D-5335-41AC-B0C0-88FD7C7C55F3}</Project> <Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project>
<Name>VirtualPrinter.Utils</Name> <Name>AmagnoVirtualPrinter.Utils</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
Common/VirtualPrinter.Agent.Autofac/Properties/AssemblyInfo.cs → Common/AmagnoVirtualPrinter.Agent.Autofac/Properties/AssemblyInfo.cs
View file

@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("VirtualPrinter.Agent.Autofac")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.Agent.Autofac")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

18
Common/VirtualPrinter.Agent.Autofac/VirtualPrinterModule.cs → Common/AmagnoVirtualPrinter.Agent.Autofac/VirtualPrinterModule.cs
View file

@ -1,11 +1,13 @@
using Autofac; using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core.Model;
using AmagnoVirtualPrinter.Agent.Lib.Misc;
using AmagnoVirtualPrinter.Utils;
using Autofac;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Agent.Lib; using AmagnoVirtualPrinter.Agent.Lib;
using VirtualPrinter.Agent.Lib.Misc;
using VirtualPrinter.Utils;
namespace VirtualPrinter.Agent.Autofac namespace AmagnoVirtualPrinter.Agent.Autofac
{ {
/// <summary> /// <summary>
/// All classes to be resolved with IoC are registered here /// All classes to be resolved with IoC are registered here
@ -21,9 +23,9 @@ namespace VirtualPrinter.Agent.Autofac
builder.RegisterType<JobProcessor>().As<IJobProcessor>(); builder.RegisterType<JobProcessor>().As<IJobProcessor>();
builder.RegisterType<Job>().As<IJob>(); builder.RegisterType<Job>().As<IJob>();
builder.RegisterType<Shell>().As<IShell>(); builder.RegisterType<Shell>().As<IShell>();
builder.RegisterType<VirtualTcpInputPrinter>().As<IVirtualPrinter>(); builder.RegisterType<AmagnoVirtualTcpInputPrinter>().As<IAmagnoVirtualPrinter>();
builder.RegisterType<RegistryConfig>().As<IExConfig>(); builder.RegisterType<RegistryConfig>().As<IExConfig>();
builder.RegisterType<VirtualPrinterService>().As<IVirtualPrinterService>(); builder.RegisterType<AmagnoVirtualPrinterService>().As<IAmagnoVirtualPrinterService>();
builder.RegisterType<JobRedirector>().As<IJobRedirector>(); builder.RegisterType<JobRedirector>().As<IJobRedirector>();
builder.RegisterType<RegistryRepository>().As<IRegistryRepository>(); builder.RegisterType<RegistryRepository>().As<IRegistryRepository>();
builder.RegisterType<Shell>().As<IShell>(); builder.RegisterType<Shell>().As<IShell>();

8
Common/VirtualPrinter.Agent.Core/VirtualPrinter.Agent.Core.csproj → Common/AmagnoVirtualPrinter.Agent.Core/AmagnoVirtualPrinter.Agent.Core.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{135C85EB-2116-4CC4-8CCB-B6804B9D6467}</ProjectGuid> <ProjectGuid>{135C85EB-2116-4CC4-8CCB-B6804B9D6467}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualPrinter.Agent.Core</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.Agent.Core</RootNamespace>
<AssemblyName>VirtualPrinter.Agent.Core</AssemblyName> <AssemblyName>AmagnoVirtualPrinter.Agent.Core</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
@ -51,8 +51,8 @@
<Compile Include="Interfaces\ISessionInfo.cs" /> <Compile Include="Interfaces\ISessionInfo.cs" />
<Compile Include="Interfaces\IShell.cs" /> <Compile Include="Interfaces\IShell.cs" />
<Compile Include="Interfaces\IUserConfig.cs" /> <Compile Include="Interfaces\IUserConfig.cs" />
<Compile Include="Interfaces\IVirtualPrinter.cs" /> <Compile Include="Interfaces\IAmagnoVirtualPrinter.cs" />
<Compile Include="Interfaces\IVirtualPrinterService.cs" /> <Compile Include="Interfaces\IAmagnoVirtualPrinterService.cs" />
<Compile Include="Interfaces\JobStatus.cs" /> <Compile Include="Interfaces\JobStatus.cs" />
<Compile Include="Model\JobInfo.cs" /> <Compile Include="Model\JobInfo.cs" />
<Compile Include="Model\PostScriptConversionException.cs" /> <Compile Include="Model\PostScriptConversionException.cs" />

2
Common/VirtualPrinter.Agent.Core/Enums/IntermediateFormat.cs → Common/AmagnoVirtualPrinter.Agent.Core/Enums/IntermediateFormat.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Core.Enums namespace AmagnoVirtualPrinter.Agent.Core.Enums
{ {
public enum IntermediateFormat public enum IntermediateFormat
{ {

4
Common/VirtualPrinter.Agent.Core/Interfaces/IVirtualPrinter.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IAmagnoVirtualPrinter.cs
View file

@ -1,8 +1,8 @@
using System; using System;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IVirtualPrinter : IDisposable public interface IAmagnoVirtualPrinter : IDisposable
{ {
/// <summary> /// <summary>
/// Initialize the virtual printer. /// Initialize the virtual printer.

8
Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IAmagnoVirtualPrinterService.cs Normal file
View file

@ -0,0 +1,8 @@
namespace AmagnoVirtualPrinter.Agent.Core
{
public interface IAmagnoVirtualPrinterService
{
void Start();
void Stop();
}
}

2
Common/VirtualPrinter.Agent.Core/Interfaces/IConfig.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IConfig.cs
View file

@ -1,6 +1,6 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IConfig public interface IConfig
{ {

2
Common/VirtualPrinter.Agent.Core/Interfaces/IDirectoryHelper.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IDirectoryHelper.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IDirectoryHelper public interface IDirectoryHelper
{ {

6
Common/VirtualPrinter.Agent.Core/Interfaces/IExConfig.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IExConfig.cs
View file

@ -1,10 +1,8 @@
using System; using System;
using AmagnoVirtualPrinter.Agent.Core.Enums;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core.Enums; namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
namespace VirtualPrinter.Agent.Core
{ {
public interface IExConfig : IConfig public interface IExConfig : IConfig
{ {

2
Common/VirtualPrinter.Agent.Core/Interfaces/IJob.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IJob.cs
View file

@ -1,6 +1,6 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
/// <summary> /// <summary>
/// The information of the job. /// The information of the job.

3
Common/VirtualPrinter.Agent.Core/Interfaces/IJobFactory.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IJobFactory.cs
View file

@ -1,8 +1,7 @@
using System.IO; using System.IO;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IJobFactory public interface IJobFactory
{ {

2
Common/VirtualPrinter.Agent.Core/Interfaces/IJobInfo.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IJobInfo.cs
View file

@ -1,6 +1,6 @@
using System.Printing; using System.Printing;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IJobInfo public interface IJobInfo
{ {

4
Common/VirtualPrinter.Agent.Core/Interfaces/IJobProcessor.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IJobProcessor.cs
View file

@ -1,8 +1,8 @@
using System; using System;
using AmagnoVirtualPrinter.Agent.Core.Model;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IJobProcessor public interface IJobProcessor
{ {

3
Common/VirtualPrinter.Agent.Core/Interfaces/IJobRedirector.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IJobRedirector.cs
View file

@ -1,8 +1,7 @@
using System; using System;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IJobRedirector public interface IJobRedirector
{ {

4
Common/VirtualPrinter.Agent.Core/Interfaces/IJobService.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IJobService.cs
View file

@ -1,8 +1,8 @@
using System; using System;
using AmagnoVirtualPrinter.Agent.Core.Model;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IJobService public interface IJobService
{ {

5
Common/VirtualPrinter.Agent.Core/Interfaces/IPostScriptConverter.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IPostScriptConverter.cs
View file

@ -1,8 +1,7 @@
using System; using System;
using AmagnoVirtualPrinter.Agent.Core.Model;
using VirtualPrinter.Agent.Lib.Model; namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
namespace VirtualPrinter.Agent.Core
{ {
public interface IPostScriptConverter public interface IPostScriptConverter
{ {

2
Common/VirtualPrinter.Agent.Core/Interfaces/IRegistryRepository.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IRegistryRepository.cs
View file

@ -1,6 +1,6 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IRegistryRepository public interface IRegistryRepository
{ {

2
Common/VirtualPrinter.Agent.Core/Interfaces/ISessionInfo.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/ISessionInfo.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface ISessionInfo public interface ISessionInfo
{ {

2
Common/VirtualPrinter.Agent.Core/Interfaces/IShell.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IShell.cs
View file

@ -1,6 +1,6 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IShell public interface IShell
{ {

2
Common/VirtualPrinter.Agent.Core/Interfaces/IUserConfig.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/IUserConfig.cs
View file

@ -1,6 +1,6 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public interface IUserConfig public interface IUserConfig
{ {

2
Common/VirtualPrinter.Agent.Core/Interfaces/JobStatus.cs → Common/AmagnoVirtualPrinter.Agent.Core/Interfaces/JobStatus.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Interfaces
{ {
public enum JobStatus public enum JobStatus
{ {

3
Common/VirtualPrinter.Agent.Core/Model/JobInfo.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/JobInfo.cs
View file

@ -1,6 +1,7 @@
using System.Printing; using System.Printing;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public struct JobInfo : IJobInfo public struct JobInfo : IJobInfo
{ {

2
Common/VirtualPrinter.Agent.Core/Model/PostScriptConversionException.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/PostScriptConversionException.cs
View file

@ -1,6 +1,6 @@
using System; using System;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public class PostScriptConversionException : Exception public class PostScriptConversionException : Exception
{ {

2
Common/VirtualPrinter.Agent.Core/Model/PostScriptRenderOptions.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/PostScriptRenderOptions.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public struct PostScriptRenderOptions public struct PostScriptRenderOptions
{ {

2
Common/VirtualPrinter.Agent.Core/Model/PostScriptRenderPdfOptions.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/PostScriptRenderPdfOptions.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public struct PostScriptRenderPdfOptions public struct PostScriptRenderPdfOptions
{ {

2
Common/VirtualPrinter.Agent.Core/Model/PostScriptRenderTiffOptions.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/PostScriptRenderTiffOptions.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public struct PostScriptRenderTiffOptions public struct PostScriptRenderTiffOptions
{ {

2
Common/VirtualPrinter.Agent.Core/Model/PrintExts.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/PrintExts.cs
View file

@ -1,6 +1,6 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public static class PrintExts public static class PrintExts
{ {

2
Common/VirtualPrinter.Agent.Core/Model/PrintStatus.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/PrintStatus.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.Agent.Core namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public enum PrintStatus public enum PrintStatus
{ {

6
Common/VirtualPrinter.Agent.Core/Model/ProgressUpdateArgs.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/ProgressUpdateArgs.cs
View file

@ -1,10 +1,8 @@
using System; using System;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core; namespace AmagnoVirtualPrinter.Agent.Core.Model
namespace VirtualPrinter.Agent.Lib.Model
{ {
public class ProgressUpdateArgs : EventArgs public class ProgressUpdateArgs : EventArgs
{ {

7
Common/VirtualPrinter.Agent.Core/Model/RegistryConfig.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/RegistryConfig.cs
View file

@ -1,12 +1,11 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using AmagnoVirtualPrinter.Agent.Core.Enums;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core.Enums; namespace AmagnoVirtualPrinter.Agent.Core.Model
namespace VirtualPrinter.Agent.Core
{ {
public class RegistryConfig : IExConfig public class RegistryConfig : IExConfig
{ {

4
Common/VirtualPrinter.Agent.Core/Model/SessionInfo.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/SessionInfo.cs
View file

@ -1,4 +1,6 @@
namespace VirtualPrinter.Agent.Core using AmagnoVirtualPrinter.Agent.Core.Interfaces;
namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public struct SessionInfo : ISessionInfo public struct SessionInfo : ISessionInfo
{ {

4
Common/VirtualPrinter.Agent.Core/Model/UserRegistryConfig.cs → Common/AmagnoVirtualPrinter.Agent.Core/Model/UserRegistryConfig.cs
View file

@ -1,4 +1,6 @@
namespace VirtualPrinter.Agent.Core using AmagnoVirtualPrinter.Agent.Core.Interfaces;
namespace AmagnoVirtualPrinter.Agent.Core.Model
{ {
public class UserRegistryConfig : IUserConfig public class UserRegistryConfig : IUserConfig
{ {

4
Common/VirtualPrinter.Agent.Core/Properties/AssemblyInfo.cs → Common/AmagnoVirtualPrinter.Agent.Core/Properties/AssemblyInfo.cs
View file

@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die einer Assembly zugeordnet sind. // die einer Assembly zugeordnet sind.
[assembly: AssemblyTitle("VirtualPrinter.Agent.Core")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.Agent.Core")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

32
Common/VirtualPrinter.Agent.Lib/VirtualPrinter.Agent.Lib.csproj → Common/AmagnoVirtualPrinter.Agent.Lib/AmagnoVirtualPrinter.Agent.Lib.csproj
View file

@ -6,8 +6,8 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{94E8105F-5001-403B-B9F1-B0B0B236AD65}</ProjectGuid> <ProjectGuid>{94E8105F-5001-403B-B9F1-B0B0B236AD65}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>VirtualPrinter.Agent.Lib</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.Agent.Lib</RootNamespace>
<AssemblyName>VirtualPrinter.Agent.Lib</AssemblyName> <AssemblyName>AmagnoVirtualPrinter.Agent.Lib</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -43,7 +43,7 @@
<Compile Include="Misc\JobService.cs" /> <Compile Include="Misc\JobService.cs" />
<Compile Include="Misc\VirtualTcpInputPrinter.cs" /> <Compile Include="Misc\VirtualTcpInputPrinter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="VirtualPrinterService.cs" /> <Compile Include="AmagnoVirtualPrinterService.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -63,29 +63,29 @@
<Reference Include="WindowsBase" /> <Reference Include="WindowsBase" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Agent\VirtualPrinter.Delivery\VirtualPrinter.Delivery.csproj"> <ProjectReference Include="..\..\Agent\AmagnoVirtualPrinter.Delivery\AmagnoVirtualPrinter.Delivery.csproj">
<Project>{74fa80b3-7cf1-4b68-8aa3-4c3d37bbe855}</Project> <Project>{74fa80b3-7cf1-4b68-8aa3-4c3d37bbe855}</Project>
<Name>VirtualPrinter.Delivery</Name> <Name>AmagnoVirtualPrinter.Delivery</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Installer\VirtualPrinter.SetupDriver\VirtualPrinter.SetupDriver.csproj"> <ProjectReference Include="..\..\Installer\AmagnoVirtualPrinter.SetupDriver\AmagnoVirtualPrinter.SetupDriver.csproj">
<Project>{12402f90-a2ae-4549-9142-f90650e2082a}</Project> <Project>{12402f90-a2ae-4549-9142-f90650e2082a}</Project>
<Name>VirtualPrinter.SetupDriver</Name> <Name>AmagnoVirtualPrinter.SetupDriver</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\UI\VirtualPrinter.ProgressInfo.Core\VirtualPrinter.ProgressInfo.Core.csproj"> <ProjectReference Include="..\..\UI\AmagnoVirtualPrinter.ProgressInfo.Core\AmagnoVirtualPrinter.ProgressInfo.Core.csproj">
<Project>{24d28558-c825-43e6-85d2-7c59f4a97698}</Project> <Project>{24d28558-c825-43e6-85d2-7c59f4a97698}</Project>
<Name>VirtualPrinter.ProgressInfo.Core</Name> <Name>AmagnoVirtualPrinter.ProgressInfo.Core</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VirtualPrinter.Agent.Core\VirtualPrinter.Agent.Core.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Agent.Core\AmagnoVirtualPrinter.Agent.Core.csproj">
<Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project> <Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project>
<Name>VirtualPrinter.Agent.Core</Name> <Name>AmagnoVirtualPrinter.Agent.Core</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj">
<Project>{AA25364D-22D5-44B0-86A5-6FB14C686308}</Project> <Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project>
<Name>VirtualPrinter.Logging</Name> <Name>AmagnoVirtualPrinter.Logging</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VirtualPrinter.Utils\VirtualPrinter.Utils.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Utils\AmagnoVirtualPrinter.Utils.csproj">
<Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project> <Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project>
<Name>VirtualPrinter.Utils</Name> <Name>AmagnoVirtualPrinter.Utils</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

28
Common/AmagnoVirtualPrinter.Agent.Lib/AmagnoVirtualPrinterService.cs Normal file
View file

@ -0,0 +1,28 @@
using JetBrains.Annotations;
using AmagnoVirtualPrinter.Agent.Core;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
namespace AmagnoVirtualPrinter.Agent.Lib
{
public class AmagnoVirtualPrinterService : IAmagnoVirtualPrinterService
{
[NotNull]
private readonly IAmagnoVirtualPrinter _printer;
public AmagnoVirtualPrinterService([NotNull]IAmagnoVirtualPrinter printer)
{
_printer = printer;
}
public void Start()
{
_printer.Init();
}
public void Stop()
{
_printer.Dispose();
}
}
}

10
Common/VirtualPrinter.Agent.Lib/Misc/GhostScriptConverter.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Misc/GhostScriptConverter.cs
View file

@ -2,14 +2,14 @@
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core.Model;
using AmagnoVirtualPrinter.Logging;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Agent.Lib.Model;
using VirtualPrinter.Logging;
namespace VirtualPrinter.Agent.Lib.Misc namespace AmagnoVirtualPrinter.Agent.Lib.Misc
{ {
public class GhostScriptConverter : IPostScriptConverter public class GhostScriptConverter : IPostScriptConverter
{ {

5
Common/VirtualPrinter.Agent.Lib/Misc/Job.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Misc/Job.cs
View file

@ -1,6 +1,7 @@
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core;
namespace VirtualPrinter.Agent.Lib.Misc namespace AmagnoVirtualPrinter.Agent.Lib.Misc
{ {
public class Job : IJob public class Job : IJob
{ {

11
Common/VirtualPrinter.Agent.Lib/Misc/JobFactory.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Misc/JobFactory.cs
View file

@ -4,16 +4,17 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Printing; using System.Printing;
using System.Security.Principal; using System.Security.Principal;
using AmagnoVirtualPrinter.Agent.Core.Enums;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core.Model;
using AmagnoVirtualPrinter.Logging;
using Cassia; using Cassia;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Agent.Core.Enums;
using VirtualPrinter.Logging;
namespace VirtualPrinter.Agent.Lib.Misc namespace AmagnoVirtualPrinter.Agent.Lib.Misc
{ {
public class JobFactory : IJobFactory public class JobFactory : IJobFactory
{ {

12
Common/VirtualPrinter.Agent.Lib/Misc/JobProcessor.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Misc/JobProcessor.cs
View file

@ -1,14 +1,14 @@
using System; using System;
using System.IO; using System.IO;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core.Model;
using AmagnoVirtualPrinter.Logging;
using AmagnoVirtualPrinter.ProgressInfo.Core;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Agent.Lib.Model;
using VirtualPrinter.Logging;
using VirtualPrinter.ProgressInfo.Core;
namespace VirtualPrinter.Agent.Lib.Misc namespace AmagnoVirtualPrinter.Agent.Lib.Misc
{ {
public class JobProcessor : IJobProcessor public class JobProcessor : IJobProcessor
{ {

12
Common/VirtualPrinter.Agent.Lib/Misc/JobRedirector.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Misc/JobRedirector.cs
View file

@ -1,14 +1,14 @@
using System; using System;
using System.IO; using System.IO;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Delivery;
using AmagnoVirtualPrinter.Logging;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Delivery; using AmagnoVirtualPrinter.Utils;
using VirtualPrinter.Logging;
using VirtualPrinter.Utils;
namespace VirtualPrinter.Agent.Lib.Misc namespace AmagnoVirtualPrinter.Agent.Lib.Misc
{ {
public class JobRedirector : IJobRedirector public class JobRedirector : IJobRedirector
{ {

7
Common/VirtualPrinter.Agent.Lib/Misc/JobService.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Misc/JobService.cs
View file

@ -1,12 +1,13 @@
using System; using System;
using System.IO; using System.IO;
using System.Printing; using System.Printing;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core.Model;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
namespace VirtualPrinter.Agent.Lib.Misc namespace AmagnoVirtualPrinter.Agent.Lib.Misc
{ {
public class JobService : IJobService public class JobService : IJobService
{ {

19
Common/VirtualPrinter.Agent.Lib/Misc/VirtualTcpInputPrinter.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Misc/VirtualTcpInputPrinter.cs
View file

@ -5,14 +5,15 @@ using System.IO;
using System.Net; using System.Net;
using System.Net.Sockets; using System.Net.Sockets;
using System.Threading; using System.Threading;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core.Model;
using AmagnoVirtualPrinter.Logging;
using AmagnoVirtualPrinter.SetupDriver;
using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Agent.Core; namespace AmagnoVirtualPrinter.Agent.Lib.Misc
using VirtualPrinter.Logging;
using VirtualPrinter.SetupDriver;
namespace VirtualPrinter.Agent.Lib.Misc
{ {
public class VirtualTcpInputPrinter : IVirtualPrinter public class AmagnoVirtualTcpInputPrinter : IAmagnoVirtualPrinter
{ {
[NotNull] [NotNull]
private readonly IRegistryRepository _registryRepository; private readonly IRegistryRepository _registryRepository;
@ -24,7 +25,7 @@ namespace VirtualPrinter.Agent.Lib.Misc
private readonly IJobService _jobService; private readonly IJobService _jobService;
[NotNull] [NotNull]
private readonly IVirtualPrinterLogger<VirtualTcpInputPrinter> _logger; private readonly IVirtualPrinterLogger<AmagnoVirtualTcpInputPrinter> _logger;
[NotNull] [NotNull]
private readonly IJobProcessor _jobProcessor; private readonly IJobProcessor _jobProcessor;
@ -33,10 +34,10 @@ namespace VirtualPrinter.Agent.Lib.Misc
private FileSystemWatcher _watcher; private FileSystemWatcher _watcher;
public VirtualTcpInputPrinter public AmagnoVirtualTcpInputPrinter
( (
[NotNull]IRegistryRepository registryRepository, [NotNull]IRegistryRepository registryRepository,
[NotNull]IVirtualPrinterLogger<VirtualTcpInputPrinter> logger, [NotNull]IVirtualPrinterLogger<AmagnoVirtualTcpInputPrinter> logger,
[NotNull]IJobFactory jobFactory, [NotNull]IJobFactory jobFactory,
[NotNull]IJobService jobService, [NotNull]IJobService jobService,
[NotNull]IJobProcessor jobProcessor, [NotNull]IJobProcessor jobProcessor,

4
Common/VirtualPrinter.Agent.Lib/Model/ProgressUpdateArgs.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Model/ProgressUpdateArgs.cs
View file

@ -2,9 +2,9 @@
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core.Interfaces; using AmagnoVirtualPrinter.Agent.Core.Interfaces;
namespace VirtualPrinter.Agent.Lib.Model namespace AmagnoVirtualPrinter.Agent.Lib.Model
{ {
public class ProgressUpdateArgs : EventArgs public class ProgressUpdateArgs : EventArgs
{ {

4
Common/VirtualPrinter.Agent.Lib/Properties/AssemblyInfo.cs → Common/AmagnoVirtualPrinter.Agent.Lib/Properties/AssemblyInfo.cs
View file

@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("VirtualPrinter.Agent.Lib")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.Agent.Lib")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

4
Common/VirtualPrinter.Logging/VirtualPrinter.Logging.csproj → Common/AmagnoVirtualPrinter.Logging/AmagnoVirtualPrinter.Logging.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{AA25364D-22D5-44B0-86A5-6FB14C686308}</ProjectGuid> <ProjectGuid>{AA25364D-22D5-44B0-86A5-6FB14C686308}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualPrinter.Logging</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.Logging</RootNamespace>
<AssemblyName>VirtualPrinter.Logging</AssemblyName> <AssemblyName>AmagnoVirtualPrinter.Logging</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>

2
Common/VirtualPrinter.Logging/IVirtualPrinterLogger.cs → Common/AmagnoVirtualPrinter.Logging/IVirtualPrinterLogger.cs
View file

@ -2,7 +2,7 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Logging namespace AmagnoVirtualPrinter.Logging
{ {
// ReSharper disable once UnusedTypeParameter // ReSharper disable once UnusedTypeParameter
public interface IVirtualPrinterLogger<out T> : IVirtualPrinterLogger public interface IVirtualPrinterLogger<out T> : IVirtualPrinterLogger

2
Common/VirtualPrinter.Logging/LoggerModule.cs → Common/AmagnoVirtualPrinter.Logging/LoggerModule.cs
View file

@ -1,7 +1,7 @@
using Autofac; using Autofac;
using Autofac.Extras.NLog; using Autofac.Extras.NLog;
namespace VirtualPrinter.Logging namespace AmagnoVirtualPrinter.Logging
{ {
public class LoggerModule : Module public class LoggerModule : Module
{ {

0
Common/VirtualPrinter.Logging/NLog.config → Common/AmagnoVirtualPrinter.Logging/NLog.config
View file

4
Common/VirtualPrinter.Logging/Properties/AssemblyInfo.cs → Common/AmagnoVirtualPrinter.Logging/Properties/AssemblyInfo.cs
View file

@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("VirtualPrinter.Logging")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.Logging")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

2
Common/VirtualPrinter.Logging/VirtualPrinterLogger.cs → Common/AmagnoVirtualPrinter.Logging/VirtualPrinterLogger.cs
View file

@ -7,7 +7,7 @@ using JetBrains.Annotations;
using NLog; using NLog;
namespace VirtualPrinter.Logging namespace AmagnoVirtualPrinter.Logging
{ {
public class VirtualPrinterLogger<T> : VirtualPrinterLogger, IVirtualPrinterLogger<T> public class VirtualPrinterLogger<T> : VirtualPrinterLogger, IVirtualPrinterLogger<T>
{ {

16
Common/VirtualPrinter.Utils/VirtualPrinter.Utils.csproj → Common/AmagnoVirtualPrinter.Utils/AmagnoVirtualPrinter.Utils.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{CD1C8E9D-5335-41AC-B0C0-88FD7C7C55F3}</ProjectGuid> <ProjectGuid>{CD1C8E9D-5335-41AC-B0C0-88FD7C7C55F3}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualPrinter.Utils</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.Utils</RootNamespace>
<AssemblyName>VirtualPrinter.Utils</AssemblyName> <AssemblyName>AmagnoVirtualPrinter.Utils</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
@ -51,13 +51,13 @@
<Compile Include="Windows.cs" /> <Compile Include="Windows.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VirtualPrinter.Agent.Core\VirtualPrinter.Agent.Core.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Agent.Core\AmagnoVirtualPrinter.Agent.Core.csproj">
<Project>{135C85EB-2116-4CC4-8CCB-B6804B9D6467}</Project> <Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project>
<Name>VirtualPrinter.Agent.Core</Name> <Name>AmagnoVirtualPrinter.Agent.Core</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj">
<Project>{AA25364D-22D5-44B0-86A5-6FB14C686308}</Project> <Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project>
<Name>VirtualPrinter.Logging</Name> <Name>AmagnoVirtualPrinter.Logging</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
Common/VirtualPrinter.Utils/Consts.cs → Common/AmagnoVirtualPrinter.Utils/Consts.cs
View file

@ -1,11 +1,11 @@
namespace VirtualPrinter.Utils namespace AmagnoVirtualPrinter.Utils
{ {
public struct Files public struct Files
{ {
public const string FILES = @"Files"; public const string FILES = @"Files";
public const string PRINTER_SERVICE_EXE = "VPDAgent.exe"; public const string PRINTER_SERVICE_EXE = "AmagnoPrinterAgent.exe";
public const string SETUP_DRIVER_EXE = "setupdrv.exe"; public const string SETUP_DRIVER_EXE = "setupdrv.exe";
public const string AGENT_PROGRESS_EXE = "VPDAgentProgress.exe"; public const string AGENT_PROGRESS_EXE = "AmagnoPrinterAgentProgress.exe";
public const string DILIVERY_EXE = "delivery.exe"; public const string DILIVERY_EXE = "delivery.exe";
public const string LICENCE_FILE = "LICENSE.rtf"; public const string LICENCE_FILE = "LICENSE.rtf";
public const string PRE_CONVERTER = @"C:\Program Files (x86)\MyPreConverter.exe ARG"; public const string PRE_CONVERTER = @"C:\Program Files (x86)\MyPreConverter.exe ARG";

6
Common/VirtualPrinter.Utils/DirectoryHelper.cs → Common/AmagnoVirtualPrinter.Utils/DirectoryHelper.cs
View file

@ -1,8 +1,8 @@
using System.IO; using System.IO;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Agent.Core; namespace AmagnoVirtualPrinter.Utils
namespace VirtualPrinter.Utils
{ {
public class DirectoryHelper : IDirectoryHelper public class DirectoryHelper : IDirectoryHelper
{ {

4
Common/VirtualPrinter.Utils/Properties/AssemblyInfo.cs → Common/AmagnoVirtualPrinter.Utils/Properties/AssemblyInfo.cs
View file

@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("VirtualPrinter.Utils")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.Utils")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

9
Common/VirtualPrinter.Utils/RegistryRepository.cs → Common/AmagnoVirtualPrinter.Utils/RegistryRepository.cs
View file

@ -1,15 +1,16 @@
using System; using System;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using AmagnoVirtualPrinter.Agent.Core.Enums;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core.Model;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.Win32; using Microsoft.Win32;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Agent.Core.Enums;
namespace VirtualPrinter.Utils namespace AmagnoVirtualPrinter.Utils
{ {
public class RegistryRepository : IRegistryRepository public class RegistryRepository : IRegistryRepository
{ {

8
Common/VirtualPrinter.Utils/Shell.cs → Common/AmagnoVirtualPrinter.Utils/Shell.cs
View file

@ -2,13 +2,13 @@
using System.IO; using System.IO;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Logging;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core;
using VirtualPrinter.Logging;
namespace VirtualPrinter.Utils namespace AmagnoVirtualPrinter.Utils
{ {
public class Shell : IShell public class Shell : IShell
{ {

2
Common/VirtualPrinter.Utils/Win32Sys.cs → Common/AmagnoVirtualPrinter.Utils/Win32Sys.cs
View file

@ -9,7 +9,7 @@ using JetBrains.Annotations;
using Microsoft.Win32.SafeHandles; using Microsoft.Win32.SafeHandles;
namespace VirtualPrinter.Utils namespace AmagnoVirtualPrinter.Utils
{ {
[SuppressMessage("ReSharper", "InconsistentNaming")] [SuppressMessage("ReSharper", "InconsistentNaming")]
[SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Global")] [SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Global")]

2
Common/VirtualPrinter.Utils/Windows.cs → Common/AmagnoVirtualPrinter.Utils/Windows.cs
View file

@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.Utils namespace AmagnoVirtualPrinter.Utils
{ {
public class Windows public class Windows
{ {

8
Common/VirtualPrinter.Agent.Core/Interfaces/IVirtualPrinterService.cs
View file

@ -1,8 +0,0 @@
namespace VirtualPrinter.Agent.Core
{
public interface IVirtualPrinterService
{
void Start();
void Stop();
}
}

27
Common/VirtualPrinter.Agent.Lib/VirtualPrinterService.cs
View file

@ -1,27 +0,0 @@
using JetBrains.Annotations;
using VirtualPrinter.Agent.Core;
namespace VirtualPrinter.Agent.Lib
{
public class VirtualPrinterService : IVirtualPrinterService
{
[NotNull]
private readonly IVirtualPrinter _printer;
public VirtualPrinterService([NotNull]IVirtualPrinter printer)
{
_printer = printer;
}
public void Start()
{
_printer.Init();
}
public void Stop()
{
_printer.Dispose();
}
}
}

12
Installer/VirtualPrinter.SetupDriver/VirtualPrinter.SetupDriver.csproj → Installer/AmagnoVirtualPrinter.SetupDriver/AmagnoVirtualPrinter.SetupDriver.csproj
View file

@ -6,7 +6,7 @@
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{12402F90-A2AE-4549-9142-F90650E2082A}</ProjectGuid> <ProjectGuid>{12402F90-A2AE-4549-9142-F90650E2082A}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<RootNamespace>VirtualPrinter.SetupDriver</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.SetupDriver</RootNamespace>
<AssemblyName>setupdrv</AssemblyName> <AssemblyName>setupdrv</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
@ -32,7 +32,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>VirtualPrinter.SetupDriver.Program</StartupObject> <StartupObject>AmagnoVirtualPrinter.SetupDriver.Program</StartupObject>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="System" /> <Reference Include="System" />
@ -46,13 +46,13 @@
<Compile Include="Windows.cs" /> <Compile Include="Windows.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Common\VirtualPrinter.Logging\VirtualPrinter.Logging.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Logging\AmagnoVirtualPrinter.Logging.csproj">
<Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project> <Project>{aa25364d-22d5-44b0-86a5-6fb14c686308}</Project>
<Name>VirtualPrinter.Logging</Name> <Name>AmagnoVirtualPrinter.Logging</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Common\VirtualPrinter.Utils\VirtualPrinter.Utils.csproj"> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Utils\AmagnoVirtualPrinter.Utils.csproj">
<Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project> <Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project>
<Name>VirtualPrinter.Utils</Name> <Name>AmagnoVirtualPrinter.Utils</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
Installer/VirtualPrinter.SetupDriver/Defaults.cs → Installer/AmagnoVirtualPrinter.SetupDriver/Defaults.cs
View file

@ -1,11 +1,11 @@
namespace VirtualPrinter.SetupDriver namespace AmagnoVirtualPrinter.SetupDriver
{ {
public static class Defaults public static class Defaults
{ {
/// <summary> /// <summary>
/// The name that appears in the Windows "Printer & Scanner" menu. /// The name that appears in the Windows "Printer & Scanner" menu.
/// </summary> /// </summary>
public const string PrinterName = "AMAGNO"; public const string PrinterName = "Amagno";
/// <summary> /// <summary>
/// The printer port. /// The printer port.

13
Installer/VirtualPrinter.SetupDriver/Program.cs → Installer/AmagnoVirtualPrinter.SetupDriver/Program.cs
View file

@ -1,15 +1,12 @@
using System; using System;
using System.IO; using System.IO;
using AmagnoVirtualPrinter.Logging;
using AmagnoVirtualPrinter.Utils;
using JetBrains.Annotations; using JetBrains.Annotations;
using static AmagnoVirtualPrinter.SetupDriver.Windows;
using static AmagnoVirtualPrinter.SetupDriver.Defaults;
using VirtualPrinter.Logging; namespace AmagnoVirtualPrinter.SetupDriver
using VirtualPrinter.Utils;
using static VirtualPrinter.SetupDriver.Windows;
using static VirtualPrinter.SetupDriver.Defaults;
namespace VirtualPrinter.SetupDriver
{ {
internal class Program internal class Program
{ {

6
Installer/VirtualPrinter.SetupDriver/Properties/AssemblyInfo.cs → Installer/AmagnoVirtualPrinter.SetupDriver/Properties/AssemblyInfo.cs
View file

@ -2,10 +2,10 @@
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
[assembly: AssemblyTitle("VirtualPrinter.SetupDriver")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.SetupDriver")]
[assembly: AssemblyDescription("The setup for the virtual printer driver")] [assembly: AssemblyDescription("The setup for the Amagno Printer Driver")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

6
Installer/VirtualPrinter.SetupDriver/Shell.cs → Installer/AmagnoVirtualPrinter.SetupDriver/Shell.cs
View file

@ -2,12 +2,10 @@
using System.Diagnostics; using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using AmagnoVirtualPrinter.Logging;
using JetBrains.Annotations; using JetBrains.Annotations;
using VirtualPrinter.Logging; namespace AmagnoVirtualPrinter.SetupDriver
namespace VirtualPrinter.SetupDriver
{ {
internal class Shell internal class Shell
{ {

2
Installer/VirtualPrinter.SetupDriver/Windows.cs → Installer/AmagnoVirtualPrinter.SetupDriver/Windows.cs
View file

@ -2,7 +2,7 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.SetupDriver namespace AmagnoVirtualPrinter.SetupDriver
{ {
internal static class Windows internal static class Windows
{ {

36
Installer/VirtualPrinter.WixSharpInstaller/VirtualPrinter.WixSharpInstaller.csproj → Installer/AmagnoVirtualPrinter.WixSharpInstaller/AmagnoVirtualPrinter.WixSharpInstaller.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{A668846E-54C7-483D-9CF7-48F77EA398CA}</ProjectGuid> <ProjectGuid>{A668846E-54C7-483D-9CF7-48F77EA398CA}</ProjectGuid>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualPrinter.WixSharpInstaller</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.WixSharpInstaller</RootNamespace>
<AssemblyName>VPDInstaller</AssemblyName> <AssemblyName>AmagnoPrinterInstaller</AssemblyName>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic> <Deterministic>true</Deterministic>
<NuGetPackageImportStamp> <NuGetPackageImportStamp>
@ -36,7 +36,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<StartupObject>VirtualPrinter.WixSharpInstaller.Script</StartupObject> <StartupObject>AmagnoVirtualPrinter.WixSharpInstaller.Script</StartupObject>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@ -46,12 +46,6 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<None Include="wix\$(ProjectName).g.wxs" /> <None Include="wix\$(ProjectName).g.wxs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\VirtualPrinter.Utils\VirtualPrinter.Utils.csproj">
<Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project>
<Name>VirtualPrinter.Utils</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" /> <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<PackageReference Include="WixSharp.bin" Version="1.14.8" /> <PackageReference Include="WixSharp.bin" Version="1.14.8" />
@ -60,13 +54,19 @@
<ItemGroup> <ItemGroup>
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ItemGroup>
<!-- <Import Project="..\..\packages\WixSharp.bin\1.14.8\build\WixSharp.bin.targets" Condition="Exists('..\..\packages\WixSharp.bin\1.14.8\build\WixSharp.bin.targets')" />--> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Utils\AmagnoVirtualPrinter.Utils.csproj">
<!-- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">--> <Project>{cd1c8e9d-5335-41ac-b0c0-88fd7c7c55f3}</Project>
<!-- <PropertyGroup>--> <Name>AmagnoVirtualPrinter.Utils</Name>
<!-- <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>--> </ProjectReference>
<!-- </PropertyGroup>--> </ItemGroup>
<!-- <Error Condition="!Exists('..\..\packages\WixSharp.bin\1.14.8\build\WixSharp.bin.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixSharp.bin\1.14.8\build\WixSharp.bin.targets'))" />--> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- <Error Condition="!Exists('..\..\packages\WixSharp\1.14.8\build\WixSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixSharp\1.14.8\build\WixSharp.targets'))" />--> <!-- <Import Project="..\..\packages\WixSharp.bin\1.14.8\build\WixSharp.bin.targets" Condition="Exists('..\..\packages\WixSharp.bin\1.14.8\build\WixSharp.bin.targets')" />-->
<!-- </Target>--> <!-- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">-->
<!-- <PropertyGroup>-->
<!-- <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>-->
<!-- </PropertyGroup>-->
<!-- <Error Condition="!Exists('..\..\packages\WixSharp.bin\1.14.8\build\WixSharp.bin.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixSharp.bin\1.14.8\build\WixSharp.bin.targets'))" />-->
<!-- <Error Condition="!Exists('..\..\packages\WixSharp\1.14.8\build\WixSharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixSharp\1.14.8\build\WixSharp.targets'))" />-->
<!-- </Target>-->
</Project> </Project>

4
Installer/VirtualPrinter.WixSharpInstaller/Properties/AssemblyInfo.cs → Installer/AmagnoVirtualPrinter.WixSharpInstaller/Properties/AssemblyInfo.cs
View file

@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following // General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information // set of attributes. Change these attribute values to modify the information
// associated with an assembly. // associated with an assembly.
[assembly: AssemblyTitle("VirtualPrinter.WixSharpInstaller")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.WixSharpInstaller")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

62
Installer/VirtualPrinter.WixSharpInstaller/Script.cs → Installer/AmagnoVirtualPrinter.WixSharpInstaller/Script.cs
View file

@ -5,20 +5,19 @@ using System.Diagnostics;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Windows.Forms; using System.Windows.Forms;
using AmagnoVirtualPrinter.Utils;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.Deployment.WindowsInstaller; using Microsoft.Deployment.WindowsInstaller;
using Microsoft.Win32; using Microsoft.Win32;
using VirtualPrinter.Utils;
using WixSharp; using WixSharp;
using Action = WixSharp.Action; using Action = WixSharp.Action;
using File = WixSharp.File; using File = WixSharp.File;
using Files = VirtualPrinter.Utils.Files; using Files = AmagnoVirtualPrinter.Utils.Files;
using Keys = VirtualPrinter.Utils.Keys; using Keys = AmagnoVirtualPrinter.Utils.Keys;
using RegistryHive = WixSharp.RegistryHive; using RegistryHive = WixSharp.RegistryHive;
namespace VirtualPrinter.WixSharpInstaller namespace AmagnoVirtualPrinter.WixSharpInstaller
{ {
public class Script public class Script
{ {
@ -45,13 +44,13 @@ namespace VirtualPrinter.WixSharpInstaller
throw new ArgumentException("Argument for working directory (/p) not set."); throw new ArgumentException("Argument for working directory (/p) not set.");
} }
_filesDir = Path.Combine(workingDir, Files.FILES); _filesDir = Path.Combine(workingDir, Utils.Files.FILES);
var feature = new Feature("VPD"); var feature = new Feature("AmagnoPrinter");
var printerServiceFile = new File(feature, Path.Combine(_filesDir, Files.PRINTER_SERVICE_EXE)) var printerServiceFile = new File(feature, Path.Combine(_filesDir, Utils.Files.PRINTER_SERVICE_EXE))
{ {
ServiceInstaller = new ServiceInstaller ServiceInstaller = new ServiceInstaller
{ {
Name = "VirtualPrinterService", Name = "AmagnoPrinterService",
StartOn = SvcEvent.Install_Wait, StartOn = SvcEvent.Install_Wait,
StopOn = SvcEvent.InstallUninstall_Wait, StopOn = SvcEvent.InstallUninstall_Wait,
RemoveOn = SvcEvent.Uninstall_Wait, RemoveOn = SvcEvent.Uninstall_Wait,
@ -60,14 +59,14 @@ namespace VirtualPrinter.WixSharpInstaller
} }
}; };
var project = new ManagedProject("VPDInstaller") var project = new ManagedProject("AmagnoPrinterInstaller")
{ {
Name = "Virtual Printer Driver", Name = "Amagno Printer",
GUID = new Guid("8712D2CD-A9F6-456F-99C8-92C2BB070596"), GUID = new Guid("8712D2CD-A9F6-456F-99C8-92C2BB070596"),
UpgradeCode = new Guid("0B37A935-EDEC-4ACA-9307-6D8299496C1D"), UpgradeCode = new Guid("0B37A935-EDEC-4ACA-9307-6D8299496C1D"),
UI = WUI.WixUI_InstallDir, UI = WUI.WixUI_InstallDir,
Version = Version.Parse(FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion), Version = Version.Parse(FileVersionInfo.GetVersionInfo(System.Reflection.Assembly.GetExecutingAssembly().Location).FileVersion),
LicenceFile = Path.Combine(workingDir, Files.LICENCE_FILE), LicenceFile = Path.Combine(workingDir, Utils.Files.LICENCE_FILE),
Dirs = CreateProjectDirs(feature, printerServiceFile), Dirs = CreateProjectDirs(feature, printerServiceFile),
Actions = CreateActions(), Actions = CreateActions(),
RegValues = CreateRegValues(feature).ToArray(), RegValues = CreateRegValues(feature).ToArray(),
@ -107,7 +106,7 @@ namespace VirtualPrinter.WixSharpInstaller
return; return;
} }
MessageBox.Show("gsNotFound"); MessageBox.Show(gsNotFound);
e.Result = ActionResult.Failure; e.Result = ActionResult.Failure;
} }
@ -124,9 +123,9 @@ namespace VirtualPrinter.WixSharpInstaller
( (
@"%ProgramFiles%\MyPrinterDriver\", @"%ProgramFiles%\MyPrinterDriver\",
new DirFiles(feature, _filesDir + @"\*", s => !s.EndsWith(".exe")), new DirFiles(feature, _filesDir + @"\*", s => !s.EndsWith(".exe")),
new File(new Id(SetupDriverId), feature, Path.Combine(_filesDir, Files.SETUP_DRIVER_EXE)), new File(new Id(SetupDriverId), feature, Path.Combine(_filesDir, Utils.Files.SETUP_DRIVER_EXE)),
new File(feature, Path.Combine(_filesDir, Files.DILIVERY_EXE)), new File(feature, Path.Combine(_filesDir, Utils.Files.DILIVERY_EXE)),
new File(feature, Path.Combine(_filesDir, Files.AGENT_PROGRESS_EXE)), new File(feature, Path.Combine(_filesDir, Utils.Files.AGENT_PROGRESS_EXE)),
printerServiceFile printerServiceFile
) )
}; };
@ -145,7 +144,7 @@ namespace VirtualPrinter.WixSharpInstaller
[NotNull] [NotNull]
private static IEnumerable<RegValue> CreateRegValues(Feature feature) private static IEnumerable<RegValue> CreateRegValues(Feature feature)
{ {
var converterKey = $@"{Keys.PRINTER_DRIVER_KEY32}\{Keys.CONVERTER_KEY}"; var converterKey = $@"{Utils.Keys.PRINTER_DRIVER_KEY32}\{Utils.Keys.CONVERTER_KEY}";
var regValues = new List<RegValue>(); var regValues = new List<RegValue>();
regValues.AddRange(CreateLocalMachineValues(feature, converterKey)); regValues.AddRange(CreateLocalMachineValues(feature, converterKey));
@ -157,17 +156,15 @@ namespace VirtualPrinter.WixSharpInstaller
[NotNull] [NotNull]
private static IEnumerable<RegValue> CreateLocalMachineValues(Feature feature, string converterKey) private static IEnumerable<RegValue> CreateLocalMachineValues(Feature feature, string converterKey)
{ {
var postConverterKey = $@"{Keys.PRINTER_DRIVER_KEY32}\{Keys.POSTCONVERTER_KEY}"; var postConverterKey = $@"{Utils.Keys.PRINTER_DRIVER_KEY32}\{Utils.Keys.POSTCONVERTER_KEY}";
var preConverterKey = $@"{Keys.PRINTER_DRIVER_KEY32}\{Keys.PRECONVERTER_KEY}"; var preConverterKey = $@"{Utils.Keys.PRINTER_DRIVER_KEY32}\{Utils.Keys.PRECONVERTER_KEY}";
var converterPdfKey = $@"{Keys.PRINTER_DRIVER_KEY32}\{Keys.CONVERTER_PDF_KEY}"; var converterPdfKey = $@"{Utils.Keys.PRINTER_DRIVER_KEY32}\{Utils.Keys.CONVERTER_PDF_KEY}";
var converterTiffKey = $@"{Keys.PRINTER_DRIVER_KEY32}\{Keys.CONVERTER_TIFF_KEY}"; var converterTiffKey = $@"{Utils.Keys.PRINTER_DRIVER_KEY32}\{Utils.Keys.CONVERTER_TIFF_KEY}";
var registryHive = RegistryHive.LocalMachine; var registryHive = RegistryHive.LocalMachine;
return new List<RegValue> var result = new List<RegValue>
{ {
new RegValue(feature, registryHive, Keys.PRINTER_DRIVER_KEY32, KeyNames.INSTALLATION_DIR, "[INSTALLDIR]"), new RegValue(feature, registryHive, Utils.Keys.PRINTER_DRIVER_KEY32, KeyNames.INSTALLATION_DIR, "[INSTALLDIR]"),
new RegValue(feature, registryHive, postConverterKey, KeyNames.EXECUTABLE_FILE, Files.POST_CONVERTER),
new RegValue(feature, registryHive, preConverterKey, KeyNames.EXECUTABLE_FILE, Files.PRE_CONVERTER),
new RegValue(feature, registryHive, converterKey, KeyNames.SERVER_PORT, 9101) {AttributesDefinition = "Type=integer"}, new RegValue(feature, registryHive, converterKey, KeyNames.SERVER_PORT, 9101) {AttributesDefinition = "Type=integer"},
new RegValue(feature, registryHive, converterKey, KeyNames.THREADS, 2), new RegValue(feature, registryHive, converterKey, KeyNames.THREADS, 2),
new RegValue(feature, registryHive, converterKey, KeyNames.SHOW_PROGRESS, 1) {AttributesDefinition = "Type=integer"}, new RegValue(feature, registryHive, converterKey, KeyNames.SHOW_PROGRESS, 1) {AttributesDefinition = "Type=integer"},
@ -187,6 +184,21 @@ namespace VirtualPrinter.WixSharpInstaller
new RegValue(feature, registryHive, converterTiffKey, KeyNames.MULTIPAGE, 1) {AttributesDefinition = "Type=integer"}, new RegValue(feature, registryHive, converterTiffKey, KeyNames.MULTIPAGE, 1) {AttributesDefinition = "Type=integer"},
new RegValue(feature, registryHive, converterTiffKey, KeyNames.COMPRESSION, 8) new RegValue(feature, registryHive, converterTiffKey, KeyNames.COMPRESSION, 8)
}; };
var registryView = Environment.Is64BitOperatingSystem ? RegistryView.Registry64 : RegistryView.Registry32;
var addPostConverterKey = RegistryKey.OpenBaseKey(Microsoft.Win32.RegistryHive.LocalMachine, registryView).OpenSubKey(postConverterKey) == null;
var addPreConverterKey = RegistryKey.OpenBaseKey(Microsoft.Win32.RegistryHive.LocalMachine, registryView).OpenSubKey(preConverterKey) == null;
if (addPostConverterKey)
{
result.Add(new RegValue(feature, registryHive, postConverterKey, KeyNames.EXECUTABLE_FILE, Files.POST_CONVERTER));
}
if (addPreConverterKey)
{
result.Add(new RegValue(feature, registryHive, preConverterKey, KeyNames.EXECUTABLE_FILE, Files.PRE_CONVERTER));
}
return result;
} }
[NotNull] [NotNull]

0
Installer/VirtualPrinter.WixSharpInstaller/app.config → Installer/AmagnoVirtualPrinter.WixSharpInstaller/app.config
View file

18
README.md
View file

@ -1,13 +1,13 @@
# VirtualPrinterDriver # AmagnoVirtualPrinter
## Description ## Description
The _VirtualPrinterDriver_ is an interface which forwards any print job given from a specified printer, to a specified application that processes the 'print job'. The _AmagnoVirtualPrinter_ is an interface which forwards any print job given from a specified printer, to a specified application that processes the 'print job'.
There are two ways of using the _VirtualPrinterDriver_: There are two ways of using the _AmagnoVirtualPrinter_:
1. If you just want to install the driver build the project in release mode, navigate to the folder _VirtualPrinter.WixSharpinstaller_ and execute the created .msi file. After the installation, a new printer, with the name set in _Defaults.cs_, can be located under _Printer & Scanner_ in the Microsoft® Windows settings. 1. If you just want to install the driver build the project in release mode, navigate to the folder _VirtualPrinter.WixSharpinstaller_ and execute the created .msi file. After the installation, a new printer, with the name set in _Defaults.cs_, can be located under _Printer & Scanner_ in the Microsoft® Windows settings.
2. To debug the _VirtualPrinterDriver_, follow step one. After the installation, go to _Windows Services_ and stop _VirtualPrinterService_. In Visual Studio, select VirtualPrinter.Agent.Console as startup project and run in debug mode. To start a test print (and debug the solution) start PowerShell or cmd and navigate to the root folder of the repository. Go to `Files` and run `.\setupdrv.exe test`, which will create a test page and send it to the virtual printer. Or just print any document you want to. 2. To debug the _AmagnoVirtualPrinter_, follow step one. After the installation, go to _Windows Services_ and stop _AmagnoPrinterService_. In Visual Studio, select AmagnoVirtualPrinter.Agent.Console as startup project and run in debug mode. To start a test print (and debug the solution) start PowerShell or cmd and navigate to the root folder of the repository. Go to `Files` and run `.\setupdrv.exe test`, which will create a test page and send it to the virtual printer. Or just print any document you want to.
## Table of Contents ## Table of Contents
@ -23,18 +23,18 @@ There are two ways of using the _VirtualPrinterDriver_:
### From MSI ### From MSI
If you want to use the official installer, you can download it [here](https://link). Make sure to run the installer with extended rights. After installation, you may need to [configure](#configure) the _VirutalPrinterDriver_. If you want to use the official installer, you can download it [here](https://link). Make sure to run the installer with extended rights. After installation, you may need to [configure](#configure) the _AmagnoVirtualPrinter_.
After installation, a new printer with the name set in _Defaults.cs_ can be located under _Printer & Scanner_ in the Microsoft® Windows settings. After installation, a new printer with the name set in _Defaults.cs_ can be located under _Printer & Scanner_ in the Microsoft® Windows settings.
### From Source ### From Source
#### **_Dependencies_** #### **_Dependencies_**
To compile the installer, please make sure you Wix Toolset is installed. The [WixSharp library](https://github.com/oleg-shilo/wixsharp) is used to define the package in `VirtualPrinter.WixSharpInstaller`. To compile the installer, please make sure you Wix Toolset is installed. The [WixSharp library](https://github.com/oleg-shilo/wixsharp) is used to define the package in `AmagnoVirtualPrinter.WixSharpInstaller`.
#### **_Create MSI package_** #### **_Create MSI package_**
To install the driver from source, build the project in release mode. When the build is run successfully, open up powershell and navigate to `C:\[Git]\VirtualPrinterDriver\Files`. Then run the `VPDInstaller.exe "/MSBUILD:C:\[Git]\VirtualPrinterDriver\Installer\VirtualPrinter.WixSharpInstaller" "/p:C:\[Git]\VirutalPrinterDriver\"` where `/p:` is the output directory for the msi and working directory for the WixSharp project. Make sure the given working directory contains a `Files` folder with all binaries needed for _VirtualPrinterDriver_. This command will use WixSharp to create the msi package right next to the VPDInstaller.exe called **VPDInstaller.msi**. To install the driver from source, build the project in release mode. When the build is run successfully, open up powershell and navigate to `C:\[Git]\AmagnoVirtualPrinter\Files`. Then run the `AmagnoPrinterInstaller.exe "/MSBUILD:C:\[Git]\AmagnoVirtualPrinter\Installer\AmagnoVirtualPrinter.WixSharpInstaller" "/p:C:\[Git]\AmagnoVirtualPrinter\"` where `/p:` is the output directory for the msi and working directory for the WixSharp project. Make sure the given working directory contains a `Files` folder with all binaries needed for _AmagnoVirtualPrinter_. This command will use WixSharp to create the msi package right next to the AmagnoPrinterInstaller.exe called **AmagnoPrinterInstaller.msi**.
Alternatively use `create_msi.ps1` which automates the building step above. Alternatively use `create_msi.ps1` which automates the building step above.
@ -44,13 +44,13 @@ Alternatively use `create_msi.ps1` which automates the building step above.
Make sure Ghostscript is installed on your machine. Make sure Ghostscript is installed on your machine.
While installing, several registry entries are inserted into `Computer\HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\vpd\`. The most important ones are those under the key `Application` While installing, several registry entries are inserted into `Computer\HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\AmagnoVirutalPrinter\`. The most important ones are those under the key `Application`
- **Pre-Converter:** Contains the exe to be executed (pre convert process) and the `arg` to be processed by the application (for example: `C:\Program Files\MyApp.exe PRINT`). - **Pre-Converter:** Contains the exe to be executed (pre convert process) and the `arg` to be processed by the application (for example: `C:\Program Files\MyApp.exe PRINT`).
- **Post-Converter:** Contains the exe to be executed (post convert process) and the args to be processed by the application (for example: `C:\Program Files\MyApp.exe PRINTCOMPLETE`). - **Post-Converter:** Contains the exe to be executed (post convert process) and the args to be processed by the application (for example: `C:\Program Files\MyApp.exe PRINTCOMPLETE`).
The `Converter` key defines the settings which are needed for the convert process, e.g. server port (9101 by default) and output directory for the converted prints, which can be processed by the application. If the value is set to an empty string, the default temp path will be used (e.g. `C:\temp\PrinterOuput`). The `Converter` key defines the settings which are needed for the convert process, e.g. server port (9101 by default) and output directory for the converted prints, which can be processed by the application. If the value is set to an empty string, the default temp path will be used (e.g. `C:\temp\PrinterOuput`).
### Debugging ### Debugging
To debug the _VirtualPrinterDriver_, run the msi. After installation, go to _Windows Services_ and stop the _VirtualPrinterService_. In your IDE, select the VirtualPrinter.Agent.Console as startup project and run in debug mode. To start a test print (and debug the solution) start PowerShell or cmd and navigate to the root folder of the repository. Go to `Files` and run `.\setupdrv.exe test`, which will create a test page and send it to the virtual printer. Or just print any document you want to. To debug the _AmagnoVirtualPrinter_, run the msi. After installation, go to _Windows Services_ and stop the _AmagnoPrinterService_. In your IDE, select the AmagnoVirtualPrinter.Agent.Console as startup project and run in debug mode. To start a test print (and debug the solution) start PowerShell or cmd and navigate to the root folder of the repository. Go to `Files` and run `.\setupdrv.exe test`, which will create a test page and send it to the virtual printer. Or just print any document you want to.
## License ## License

14
UI/VirtualPrinter.ProgressInfo.Autofac/VirtualPrinter.ProgressInfo.Autofac.csproj → UI/AmagnoVirtualPrinter.ProgressInfo.Autofac/AmagnoVirtualPrinter.ProgressInfo.Autofac.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{17E2CF8A-462C-4130-9FAF-F1CA5FC4E06D}</ProjectGuid> <ProjectGuid>{17E2CF8A-462C-4130-9FAF-F1CA5FC4E06D}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualPrinter.ProgressInfo.Autofac</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.ProgressInfo.Autofac</RootNamespace>
<AssemblyName>VirtualPrinter.ProgressInfo.Autofac</AssemblyName> <AssemblyName>AmagnoVirtualPrinter.ProgressInfo.Autofac</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
@ -42,13 +42,13 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\VirtualPrinter.ProgressInfo.Core\VirtualPrinter.ProgressInfo.Core.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.ProgressInfo.Core\AmagnoVirtualPrinter.ProgressInfo.Core.csproj">
<Project>{24D28558-C825-43E6-85D2-7C59F4A97698}</Project> <Project>{24d28558-c825-43e6-85d2-7c59f4a97698}</Project>
<Name>VirtualPrinter.ProgressInfo.Core</Name> <Name>AmagnoVirtualPrinter.ProgressInfo.Core</Name>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\VirtualPrinter.ProgressInfo.Lib\VirtualPrinter.ProgressInfo.Lib.csproj"> <ProjectReference Include="..\AmagnoVirtualPrinter.ProgressInfo.Lib\AmagnoVirtualPrinter.ProgressInfo.Lib.csproj">
<Project>{d66f55e5-b3f7-4c61-a4f2-b55c4d412e01}</Project> <Project>{d66f55e5-b3f7-4c61-a4f2-b55c4d412e01}</Project>
<Name>VirtualPrinter.ProgressInfo.Lib</Name> <Name>AmagnoVirtualPrinter.ProgressInfo.Lib</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

15
UI/VirtualPrinter.ProgressInfo.Autofac/ProgressInfoModule.cs → UI/AmagnoVirtualPrinter.ProgressInfo.Autofac/ProgressInfoModule.cs
View file

@ -1,12 +1,11 @@
using Autofac; using AmagnoVirtualPrinter.ProgressInfo.Core;
using AmagnoVirtualPrinter.ProgressInfo.Core.Message;
using AmagnoVirtualPrinter.ProgressInfo.Lib;
using AmagnoVirtualPrinter.ProgressInfo.Lib.Interfaces;
using AmagnoVirtualPrinter.ProgressInfo.Lib.Message;
using Autofac;
using VirtualPrinter.ProgressInfo.Core; namespace AmagnoVirtualPrinter.ProgressInfo.Autofac
using VirtualPrinter.ProgressInfo.Core.Message;
using VirtualPrinter.ProgressInfo.Lib;
using VirtualPrinter.ProgressInfo.Lib.Interfaces;
using VirtualPrinter.ProgressInfo.Lib.Message;
namespace VirtualPrinter.ProgressInfo.Autofac
{ {
public class ProgressInfoModule : Module public class ProgressInfoModule : Module
{ {

4
UI/VirtualPrinter.ProgressInfo.Autofac/Properties/AssemblyInfo.cs → UI/AmagnoVirtualPrinter.ProgressInfo.Autofac/Properties/AssemblyInfo.cs
View file

@ -4,10 +4,10 @@ using System.Runtime.InteropServices;
// Allgemeine Informationen über eine Assembly werden über die folgenden // Allgemeine Informationen über eine Assembly werden über die folgenden
// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
// die einer Assembly zugeordnet sind. // die einer Assembly zugeordnet sind.
[assembly: AssemblyTitle("VirtualPrinter.ProgressInfo.Autofac")] [assembly: AssemblyTitle("AmagnoVirtualPrinter.ProgressInfo.Autofac")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("Amagno")]
[assembly: AssemblyProduct("")] [assembly: AssemblyProduct("")]
[assembly: AssemblyCopyright("")] [assembly: AssemblyCopyright("")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]

14
UI/VirtualPrinter.ProgressInfo.Core/VirtualPrinter.ProgressInfo.Core.csproj → UI/AmagnoVirtualPrinter.ProgressInfo.Core/AmagnoVirtualPrinter.ProgressInfo.Core.csproj
View file

@ -7,8 +7,8 @@
<ProjectGuid>{24D28558-C825-43E6-85D2-7C59F4A97698}</ProjectGuid> <ProjectGuid>{24D28558-C825-43E6-85D2-7C59F4A97698}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>VirtualPrinter.ProgressInfo.Core</RootNamespace> <RootNamespace>AmagnoVirtualPrinter.ProgressInfo.Core</RootNamespace>
<AssemblyName>VirtualPrinter.ProgressInfo.Core</AssemblyName> <AssemblyName>AmagnoVirtualPrinter.ProgressInfo.Core</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
</PropertyGroup> </PropertyGroup>
@ -45,13 +45,13 @@
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\Common\VirtualPrinter.Agent.Core\VirtualPrinter.Agent.Core.csproj"> <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" />
<Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project>
<Name>VirtualPrinter.Agent.Core</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" /> <ProjectReference Include="..\..\Common\AmagnoVirtualPrinter.Agent.Core\AmagnoVirtualPrinter.Agent.Core.csproj">
<Project>{135c85eb-2116-4cc4-8ccb-b6804b9d6467}</Project>
<Name>AmagnoVirtualPrinter.Agent.Core</Name>
</ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

5
UI/VirtualPrinter.ProgressInfo.Core/IProgressInfo.cs → UI/AmagnoVirtualPrinter.ProgressInfo.Core/IProgressInfo.cs
View file

@ -1,6 +1,7 @@
using VirtualPrinter.Agent.Core; using AmagnoVirtualPrinter.Agent.Core.Interfaces;
using AmagnoVirtualPrinter.Agent.Core;
namespace VirtualPrinter.ProgressInfo.Core namespace AmagnoVirtualPrinter.ProgressInfo.Core
{ {
public interface IProgressInfo public interface IProgressInfo
{ {

6
UI/AmagnoVirtualPrinter.ProgressInfo.Core/Message/IFinal.cs Normal file
View file

@ -0,0 +1,6 @@
namespace AmagnoVirtualPrinter.ProgressInfo.Core.Message
{
public interface IFinal : IMessage
{
}
}

6
UI/AmagnoVirtualPrinter.ProgressInfo.Core/Message/IMessage.cs Normal file
View file

@ -0,0 +1,6 @@
namespace AmagnoVirtualPrinter.ProgressInfo.Core.Message
{
public interface IMessage
{
}
}

2
UI/VirtualPrinter.ProgressInfo.Core/Message/IMessageFactory.cs → UI/AmagnoVirtualPrinter.ProgressInfo.Core/Message/IMessageFactory.cs
View file

@ -1,6 +1,6 @@
using JetBrains.Annotations; using JetBrains.Annotations;
namespace VirtualPrinter.ProgressInfo.Core.Message namespace AmagnoVirtualPrinter.ProgressInfo.Core.Message
{ {
public interface IMessageFactory public interface IMessageFactory
{ {

6
UI/AmagnoVirtualPrinter.ProgressInfo.Core/Message/IStart.cs Normal file
View file

@ -0,0 +1,6 @@
namespace AmagnoVirtualPrinter.ProgressInfo.Core.Message
{
public interface IStart : IMessage
{
}
}

2
UI/VirtualPrinter.ProgressInfo.Core/Message/IStep.cs → UI/AmagnoVirtualPrinter.ProgressInfo.Core/Message/IStep.cs
View file

@ -1,4 +1,4 @@
namespace VirtualPrinter.ProgressInfo.Core.Message namespace AmagnoVirtualPrinter.ProgressInfo.Core.Message
{ {
public interface IStep : IMessage public interface IStep : IMessage
{ {

Some files were not shown because too many files have changed in this diff Show more