Skip to content

Commit 7fea616

Browse files
florincflorinc
committed
Merge branch 'dev/AppInfra' into 'master'
2 parents 975db91 + d5cc746 commit 7fea616

16 files changed

Lines changed: 30 additions & 36 deletions

File tree

‎AppInfraDemo/Infrastructure/Common/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="CommonServiceLocator" version="1.3" targetFramework="net472" />
44
<package id="EntityFramework" version="6.4.4" targetFramework="net48" />
5-
<package id="iQuarc.DataAccess" version="1.0.6" targetFramework="net472" />
5+
<package id="iQuarc.DataAccess" version="1.0.6" targetFramework="net48" />
66
<package id="iQuarc.SystemEx" version="1.0.0.0" targetFramework="net472" />
77
<package id="Microsoft.DependencyValidation.Analyzers" version="0.11.0" targetFramework="net48" />
88
</packages>

‎AppInfraDemo/Infrastructure/DataAccess/DataAccess.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@
4343
</Reference>
4444
<Reference Include="iQuarc.AppBoot, Version=2.0.3.2, Culture=neutral, processorArchitecture=MSIL">
4545
<HintPath>..\..\packages\iQuarc.AppBoot.2.0.3-disposables002\lib\net45\iQuarc.AppBoot.dll</HintPath>
46-
<Private>True</Private>
4746
</Reference>
4847
<Reference Include="iQuarc.DataAccess, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
4948
<HintPath>..\..\packages\iQuarc.DataAccess.1.0.6\lib\net45\iQuarc.DataAccess.dll</HintPath>
50-
<Private>True</Private>
5149
</Reference>
5250
<Reference Include="iQuarc.SystemEx">
5351
<HintPath>..\..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>

‎AppInfraDemo/Infrastructure/DataAccess/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<packages>
33
<package id="CommonServiceLocator" version="1.3" targetFramework="net472" />
44
<package id="EntityFramework" version="6.4.4" targetFramework="net48" />
5-
<package id="iQuarc.AppBoot" version="2.0.3-disposables002" targetFramework="net45" />
6-
<package id="iQuarc.DataAccess" version="1.0.6" targetFramework="net461" />
5+
<package id="iQuarc.AppBoot" version="2.0.3-disposables002" targetFramework="net48" />
6+
<package id="iQuarc.DataAccess" version="1.0.6" targetFramework="net48" />
77
<package id="iQuarc.SystemEx" version="1.0.0.0" targetFramework="net45" />
88
<package id="Microsoft.DependencyValidation.Analyzers" version="0.11.0" targetFramework="net48" />
99
</packages>

‎AppInfraDemo/Modules/Export/Export.Services/Export.Services.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
</Reference>
4343
<Reference Include="iQuarc.DataAccess, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
4444
<HintPath>..\..\..\packages\iQuarc.DataAccess.1.0.6\lib\net45\iQuarc.DataAccess.dll</HintPath>
45-
<Private>True</Private>
4645
</Reference>
4746
<Reference Include="iQuarc.SystemEx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
4847
<HintPath>..\..\..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>

‎AppInfraDemo/Modules/Export/Export.Services/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="CommonServiceLocator" version="1.3" targetFramework="net472" />
44
<package id="EntityFramework" version="6.4.4" targetFramework="net48" />
5-
<package id="iQuarc.DataAccess" version="1.0.6" targetFramework="net461" />
5+
<package id="iQuarc.DataAccess" version="1.0.6" targetFramework="net48" />
66
<package id="iQuarc.SystemEx" version="1.0.0.0" targetFramework="net461" />
77
<package id="Microsoft.DependencyValidation.Analyzers" version="0.11.0" targetFramework="net48" />
88
</packages>

‎AppInfraDemo/Modules/Notifications/Notification.Services/Notifications.Services.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<ItemGroup>
3535
<Reference Include="iQuarc.AppBoot, Version=2.0.3.2, Culture=neutral, processorArchitecture=MSIL">
3636
<HintPath>..\..\..\packages\iQuarc.AppBoot.2.0.3-disposables002\lib\net45\iQuarc.AppBoot.dll</HintPath>
37-
<Private>True</Private>
3837
</Reference>
3938
<Reference Include="iQuarc.SystemEx">
4039
<HintPath>..\..\..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>

