Merge pull request #7 from Chavoshi/master

.Net Standard & .Net Core Support Added

Author: ENikS

package.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27004.2002
@@ -16,8 +15,8 @@ Global
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{F2DD03D8-1088-41AE-A284-EAEA9808ADE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F2DD03D8-1088-41AE-A284-EAEA9808ADE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F2DD03D8-1088-41AE-A284-EAEA9808ADE8}.Package|Any CPU.ActiveCfg = Package|Any CPU
-		{F2DD03D8-1088-41AE-A284-EAEA9808ADE8}.Package|Any CPU.Build.0 = Package|Any CPU
+		{F2DD03D8-1088-41AE-A284-EAEA9808ADE8}.Package|Any CPU.ActiveCfg = Release|Any CPU
+		{F2DD03D8-1088-41AE-A284-EAEA9808ADE8}.Package|Any CPU.Build.0 = Release|Any CPU
 		{F2DD03D8-1088-41AE-A284-EAEA9808ADE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F2DD03D8-1088-41AE-A284-EAEA9808ADE8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CD512E14-F7B8-4E9A-B2FF-EB90FC3DD7F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

src/Unity.Configuration.csproj

@@ -19,11 +19,8 @@
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>package.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
+    <TargetFrameworks>netstandard2.0;net47;net46;net45;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
-
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
 
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
@@ -40,19 +37,17 @@
     </EmbeddedResource>
   </ItemGroup>
 
-  
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <TargetFrameworks>net47;net46;net45;</TargetFrameworks>
     <OutputPath>$(SolutionDir)lib</OutputPath>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <DebugType>Full</DebugType>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-    <TargetFramework>net47</TargetFramework>
+    <DebugType>Full</DebugType>
   </PropertyGroup>
-  
+
 
   <PropertyGroup>
     <UnityAbstractions>..\..\Abstractions\src\Unity.Abstractions.csproj</UnityAbstractions>
@@ -66,4 +61,30 @@
     <PackageReference Include="Unity.Abstractions" Version="$(UnityAbstractionsVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
+    <Reference Include="System.Configuration" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net46'">
+    <Reference Include="System.Configuration" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net47'">
+    <PackageReference Include="System.Configuration.ConfigurationManager">
+      <Version>4.4.1</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager">
+      <Version>4.4.1</Version>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager">
+      <Version>4.4.1</Version>
+    </PackageReference>
+  </ItemGroup>
+
 </Project>

tests/Configuration.Tests.csproj

@@ -3,7 +3,7 @@
   <Import Project="..\package.props" />
 
   <PropertyGroup>
-    <TargetFramework>net47</TargetFramework>
+    <TargetFrameworks>net47;netcoreapp2.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <RootNamespace>Microsoft.Practices.Unity.Configuration.Tests</RootNamespace>
   </PropertyGroup>
@@ -22,10 +22,6 @@
     <EmbeddedResource Include="ConfigFiles\*.config" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\src\Unity.Configuration.csproj" />
   </ItemGroup>
@@ -36,11 +32,6 @@
     <UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
   </PropertyGroup>
 
-
-  <ItemGroup Condition="Exists('$(UnityAbstractions)')">
-    <ProjectReference Include="$(UnityAbstractions)" />
-  </ItemGroup>
-
   <ItemGroup Condition="Exists('$(UnityContainer)')">
     <ProjectReference Include="$(UnityContainer)" />
   </ItemGroup>
@@ -53,5 +44,9 @@
   <ItemGroup Condition="!Exists('$(UnityContainer)')">
     <PackageReference Include="Unity.Container" Version="$(UnityContainerVersion)" />
   </ItemGroup>
-   
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
+
 </Project>