Skip to content

Commit 11dc538

Browse files
author
Alex Kostyukov
committed
Move to new project structure, update packages, infrastructure .net standard
1 parent f0aca0f commit 11dc538

File tree

399 files changed

+2989
-4129
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

399 files changed

+2989
-4129
lines changed

‎LICENCE renamed to ‎LICENSE

File renamed without changes.

‎QP8.ConsoleDbUpdate/ConsoleDbUpdate.csproj

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -130,18 +130,6 @@
130130
<EmbeddedResource Include="..\siteMvc\bin\QA.Validation.Xaml.Extensions.dll">
131131
<Link>References\QA.Validation.Xaml.Extensions.dll</Link>
132132
</EmbeddedResource>
133-
<EmbeddedResource Include="..\siteMvc\bin\Autofac.dll">
134-
<Link>References\Autofac.dll</Link>
135-
</EmbeddedResource>
136-
<EmbeddedResource Include="..\siteMvc\bin\NLog.QuantumArt.PrtgMonitoring.dll">
137-
<Link>References\NLog.QuantumArt.PrtgMonitoring.dll</Link>
138-
</EmbeddedResource>
139-
<EmbeddedResource Include="..\siteMvc\bin\Flurl.dll">
140-
<Link>References\Flurl.dll</Link>
141-
</EmbeddedResource>
142-
<EmbeddedResource Include="..\siteMvc\bin\Flurl.Http.dll">
143-
<Link>References\Flurl.Http.dll</Link>
144-
</EmbeddedResource>
145133
<EmbeddedResource Include="..\binaries\DbUpdate\Microsoft.Practices.EnterpriseLibrary.Data.dll">
146134
<Link>References\Microsoft.Practices.EnterpriseLibrary.Data.dll</Link>
147135
</EmbeddedResource>
@@ -297,12 +285,12 @@
297285
<Name>WebMvc</Name>
298286
<Private>False</Private>
299287
</ProjectReference>
300-
<ProjectReference Include="$(SolutionDir)QuantumArt.Infrastructure\QP8.Infrastructure.Logging\QP8.Infrastructure.Logging.csproj">
288+
<ProjectReference Include="C:\ProxyDocuments\Projects\QP\QuantumArt.Infrastructure\QP8.Infrastructure.Logging\QP8.Infrastructure.Logging.csproj">
301289
<Project>{6e317f05-226c-4c9f-b918-fe71d743c3a3}</Project>
302290
<Name>QP8.Infrastructure.Logging</Name>
303291
<Private>False</Private>
304292
</ProjectReference>
305-
<ProjectReference Include="$(SolutionDir)QuantumArt.Infrastructure\QP8.Infrastructure\QP8.Infrastructure.csproj">
293+
<ProjectReference Include="C:\ProxyDocuments\Projects\QP\QuantumArt.Infrastructure\QP8.Infrastructure\QP8.Infrastructure.csproj">
306294
<Project>{27bd20e7-1133-4d13-90c6-6565489da612}</Project>
307295
<Name>QP8.Infrastructure</Name>
308296
<Private>False</Private>
@@ -325,6 +313,9 @@
325313
</Reference>
326314
<Reference Include="System" />
327315
<Reference Include="System.Data" />
316+
<Reference Include="System.Data.SqlClient, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
317+
<HintPath>..\packages\System.Data.SqlClient.4.4.0\lib\net461\System.Data.SqlClient.dll</HintPath>
318+
</Reference>
328319
<Reference Include="System.Transactions" />
329320
<Reference Include="System.Xml" />
330321
<Reference Include="System.Xml.Linq" />

‎QP8.ConsoleDbUpdate/Infrastructure/Processors/ArgumentsProcessor/BaseConsoleArgsProcessor.cs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,10 @@ protected BaseConsoleArgsProcessor()
3333

