Merge pull request #68 from unoplatform/dev/jela/servicelocator-update

chore: Update to latest CommonServiceLocator

.azure-pipelines.yml

@@ -1,5 +1,5 @@
 pool:
-  name: 'Hosted VS2017'
+  vmImage: 'windows-2019'
 
 trigger:
   branches:

gitversion.yml

@@ -1,6 +1,6 @@
 assembly-versioning-scheme: MajorMinorPatch
 mode: Mainline
-next-version: 1.29.0
+next-version: 2.0.0
 
 branches:
   master:

src/Directory.Build.props

@@ -0,0 +1,41 @@
+<Project ToolsVersion="15.0">
+
+	<PropertyGroup>
+    <Authors>nventive</Authors>
+    <PackageProjectUrl>https://github.com/nventive/Uno.Core</PackageProjectUrl>
+    <PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
+    <RepositoryUrl>https://github.com/nventive/Uno.Core</RepositoryUrl>
+		<RepositoryUrl>$(BUILD_REPOSITORY_URI)</RepositoryUrl>
+		<Copyright>Copyright (C) 2015-$([System.DateTime]::Now.ToString(`yyyy`)) nventive inc. - all rights reserved</Copyright>
+		<Product>$(AssemblyName) ($(TargetFramework))</Product>
+		<DefaultLanguage>en-US</DefaultLanguage>
+		<LangVersion>8.0</LangVersion>
+		<PackageIcon>uno-logo.png</PackageIcon>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<IsTestProject>$(MSBuildProjectName.Contains('Test'))</IsTestProject>
+		<IsSampleProject>$(MSBuildProjectName.Contains('Sample'))</IsSampleProject>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Include="$(MSBuildThisFileDirectory)..\build\uno-logo.png" Pack="true" Visible="false" PackagePath="\"/>
+	</ItemGroup>
+
+	<Choose>
+		<When Condition="'$(IsTestProject)' != 'true' and '$(SourceLinkEnabled)' != 'false' and '$(IsSampleProject)' != 'true'">
+			<PropertyGroup>
+				<!-- Optional: Declare that the Repository URL can be published to NuSpec -->
+				<PublishRepositoryUrl>true</PublishRepositoryUrl>
+				<!-- Optional: Embed source files that are not tracked by the source control manager to the PDB -->
+				<EmbedUntrackedSources>true</EmbedUntrackedSources>
+				<!-- Optional: Include PDB in the built .nupkg -->
+				<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+			</PropertyGroup>
+			<ItemGroup>
+				<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
+			</ItemGroup>
+		</When>
+	</Choose>
+
+</Project>

src/Uno.Core.Build/Uno.Core.Build.csproj

@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<TargetFrameworks>net46</TargetFrameworks>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
-		<NoWarn>$(NoWarn);1998;1591;1573;1572;1574;1712;1711;1570</NoWarn>
+		<NoWarn>$(NoWarn);1998;1591;1573;1572;1574;1712;1711;1570;NU5128;NU5105</NoWarn>
 		<Description></Description>
 		<BuildForLiveUnitTesting>false</BuildForLiveUnitTesting>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -35,7 +35,7 @@
 			<Pack>true</Pack>
 			<PackagePath>build</PackagePath>
 		</Content>
-		<Content Include="..\Uno.Core\bin\$(Configuration)\net46\Microsoft.Practices.ServiceLocation.dll">
+		<Content Include="..\Uno.Core\bin\$(Configuration)\net46\CommonServiceLocator.dll">
 			<Pack>true</Pack>
 			<PackagePath>build</PackagePath>
 		</Content>

src/Uno.Core.Tests/Conversions/ConversionExtensionsFixture.cs

@@ -15,7 +15,7 @@
 //
 // ******************************************************************
 using System;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Uno.Extensions;
 using Uno.Conversion;

src/Uno.Core.Tests/Conversions/CustomConversionStrategyFixture.cs

@@ -15,7 +15,7 @@
 //
 // ******************************************************************
 using System;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Uno.Extensions;
 using Uno.Conversion;

src/Uno.Core.Tests/Conversions/DefaultConversionsExtensionsFixture.cs

@@ -16,7 +16,7 @@
 // ******************************************************************
 using System;
 using System.Globalization;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Uno.Extensions;
 using Uno.Conversion;

src/Uno.Core.Tests/Conversions/EnumConversionStrategyFixture.cs

@@ -15,7 +15,7 @@
 //
 // ******************************************************************
 using System;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Uno.Extensions;
 using Uno.Conversion;

src/Uno.Core.Tests/Conversions/FunqAdapter.cs