‎AppInfraDemo/Modules/Notifications/Notification.Services/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="CommonServiceLocator" version="1.3" targetFramework="net472" />
4-
<package id="iQuarc.AppBoot" version="2.0.3-disposables002" targetFramework="net45" />
4+
<package id="iQuarc.AppBoot" version="2.0.3-disposables002" targetFramework="net48" />
55
<package id="iQuarc.SystemEx" version="1.0.0.0" targetFramework="net45" />
66
<package id="Microsoft.DependencyValidation.Analyzers" version="0.11.0" targetFramework="net48" />
77
</packages>

‎AppInfraDemo/Modules/Sales/Sales.DataAccess/Sales.DataAccess.csproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,15 +42,12 @@
4242
</Reference>
4343
<Reference Include="iQuarc.AppBoot, Version=2.0.3.2, Culture=neutral, processorArchitecture=MSIL">
4444
<HintPath>..\..\..\packages\iQuarc.AppBoot.2.0.3-disposables002\lib\net45\iQuarc.AppBoot.dll</HintPath>
45-
<Private>True</Private>
4645
</Reference>
4746
<Reference Include="iQuarc.DataAccess, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
4847
<HintPath>..\..\..\packages\iQuarc.DataAccess.1.0.6\lib\net45\iQuarc.DataAccess.dll</HintPath>
49-
<Private>True</Private>
5048
</Reference>
5149
<Reference Include="iQuarc.DataAccess.AppBoot, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5250
<HintPath>..\..\..\packages\iQuarc.DataAccess.AppBoot.1.0.0\lib\net45\iQuarc.DataAccess.AppBoot.dll</HintPath>
53-
<Private>True</Private>
5451
</Reference>
5552
<Reference Include="iQuarc.SystemEx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5653
<HintPath>..\packages\iQuarc.SystemEx.1.0.0.0\lib\net40\iQuarc.SystemEx.dll</HintPath>
@@ -59,6 +56,15 @@
5956
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
6057
<HintPath>..\..\..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
6158
</Reference>
59+
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
60+
<HintPath>..\..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
61+
</Reference>
62+
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
63+
<HintPath>..\..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
64+
</Reference>
65+
<Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
66+
<HintPath>..\..\..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
67+
</Reference>
6268
<Reference Include="System" />
6369
<Reference Include="System.ComponentModel.DataAnnotations" />
6470
<Reference Include="System.Core" />

‎AppInfraDemo/Modules/Sales/Sales.DataAccess/packages.config‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22
<packages>
33
<package id="CommonServiceLocator" version="1.3" targetFramework="net472" />
44
<package id="EntityFramework" version="6.4.4" targetFramework="net48" />
5-
<package id="iQuarc.AppBoot" version="2.0.3-disposables002" targetFramework="net452" />
6-
<package id="iQuarc.DataAccess" version="1.0.6" targetFramework="net452" />
7-
<package id="iQuarc.DataAccess.AppBoot" version="1.0.0" targetFramework="net452" />
5+
<package id="iQuarc.AppBoot" version="2.0.3-disposables002" targetFramework="net48" />
6+
<package id="iQuarc.DataAccess" version="1.0.6" targetFramework="net48" />
7+
<package id="iQuarc.DataAccess.AppBoot" version="1.0.0" targetFramework="net48" />
88
<package id="iQuarc.SystemEx" version="1.0.0.0" targetFramework="net452" />
99
<package id="Microsoft.DependencyValidation.Analyzers" version="0.11.0" targetFramework="net48" />
10+
<package id="Unity" version="4.0.1" targetFramework="net48" />
1011
</packages>

‎AppInfraDemo/Modules/Sales/Sales.Services/Sales.Services.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,9 @@
4343
</Reference>
4444
<Reference Include="iQuarc.AppBoot, Version=2.0.3.2, Culture=neutral, processorArchitecture=MSIL">
4545
<HintPath>..\..\..\packages\iQuarc.AppBoot.2.0.3-disposables002\lib\net45\iQuarc.AppBoot.dll</HintPath>
46-
<Private>True</Private>
4746
</Reference>
4847
<Reference Include="iQuarc.DataAccess, Version=1.0.6.0, Culture=neutral, processorArchitecture=MSIL">
4948
<HintPath>..\..\..\packages\iQuarc.DataAccess.1.0.6\lib\net45\iQuarc.DataAccess.dll</HintPath>
50-
<Private>True</Private>
5149
</Reference>
5250
<Reference Include="iQuarc.SystemEx, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5351
<SpecificVersion>False</SpecificVersion>

0 commit comments

Comments
 (0)