3434
protected internal virtual void PrintEnteredData()
3535
{
36-
if (SqlHelpers.TryParseConnectionString(CustomerCode, out var _))
37-
{
38-
Console.WriteLine($@"Connection String: {CustomerCode}");
39-
}
40-
else
41-
{
42-
Console.WriteLine($@"Customer Code: {CustomerCode}");
43-
}
36+
Console.WriteLine(SqlHelpers.TryParseConnectionString(CustomerCode, out var _)
37+
? $@"Connection String: {CustomerCode}"
38+
: $@"Customer Code: {CustomerCode}"
39+
);
4440

4541
Console.WriteLine($@"File Pathes: {string.Join(", ", FilePathes)}");
4642
Console.WriteLine($@"Config: {(string.IsNullOrWhiteSpace(ConfigPath) ? "disabled" : ConfigPath)}");

‎QP8.ConsoleDbUpdate/packages.config

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="CsvHelper" version="2.16.3.0" targetFramework="net47" />
3+
<package id="CsvHelper" version="2.16.3.0" targetFramework="net47" allowedVersions="[2.16.3.0,3.0.0.0)" />
44
<package id="Mono.Options" version="5.3.0.1" targetFramework="net47" />
55
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net47" />
66
<package id="NLog.Schema" version="4.4.12" targetFramework="net47" />
7-
</packages>
7+
<package id="System.Data.SqlClient" version="4.4.0" targetFramework="net47" />
8+
</packages>

‎QP8.sln

Lines changed: 561 additions & 255 deletions
Large diffs are not rendered by default.

‎QuantumArt.Infrastructure/QP8.Infrastructure.Logging/IoC/NLogAutofacModule.cs renamed to ‎QuantumArt.Infrastructure/QP8.Infrastructure.Logging.Autofac/NLogAutofacModule.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
using System;
1+
using System;
22
using Autofac;
33
using QP8.Infrastructure.Logging.Factories;
44
using QP8.Infrastructure.Logging.Interfaces;
55

6-
namespace QP8.Infrastructure.Logging.IoC
6+
namespace QP8.Infrastructure.Logging.Autofac
77
{
88
public class NLogAutofacModule : Module
99
{

‎QuantumArt.Infrastructure/QP8.Infrastructure.Logging.Autofac/QP8.Infrastructure.Logging.Autofac.csproj

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<Version>2.0.0-rc1</Version>
6+
<Authors>Alex Kostyukov</Authors>
7+
<Company>Quantum Art</Company>
8+
<Product>QP8.Framework</Product>
9+
<Description>QP logger infrastructure helpers for autofac container</Description>
10+
<Copyright>Copyright © 2007-2017 Quantum Art</Copyright>
11+
<PackageReleaseNotes>Update to new projects structure.</PackageReleaseNotes>
12+
<PackageLicenseUrl>https://github.com/QuantumArt/QP/blob/master/LICENSE</PackageLicenseUrl>
13+
<PackageProjectUrl>https://github.com/QuantumArt/QP</PackageProjectUrl>
14+
<RepositoryUrl>https://github.com/QuantumArt/QP</RepositoryUrl>
15+
<RepositoryType>git</RepositoryType>
16+
<PackageTags>QP</PackageTags>
17+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
18+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
19+
<Configurations>Debug;Release</Configurations>
20+
<RootNamespace>QP8.Infrastructure.Logging.Autofac</RootNamespace>
21+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Autofac" Version="4.6.2" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<ProjectReference Include="..\QP8.Infrastructure.Logging\QP8.Infrastructure.Logging.csproj" />
30+
</ItemGroup>
31+
32+
</Project>

‎QuantumArt.Infrastructure/QP8.Infrastructure.Logging.PrtgMonitoring.Autofac/QP8.Infrastructure.Logging.PrtgMonitoring.Autofac.csproj

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<Version>2.0.0-rc1</Version>
6+
<Authors>Alex Kostyukov</Authors>
7+
<Company>Quantum Art</Company>
8+
<Product>QP8.Framework</Product>
9+
<Description>QP8 prtg monitoring service and nlog infrastructure with autofac extensions</Description>
10+
<Copyright>Copyright © 2007-2017 Quantum Art</Copyright>
11+
<PackageReleaseNotes>Update to new projects structure.</PackageReleaseNotes>
12+
<PackageLicenseUrl>https://github.com/QuantumArt/QP/blob/master/LICENSE</PackageLicenseUrl>
13+
<PackageProjectUrl>https://github.com/QuantumArt/QP</PackageProjectUrl>
14+
<RepositoryUrl>https://github.com/QuantumArt/QP</RepositoryUrl>
15+
<RepositoryType>git</RepositoryType>
16+
<PackageTags>QP</PackageTags>
17+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
18+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
19+
<Configurations>Debug;Release</Configurations>
20+
<RootNamespace>QP8.Infrastructure.Logging.PrtgMonitoring.Autofac</RootNamespace>
21+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Autofac" Version="4.6.2" />
26+
</ItemGroup>
27+
28+
</Project>

‎QuantumArt.Infrastructure/QP8.Infrastructure.Logging.PrtgMonitoring/NLogExtensions/UnityExtensions/PrtgNLogContainerExtension.cs renamed to ‎QuantumArt.Infrastructure/QP8.Infrastructure.Logging.PrtgMonitoring.Unity/PrtgNLogContainerExtension.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
1-
using Microsoft.Practices.Unity;
21
using QP8.Infrastructure.Logging.Factories;
32
using QP8.Infrastructure.Logging.PrtgMonitoring.Interfaces;
43
using QP8.Infrastructure.Logging.PrtgMonitoring.NLogExtensions.Factories;
54
using QP8.Infrastructure.Logging.PrtgMonitoring.NLogExtensions.Interfaces;
5+
using Unity;
6+
using Unity.Extension;
7+
using Unity.Injection;
8+
using Unity.Lifetime;
69

7-
namespace QP8.Infrastructure.Logging.PrtgMonitoring.NLogExtensions.UnityExtensions
10+
namespace QP8.Infrastructure.Logging.PrtgMonitoring.Unity
811
{
912
public class PrtgNLogContainerExtension : UnityContainerExtension
1013
{

‎QuantumArt.Infrastructure/QP8.Infrastructure.Logging.PrtgMonitoring.Unity/QP8.Infrastructure.Logging.PrtgMonitoring.Unity.csproj

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netstandard2.0</TargetFramework>
5+
<Version>2.0.0-rc1</Version>
6+
<Authors>Alex Kostyukov</Authors>
7+
<Company>Quantum Art</Company>
8+
<Product>QP8.Framework</Product>
9+
<Description>QP8 prtg monitoring service and nlog infrastructure with unity extensions</Description>
10+
<Copyright>Copyright © 2007-2017 Quantum Art</Copyright>
11+
<PackageReleaseNotes>Update to new projects structure.</PackageReleaseNotes>
12+
<PackageLicenseUrl>https://github.com/QuantumArt/QP/blob/master/LICENSE</PackageLicenseUrl>
13+
<PackageProjectUrl>https://github.com/QuantumArt/QP</PackageProjectUrl>
14+
<RepositoryUrl>https://github.com/QuantumArt/QP</RepositoryUrl>
15+
<RepositoryType>git</RepositoryType>
16+
<PackageTags>QP</PackageTags>
17+
<AssemblyVersion>1.0.0.0</AssemblyVersion>
18+
<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
19+
<Configurations>Debug;Release</Configurations>
20+
<RootNamespace>QP8.Infrastructure.Logging.PrtgMonitoring.Unity</RootNamespace>
21+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
22+
</PropertyGroup>
23+
24+
<ItemGroup>
25+
<PackageReference Include="Unity" Version="5.0.1" />
26+
</ItemGroup>
27+
28+
<ItemGroup>
29+
<ProjectReference Include="..\QP8.Infrastructure.Logging.PrtgMonitoring\QP8.Infrastructure.Logging.PrtgMonitoring.csproj" />
30+
</ItemGroup>
31+
32+
</Project>

0 commit comments

Comments
 (0)