cyanfish/naps2
1
1
Fork 0
mirror of https://github.com/cyanfish/naps2.git synced 2024-11-13 06:27:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move WinForms entry points to NAPS2.Lib.WinForms

Browse Source
This commit is contained in:
Ben Olden-Cooligan 2019-04-20 19:52:02 -04:00
parent 3f942e6c79
commit 369637d1ef
10 changed files with 58 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NAPS2.App.Server/NAPS2.App.Server.csproj
View File

@ -129,6 +129,10 @@
<Project>{4d349529-149b-498b-8a55-373e6a67e1f0}</Project>
<Name>NAPS2.Lib.Common</Name>
</ProjectReference>
<ProjectReference Include="..\NAPS2.Lib.WinForms\NAPS2.Lib.WinForms.csproj">
<Project>{95a03b74-a235-42a4-a433-e3884e180be4}</Project>
<Name>NAPS2.Lib.WinForms</Name>
</ProjectReference>
<ProjectReference Include="..\NAPS2.Sdk\NAPS2.Sdk.csproj">
<Project>{968378fa-a649-4058-a928-1fcd97b23070}</Project>
<Name>NAPS2.Sdk</Name>

4
NAPS2.App.Worker/NAPS2.App.Worker.csproj
View File

@ -106,6 +106,10 @@
<Project>{4d349529-149b-498b-8a55-373e6a67e1f0}</Project>
<Name>NAPS2.Lib.Common</Name>
</ProjectReference>
<ProjectReference Include="..\NAPS2.Lib.WinForms\NAPS2.Lib.WinForms.csproj">
<Project>{95a03b74-a235-42a4-a433-e3884e180be4}</Project>
<Name>NAPS2.Lib.WinForms</Name>
</ProjectReference>
<ProjectReference Include="..\NAPS2.Sdk\NAPS2.Sdk.csproj">
<Project>{968378fa-a649-4058-a928-1fcd97b23070}</Project>
<Name>NAPS2.Sdk</Name>

4
NAPS2.Lib.Common/NAPS2.Lib.Common.csproj
View File

@ -76,18 +76,14 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="EntryPoints\ServerEntryPoint.cs" />
<Compile Include="EntryPoints\WorkerEntryPoint.cs" />
<Compile Include="Modules\CommonModule.cs" />
<Compile Include="Modules\StaticDefaultsModule.cs" />
<Compile Include="Modules\WinFormsModule.cs" />
<Compile Include="NinjectEmailProviderFactory.cs" />
<Compile Include="NinjectFormFactory.cs" />
<Compile Include="NinjectOperationFactory.cs" />
<Compile Include="NinjectScanDriverFactory.cs" />
<Compile Include="NLogLogger.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="EntryPoints\WinFormsEntryPoint.cs" />
<Compile Include="StaticConfiguration.cs" />
</ItemGroup>
<ItemGroup>

0
NAPS2.Lib.Common/EntryPoints/ServerEntryPoint.cs → NAPS2.Lib.WinForms/EntryPoints/ServerEntryPoint.cs
View File

0
NAPS2.Lib.Common/EntryPoints/WinFormsEntryPoint.cs → NAPS2.Lib.WinForms/EntryPoints/WinFormsEntryPoint.cs
View File

0
NAPS2.Lib.Common/EntryPoints/WorkerEntryPoint.cs → NAPS2.Lib.WinForms/EntryPoints/WorkerEntryPoint.cs
View File

0
NAPS2.Lib.Common/Modules/WinFormsModule.cs → NAPS2.Lib.WinForms/Modules/WinFormsModule.cs
View File

31
NAPS2.Lib.WinForms/NAPS2.Lib.WinForms.csproj
View File

@ -12,6 +12,8 @@
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@ -31,8 +33,22 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Grpc.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
<HintPath>..\packages\Grpc.Core.1.19.0\lib\net45\Grpc.Core.dll</HintPath>
</Reference>
<Reference Include="Grpc.Core.Api, Version=0.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
<HintPath>..\packages\Grpc.Core.Api.1.19.0\lib\net45\Grpc.Core.Api.dll</HintPath>
</Reference>
<Reference Include="Ninject, Version=3.2.0.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
<HintPath>..\packages\Ninject.3.2.2.0\lib\net45-full\Ninject.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Interactive.Async, Version=3.2.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
<HintPath>..\packages\System.Interactive.Async.3.2.0\lib\net46\System.Interactive.Async.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
@ -41,6 +57,10 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="EntryPoints\ServerEntryPoint.cs" />
<Compile Include="EntryPoints\WinFormsEntryPoint.cs" />
<Compile Include="EntryPoints\WorkerEntryPoint.cs" />
<Compile Include="Modules\WinFormsModule.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
@ -53,5 +73,16 @@
<Name>NAPS2.Sdk</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\Grpc.Core.1.19.0\build\net45\Grpc.Core.targets" Condition="Exists('..\packages\Grpc.Core.1.19.0\build\net45\Grpc.Core.targets')" />
<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\Grpc.Core.1.19.0\build\net45\Grpc.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Grpc.Core.1.19.0\build\net45\Grpc.Core.targets'))" />
</Target>
</Project>

11
NAPS2.Lib.WinForms/app.config Normal file
View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="BouncyCastle.Crypto" publicKeyToken="0e99375e54769942" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.8.4.0" newVersion="1.8.4.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>

8
NAPS2.Lib.WinForms/packages.config Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Grpc" version="1.19.0" targetFramework="net461" />
<package id="Grpc.Core" version="1.19.0" targetFramework="net461" />
<package id="Grpc.Core.Api" version="1.19.0" targetFramework="net461" />
<package id="Ninject" version="3.2.2.0" targetFramework="net461" />
<package id="System.Interactive.Async" version="3.2.0" targetFramework="net461" />
</packages>