Skip to content

Commit 06e8d70

Browse files
farlee2121farlee2121
committed
update di containter to .net standard
1 parent 87333af commit 06e8d70

File tree

6 files changed

+18
-143
lines changed

6 files changed

+18
-143
lines changed

‎Shared.DataContracts2/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎Shared.DependencyInjectionKernel/Properties/AssemblyInfo.cs

-36
This file was deleted.

‎Shared.DependencyInjectionKernel/Shared.DependencyInjectionKernel.csproj

+10-59
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,16 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{5F633149-4C66-4D34-98AB-28EE4662B442}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Shared.DependencyInjectionKernel</RootNamespace>
11-
<AssemblyName>Shared.DependencyInjectionKernel</AssemblyName>
12-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
4+
<TargetFramework>netstandard2.0</TargetFramework>
145
</PropertyGroup>
15-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
16-
<DebugSymbols>true</DebugSymbols>
17-
<DebugType>full</DebugType>
18-
<Optimize>false</Optimize>
19-
<OutputPath>bin\Debug\</OutputPath>
20-
<DefineConstants>DEBUG;TRACE</DefineConstants>
21-
<ErrorReport>prompt</ErrorReport>
22-
<WarningLevel>4</WarningLevel>
23-
</PropertyGroup>
24-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
25-
<DebugType>pdbonly</DebugType>
26-
<Optimize>true</Optimize>
27-
<OutputPath>bin\Release\</OutputPath>
28-
<DefineConstants>TRACE</DefineConstants>
29-
<ErrorReport>prompt</ErrorReport>
30-
<WarningLevel>4</WarningLevel>
31-
</PropertyGroup>
32-
<ItemGroup>
33-
<Reference Include="Ninject, Version=3.3.4.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
34-
<HintPath>..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>
35-
</Reference>
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="System.Xml.Linq" />
39-
<Reference Include="System.Data.DataSetExtensions" />
40-
<Reference Include="Microsoft.CSharp" />
41-
<Reference Include="System.Data" />
42-
<Reference Include="System.Net.Http" />
43-
<Reference Include="System.Xml" />
44-
</ItemGroup>
45-
<ItemGroup>
46-
<Compile Include="DependencyInjectionLoader.cs" />
47-
<Compile Include="Properties\AssemblyInfo.cs" />
48-
<None Include="README_DependencyInjection.md" />
49-
</ItemGroup>
6+
507
<ItemGroup>
51-
<None Include="packages.config" />
52-
<None Include="README_DependencyInjectionKernel.md" />
8+
<PackageReference Include="Ninject" Version="3.3.4" />
539
</ItemGroup>
10+
5411
<ItemGroup>
55-
<ProjectReference Include="..\Accessors.DatabaseAccessors\Accessors.DatabaseAccessors.csproj">
56-
<Project>{af26b020-f939-4353-a41d-f6c0f87d0b81}</Project>
57-
<Name>Accessors.DatabaseAccessors</Name>
58-
</ProjectReference>
59-
<ProjectReference Include="..\Managers.LazyCollectionOfAllManagers\Managers.LazyCollectionOfAllManagers.csproj">
60-
<Project>{20052ecb-4e1d-4f2f-9f06-79111fe381f8}</Project>
61-
<Name>Managers.LazyCollectionOfAllManagers</Name>
62-
</ProjectReference>
12+
<ProjectReference Include="..\Accessors.DatabaseAccessors\Accessors.DatabaseAccessors.csproj" />
13+
<ProjectReference Include="..\Managers.LazyCollectionOfAllManagers\Managers.LazyCollectionOfAllManagers.csproj" />
6314
</ItemGroup>
64-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
65-
</Project>
15+
16+
</Project>

‎Shared.DependencyInjectionKernel/packages.config

-4
This file was deleted.

‎TestingExemplar.sln