@@ -17,7 +17,7 @@
 using System;
 using System.Collections.Generic;
 using Funq;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 
 namespace Uno.Core.Tests.Conversions
 {

src/Uno.Core.Tests/Conversions/TypeConverterConversionStrategyFixture.cs

@@ -15,7 +15,7 @@
 //
 // ******************************************************************
 using System;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Uno.Extensions;
 using Uno.Reflection;

src/Uno.Core.Tests/Properties/AssemblyInfo.cs

@@ -18,10 +18,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
 [assembly: ComVisible(false)]
 
 [assembly: Guid("b554d7e4-17fc-4909-ba06-80b5b2fb0bd1")]

src/Uno.Core/Extensions/ExtensionsProvider.cs

@@ -15,7 +15,7 @@
 //
 // ******************************************************************
 using System;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 
 namespace Uno.Extensions
 {

src/Uno.Core/IServiceLocatorProvider.cs

@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 
 namespace Uno
 {

src/Uno.Core/Logging/LogExtensionPoint.cs

@@ -15,7 +15,7 @@
 //
 // ******************************************************************
 using System;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 using Microsoft.Extensions.Logging;
 using System.Diagnostics;
 

src/Uno.Core/ServiceLocatorProviderExtensions.cs

@@ -18,7 +18,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using Microsoft.Practices.ServiceLocation;
+using CommonServiceLocator;
 
 namespace Uno.Extensions
 {

src/Uno.Core/Uno.Core.csproj

@@ -1,59 +1,47 @@
 <Project Sdk="MSBuild.Sdk.Extras" ToolsVersion="15.0">
-  <PropertyGroup>
-    <TargetFrameworks>uap10.0;net46;netstandard2.0</TargetFrameworks>
-    <AssemblyName>Uno.Core</AssemblyName>
-    <RootNamespace>Uno.Core</RootNamespace>
-    <Product>$(AssemblyName) ($(TargetFramework))</Product>
-    <NoWarn>$(NoWarn);1998;1591;1573;1572;1574;1712;1711;1570</NoWarn>
-    <BuildForLiveUnitTesting>false</BuildForLiveUnitTesting>
-    <DocumentationFile>bin\Release\$(TargetFramework)\Uno.Core.xml</DocumentationFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
-    <TreatSpecificWarningsAsErrors />
-    <DebugType>full</DebugType>
-    <DebugSymbols>True</DebugSymbols>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFrameworks>uap10.0;net46;netstandard2.0</TargetFrameworks>
+		<AssemblyName>Uno.Core</AssemblyName>
+		<RootNamespace>Uno.Core</RootNamespace>
+		<Product>$(AssemblyName) ($(TargetFramework))</Product>
+		<NoWarn>$(NoWarn);1998;1591;1573;1572;1574;1712;1711;1570;NU5105</NoWarn>
+		<BuildForLiveUnitTesting>false</BuildForLiveUnitTesting>
+		<DocumentationFile>bin\Release\$(TargetFramework)\Uno.Core.xml</DocumentationFile>
+		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+		<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
+		<TreatSpecificWarningsAsErrors />
+		<DebugType>portable</DebugType>
+		<DebugSymbols>True</DebugSymbols>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<Description>This package provides a set of helpers and extension methods used to accelerate development.</Description>
+	</PropertyGroup>
 
-  <PropertyGroup>
-    <Authors>nventive</Authors>
-    <PackageProjectUrl>https://github.com/nventive/Uno.Core</PackageProjectUrl>
-    <PackageIconUrl>https://nv-assets.azurewebsites.net/logos/uno.png</PackageIconUrl>
-    <RepositoryUrl>https://github.com/nventive/Uno.Core</RepositoryUrl>
-    <Description>This package provides a set of helpers and extension methods used to accelerate development.</Description>
-    <Copyright>Copyright (C) 2015-2019 nventive inc. - all rights reserved</Copyright>
-    <LangVersion>7.3</LangVersion>
-  </PropertyGroup>
+	<Import Project="..\Uno.CrossTargeting.props" />
+	<Import Project="..\Uno.Common.props" />
 
-  <Import Project="..\Uno.CrossTargeting.props" />
-  <Import Project="..\Uno.Common.props" />
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
+		<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
+		<PackageReference Include="System.ValueTuple" Version="4.4.0" />
+		<PackageReference Include="CommonServiceLocator" Version="2.0.5" />
+		<PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
+		<PackageReference Include="Uno.MonoAnalyzers" Version="1.0.0-dev.4">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
+		<PackageReference Include="System.Memory" Version="4.5.2" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.1" />
-    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.4.0" />
-    <PackageReference Include="CommonServiceLocator" Version="1.3.0">
-      <NoWarn>NU1701</NoWarn>
-    </PackageReference>
-    <PackageReference Include="System.Collections.Immutable" Version="1.3.1" />
-    <PackageReference Include="Uno.MonoAnalyzers" Version="1.0.0-dev.4">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="System.Memory" Version="4.5.2" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform " Version="5.4.0" />
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
-    <DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;HAS_DICT_GETVALUEORDEFAULT</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
-    <DefineConstants>$(DefineConstants);HAS_DICT_GETVALUEORDEFAULT</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <DefineConstants>$(DefineConstants);HAS_DICT_GETVALUEORDEFAULT</DefineConstants>
-  </PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0'">
+		<DefineConstants>$(DefineConstants);NETFX_CORE;WINDOWS_UWP;HAS_DICT_GETVALUEORDEFAULT</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'net46'">
+		<DefineConstants>$(DefineConstants);HAS_DICT_GETVALUEORDEFAULT</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+		<DefineConstants>$(DefineConstants);HAS_DICT_GETVALUEORDEFAULT</DefineConstants>
+	</PropertyGroup>
 
 </Project>

src/global.json

@@ -1,5 +1,5 @@
 {
   "msbuild-sdks": {
-    "MSBuild.Sdk.Extras": "1.6.68"
+    "MSBuild.Sdk.Extras": "2.0.54"
   }
 }