Merge branch 'v5.x' of https://github.com/unitycontainer/configuration into v5.x

Directory.Build.props

@@ -0,0 +1,16 @@
+<Project>
+
+  <PropertyGroup>
+    <Version>5.12.0</Version>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <UnityContainer>5.12.*</UnityContainer>
+    <PreUnityContainer>[5.12.0-*,5.13.0)</PreUnityContainer>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <PackageReleaseNotes>This package is compatible with .NET Standard 1.0 and 2.0, .NET Core 1.0 and 2.0, .NET 4.0, 4.5, 4.6, 4.7</PackageReleaseNotes>
+  </PropertyGroup>
+ 
+</Project>

azure-pipelines.yml

@@ -0,0 +1,19 @@
+# Build pipeline
+
+resources:
+  repositories:
+    - repository: templates
+      type: github
+      name: unitycontainer/DevOps
+      endpoint: Unity Container
+
+trigger:
+- v5.x
+- refs/tags/v5.*
+
+pool:
+  vmImage: 'windows-latest'
+
+steps:
+- template: build-steps.yml@templates
+

src/Unity.Configuration.csproj

@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\package.props" />
-
   <PropertyGroup>
     <FileVersion>$(Version).0</FileVersion>
     <AssemblyVersion>$(Version).0</AssemblyVersion>
+    <PackageVersion>$(Version)$(VERSION_SUFFIX)</PackageVersion>
     <PackageId>Unity.Configuration</PackageId>
     <Description>Unity Configuration</Description>
     <Copyright>Copyright © Unity Container Project 2018</Copyright>
@@ -22,6 +21,30 @@
     <TargetFrameworks>netstandard2.0;net47;net46;net45;netcoreapp2.0</TargetFrameworks>
   </PropertyGroup>
 
+  <!-- Unity.Container -->
+
+  <PropertyGroup>
+    <UnityContainerProject>..\..\Container\src\Unity.Container.csproj</UnityContainerProject>
+    <UnityContainerVersion Condition="'$(UnityContainerVersion)' == ''">$(UnityContainer)</UnityContainerVersion>
+  </PropertyGroup>
+
+  <ItemGroup Condition="Exists('$(UnityContainerProject)')">
+    <ProjectReference Include="$(UnityContainerProject)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="!Exists('$(UnityContainerProject)')">
+    <PackageReference Include="Unity.Container" Version="$(UnityContainerVersion)" />
+  </ItemGroup>
+
+  <!-- Project Configuration -->
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0'">
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.*" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netcoreapp2.0'">
+    <Reference Include="System.Configuration" />
+  </ItemGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -33,28 +56,6 @@
     <DebugType>Full</DebugType>
   </PropertyGroup>
 
-
-  <PropertyGroup>
-    <UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
-  </PropertyGroup>
-
-  <ItemGroup Condition="Exists('$(UnityContainer)')">
-    <ProjectReference Include="$(UnityContainer)" />
-  </ItemGroup>
-
-  <ItemGroup Condition="!Exists('$(UnityContainer)')">
-    <PackageReference Include="Unity.Container" Version="$(UnityContainerVersion)" />
-  </ItemGroup>
-
-
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0'">
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.4.*" />
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0' AND '$(TargetFramework)' != 'netcoreapp2.0'">
-    <Reference Include="System.Configuration" />
-  </ItemGroup>
-
   <!-- Sourcelink -->
   <PropertyGroup>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>

tests/Configuration.Tests.csproj

@@ -13,28 +13,14 @@
     <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
   </ItemGroup>
-   
-  <ItemGroup>
-    <None Remove="ConfigFiles\*.config" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="ConfigFiles\*.config" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <UnityAbstractions>..\..\Abstractions\src\Unity.Abstractions.csproj</UnityAbstractions>
-    <UnityContainer>..\..\Container\src\Unity.Container.csproj</UnityContainer>
-  </PropertyGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\src\Unity.Configuration.csproj" />
+  </ItemGroup>
 
-    <ProjectReference Include="$(UnityAbstractions)" Condition="Exists('$(UnityAbstractions)')" />
+  <ItemGroup>
-    <PackageReference Include="Unity.Abstractions" Version="$(UnityAbstractionsVersion)" Condition="!Exists('$(UnityAbstractions)')" />
+    <None Remove="ConfigFiles\*.config" />
-
+    <EmbeddedResource Include="ConfigFiles\*.config" />
-    <ProjectReference Include="$(UnityContainer)" Condition="Exists('$(UnityContainer)')" />
-    <PackageReference Include="Unity.Container" Version="$(UnityContainerVersion)" Condition="!Exists('$(UnityContainer)')" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netcoreapp2.0'">