+7-7
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "4.Accessors", "4.Accessors"
3838
EndProject
3939
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "5.Shared", "5.Shared", "{E1966F97-64AF-4CA1-9CDB-DA841C9491B9}"
4040
EndProject
41-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.DependencyInjectionKernel", "Shared.DependencyInjectionKernel\Shared.DependencyInjectionKernel.csproj", "{5F633149-4C66-4D34-98AB-28EE4662B442}"
42-
EndProject
4341
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.NUnitExtensions", "Test.NUnitExtensions\Test.NUnitExtensions.csproj", "{3AC5C65A-6F68-479C-A078-3D2E573111BB}"
4442
EndProject
4543
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests.TestBases", "Tests.TestBases\Tests.TestBases.csproj", "{EBD233E2-509F-4A6A-B43E-034986583AE2}"
4644
EndProject
4745
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.DataContracts", "Shared.DataContracts\Shared.DataContracts.csproj", "{0C5F8E80-076A-4C48-900D-D5E6B0C1F34E}"
4846
EndProject
47+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared.DependencyInjectionKernel", "Shared.DependencyInjectionKernel\Shared.DependencyInjectionKernel.csproj", "{A697FACF-33EB-47CF-91CD-11CB6A870CB6}"
48+
EndProject
4949
Global
5050
GlobalSection(SolutionConfigurationPlatforms) = preSolution
5151
Debug|Any CPU = Debug|Any CPU
@@ -76,10 +76,6 @@ Global
7676
{AF26B020-F939-4353-A41D-F6C0F87D0B81}.Debug|Any CPU.Build.0 = Debug|Any CPU
7777
{AF26B020-F939-4353-A41D-F6C0F87D0B81}.Release|Any CPU.ActiveCfg = Release|Any CPU
7878
{AF26B020-F939-4353-A41D-F6C0F87D0B81}.Release|Any CPU.Build.0 = Release|Any CPU
79-
{5F633149-4C66-4D34-98AB-28EE4662B442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
80-
{5F633149-4C66-4D34-98AB-28EE4662B442}.Debug|Any CPU.Build.0 = Debug|Any CPU
81-
{5F633149-4C66-4D34-98AB-28EE4662B442}.Release|Any CPU.ActiveCfg = Release|Any CPU
82-
{5F633149-4C66-4D34-98AB-28EE4662B442}.Release|Any CPU.Build.0 = Release|Any CPU
8379
{3AC5C65A-6F68-479C-A078-3D2E573111BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
8480
{3AC5C65A-6F68-479C-A078-3D2E573111BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
8581
{3AC5C65A-6F68-479C-A078-3D2E573111BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -92,6 +88,10 @@ Global
9288
{0C5F8E80-076A-4C48-900D-D5E6B0C1F34E}.Debug|Any CPU.Build.0 = Debug|Any CPU
9389
{0C5F8E80-076A-4C48-900D-D5E6B0C1F34E}.Release|Any CPU.ActiveCfg = Release|Any CPU
9490
{0C5F8E80-076A-4C48-900D-D5E6B0C1F34E}.Release|Any CPU.Build.0 = Release|Any CPU
91+
{A697FACF-33EB-47CF-91CD-11CB6A870CB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
92+
{A697FACF-33EB-47CF-91CD-11CB6A870CB6}.Debug|Any CPU.Build.0 = Debug|Any CPU
93+
{A697FACF-33EB-47CF-91CD-11CB6A870CB6}.Release|Any CPU.ActiveCfg = Release|Any CPU
94+
{A697FACF-33EB-47CF-91CD-11CB6A870CB6}.Release|Any CPU.Build.0 = Release|Any CPU
9595
EndGlobalSection
9696
GlobalSection(SolutionProperties) = preSolution
9797
HideSolutionNode = FALSE
@@ -103,10 +103,10 @@ Global
103103
{7D0BA0FB-FA51-4964-9E41-7D03BFF47A94} = {3B08858C-6FD1-47E7-824C-0B3F1D234455}
104104
{802F9C0A-9FC5-444B-BD3B-AED8B6F148A8} = {3B08858C-6FD1-47E7-824C-0B3F1D234455}
105105
{AF26B020-F939-4353-A41D-F6C0F87D0B81} = {CA030337-D04B-4393-9869-897FA379EC1B}
106-
{5F633149-4C66-4D34-98AB-28EE4662B442} = {E1966F97-64AF-4CA1-9CDB-DA841C9491B9}
107106
{3AC5C65A-6F68-479C-A078-3D2E573111BB} = {3B08858C-6FD1-47E7-824C-0B3F1D234455}
108107
{EBD233E2-509F-4A6A-B43E-034986583AE2} = {3B08858C-6FD1-47E7-824C-0B3F1D234455}
109108
{0C5F8E80-076A-4C48-900D-D5E6B0C1F34E} = {E1966F97-64AF-4CA1-9CDB-DA841C9491B9}
109+
{A697FACF-33EB-47CF-91CD-11CB6A870CB6} = {E1966F97-64AF-4CA1-9CDB-DA841C9491B9}
110110
EndGlobalSection
111111
GlobalSection(ExtensibilityGlobals) = postSolution
112112
SolutionGuid = {1292F67E-01C7-4886-997A-51E54049301C}

‎Tests.ManagerTests/Tests.ManagerTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<Name>Shared.DataContracts</Name>
100100
</ProjectReference>
101101
<ProjectReference Include="..\Shared.DependencyInjectionKernel\Shared.DependencyInjectionKernel.csproj">
102-
<Project>{5F633149-4C66-4D34-98AB-28EE4662B442}</Project>
102+
<Project>{a697facf-33eb-47cf-91cd-11cb6a870cb6}</Project>
103103
<Name>Shared.DependencyInjectionKernel</Name>
104104
</ProjectReference>
105105
<ProjectReference Include="..\Test.NUnitExtensions\Test.NUnitExtensions.csproj">

0 commit comments

Comments
 (0)