Merge pull request #1414 from PrismLibrary/release-updates

Release updates
PrismLibrary · Apr 2, 2018 · 0c75227 · 0c75227
2 parents 34cc683 + 9ccfcfa
commit 0c75227
Show file tree

Hide file tree

Showing 50 changed files with 150 additions and 164 deletions.
diff --git a/Source/Prism.Tests/Prism.Tests.csproj b/Source/Prism.Tests/Prism.Tests.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.2" />
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>

diff --git a/Source/Prism/Mvvm/BindableBase.cs b/Source/Prism/Mvvm/BindableBase.cs
@@ -70,10 +70,12 @@ protected virtual bool SetProperty<T>(ref T storage, T value, Action onChanged,
 		/// that support <see cref="CallerMemberNameAttribute"/>.</param>
 		protected void RaisePropertyChanged([CallerMemberName]string propertyName = null)
 		{
-			//TODO: when we remove the old OnPropertyChanged method we need to uncomment the below line
-			//OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
-			OnPropertyChanged(propertyName);
-		}
+            //TODO: when we remove the old OnPropertyChanged method we need to uncomment the below line
+            //OnPropertyChanged(new PropertyChangedEventArgs(propertyName));
+#pragma warning disable CS0618 // Type or member is obsolete
+            OnPropertyChanged(propertyName);
+#pragma warning restore CS0618 // Type or member is obsolete
+        }
 
 		/// <summary>
 		/// Notifies listeners that a property value has changed.

diff --git a/Source/Prism/Prism.csproj b/Source/Prism/Prism.csproj
@@ -32,7 +32,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.0" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Condition=" '$(TargetFramework)' == 'netstandard1.0' " Include="System.Resources.ResourceManager" Version="4.3.0" />
     <PackageReference Condition=" '$(TargetFramework)' == 'uap10.0' " Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
   </ItemGroup>

diff --git a/Source/Prism/Properties/AssemblyInfo.cs b/Source/Prism/Properties/AssemblyInfo.cs
@@ -0,0 +1,3 @@
+using System;
+
+[assembly: CLSCompliant(true)]
diff --git a/Source/Windows10/Prism.Autofac.Windows/Prism.Autofac.Windows.csproj b/Source/Windows10/Prism.Autofac.Windows/Prism.Autofac.Windows.csproj
@@ -14,7 +14,7 @@
     <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version>
     <Version Condition=" '$(PRISM_AUTOFAC_WINDOWS_VERSION)' != '' ">$(PRISM_AUTOFAC_WINDOWS_VERSION)</Version>
     <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 -->
-    <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_AUTOFAC_WINDOWS_VERSION)' == '' ">7.0.0</VersionPrefix>
+    <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_AUTOFAC_WINDOWS_VERSION)' == '' ">7.1.0</VersionPrefix>
     <!-- This will create CI builds as 7.0.0.1234-ci -->
     <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_AUTOFAC_WINDOWS_VERSION)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</VersionPrefix>
     <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_AUTOFAC_WINDOWS_VERSION)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci</VersionSuffix>
@@ -26,7 +26,7 @@
 
    <ItemGroup>
     <PackageReference Include="CommonServiceLocator" Version="1.3.0" />
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.0" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
     <PackageReference Include="Autofac" Version="4.6.2" />
   </ItemGroup>

diff --git a/Source/Windows10/Prism.SimpleInjector.Windows/Prism.SimpleInjector.Windows.csproj b/Source/Windows10/Prism.SimpleInjector.Windows/Prism.SimpleInjector.Windows.csproj
@@ -14,7 +14,7 @@
     <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version>
     <Version Condition=" '$(PRISM_SIMPLEINJECTOR_WINDOWS_VERSION)' != '' ">$(PRISM_SIMPLEINJECTOR_WINDOWS_VERSION)</Version>
     <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 -->
-    <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_SIMPLEINJECTOR_WINDOWS_VERSION)' == '' ">7.0.0</VersionPrefix>
+    <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_SIMPLEINJECTOR_WINDOWS_VERSION)' == '' ">7.1.0</VersionPrefix>
     <!-- This will create CI builds as 7.0.0.1234-ci -->
     <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_SIMPLEINJECTOR_WINDOWS_VERSION)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</VersionPrefix>
     <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_SIMPLEINJECTOR_WINDOWS_VERSION)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci</VersionSuffix>
@@ -26,9 +26,9 @@
 
   <ItemGroup>
     <PackageReference Include="CommonServiceLocator" Version="1.3.0" />
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.0" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
-    <PackageReference Include="SimpleInjector" Version="4.0.12" />
+    <PackageReference Include="SimpleInjector" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Windows10/Prism.SimpleInjector.Windows/PrismSimpleInjectorApplication.cs b/Source/Windows10/Prism.SimpleInjector.Windows/PrismSimpleInjectorApplication.cs
@@ -84,7 +84,7 @@ protected override void CreateAndConfigureContainer()
         protected virtual void ConfigureContainer()
         {
             Logger.Log("Registering Prism services with container", Category.Debug, Priority.Low);
-            Container.RegisterSingleton(Logger);
+            Container.RegisterInstance(Logger);
         }
 
         /// <summary>
@@ -101,10 +101,10 @@ protected override void ConfigureServiceLocator()
         /// <param name="args">The <see cref="IActivatedEventArgs" /> instance containing the event data.</param>
         protected override Task OnInitializeAsync(IActivatedEventArgs args)
         {
-            Container.RegisterSingleton(SessionStateService);
-            Container.RegisterSingleton(DeviceGestureService);
-            Container.RegisterSingleton(NavigationService);
-            Container.RegisterSingleton(EventAggregator);
+            Container.RegisterInstance(SessionStateService);
+            Container.RegisterInstance(DeviceGestureService);
+            Container.RegisterInstance(NavigationService);
+            Container.RegisterInstance(EventAggregator);
 
             return Task.CompletedTask;
         }

diff --git a/Source/Windows10/Prism.Unity.Windows/Prism.Unity.Windows.csproj b/Source/Windows10/Prism.Unity.Windows/Prism.Unity.Windows.csproj
@@ -14,7 +14,7 @@
     <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version>
     <Version Condition=" '$(PRISM_UNITY_WINDOWS_VERSION)' != '' ">$(PRISM_UNITY_WINDOWS_VERSION)</Version>
     <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 -->
-    <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_UNITY_WINDOWS_VERSION)' == '' ">7.0.0</VersionPrefix>
+    <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_UNITY_WINDOWS_VERSION)' == '' ">7.1.0</VersionPrefix>
     <!-- This will create CI builds as 7.0.0.1234-ci -->
     <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_UNITY_WINDOWS_VERSION)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</VersionPrefix>
     <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_UNITY_WINDOWS_VERSION)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci</VersionSuffix>
@@ -30,9 +30,9 @@
 
   <ItemGroup>
     <PackageReference Include="CommonServiceLocator" Version="1.3.0" />
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.0" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
-    <PackageReference Include="Unity" Version="5.5.5" />
+    <PackageReference Include="Unity.Container" Version="5.8.3" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Source/Windows10/Prism.Windows.Tests/Prism.Windows.Tests.csproj b/Source/Windows10/Prism.Windows.Tests/Prism.Windows.Tests.csproj
@@ -200,7 +200,7 @@
       <Version>1.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.0.1</Version>
+      <Version>6.0.6</Version>
     </PackageReference>
   </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
@@ -214,4 +214,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Source/Windows10/Prism.Windows/Prism.Windows.csproj b/Source/Windows10/Prism.Windows/Prism.Windows.csproj
@@ -14,7 +14,7 @@
     <Version Condition=" '$(PRISM_RELEASE)' != '' ">$(PRISM_RELEASE)</Version>
     <Version Condition=" '$(PRISM_WINDOWS_VERSION)' != '' ">$(PRISM_WINDOWS_VERSION)</Version>
     <!-- Update this version when incrementing Library Versions i.e. 7.1.0, 7.2.0 -->
-    <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_WINDOWS_VERSION)' == '' ">7.0.0</VersionPrefix>
+    <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_WINDOWS_VERSION)' == '' ">7.1.0</VersionPrefix>
     <!-- This will create CI builds as 7.0.0.1234-ci -->
     <VersionPrefix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_WINDOWS_VERSION)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(VersionPrefix).$(APPVEYOR_BUILD_NUMBER)</VersionPrefix>
     <VersionSuffix Condition=" '$(PRISM_RELEASE)' == '' And '$(PRISM_WINDOWS_VERSION)' == '' And '$(APPVEYOR_BUILD_NUMBER)' != '' ">ci</VersionSuffix>
@@ -29,7 +29,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.2.0" PrivateAssets="All" />
+    <PackageReference Include="MSBuild.Sdk.Extras" Version="1.3.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
   </ItemGroup>
 

diff --git a/Source/Wpf/Prism.Autofac.Wpf.Tests/Prism.Autofac.Wpf.Tests.csproj b/Source/Wpf/Prism.Autofac.Wpf.Tests/Prism.Autofac.Wpf.Tests.csproj
@@ -41,8 +41,8 @@
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
-    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Moq, Version=4.8.0.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">

diff --git a/Source/Wpf/Prism.Autofac.Wpf.Tests/packages.config b/Source/Wpf/Prism.Autofac.Wpf.Tests/packages.config
@@ -2,7 +2,7 @@
 <packages>
   <package id="Autofac" version="4.6.2" targetFramework="net45" />
   <package id="Castle.Core" version="4.2.1" targetFramework="net45" />
-  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="2.0.3" targetFramework="net45" />
   <package id="Moq" version="4.8.1" targetFramework="net45" />
   <package id="System.Threading.Tasks.Extensions" version="4.3.0" targetFramework="net45" />
   <package id="System.ValueTuple" version="4.3.0" targetFramework="net45" />

diff --git a/Source/Wpf/Prism.Autofac.Wpf/Prism.Autofac.Wpf.csproj b/Source/Wpf/Prism.Autofac.Wpf/Prism.Autofac.Wpf.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <PrismVersion>7.0.0</PrismVersion>
+    <PrismVersion>7.1.0</PrismVersion>
     <PrismVersion Condition=" '$(PRISM_AUTOFAC_WPF_VERSION)' != '' ">$(PRISM_AUTOFAC_WPF_VERSION)</PrismVersion>
     <PrismFileVersion>$(PrismVersion).0</PrismFileVersion>
     <PrismFileVersion Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(PrismVersion).$(APPVEYOR_BUILD_NUMBER)</PrismFileVersion>
@@ -52,8 +52,8 @@
     <Reference Include="Autofac, Version=4.6.2.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Autofac.4.6.2\lib\net45\Autofac.dll</HintPath>
     </Reference>
-    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />

diff --git a/Source/Wpf/Prism.Autofac.Wpf/packages.config b/Source/Wpf/Prism.Autofac.Wpf/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Autofac" version="4.6.2" targetFramework="net45" />
-  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="2.0.3" targetFramework="net45" />
   <package id="MSBuildTasks" version="1.5.0.235" targetFramework="net45" developmentDependency="true" />
 </packages>
diff --git a/Source/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj b/Source/Wpf/Prism.DryIoc.Wpf.Tests/Prism.DryIoc.Wpf.Tests.csproj
@@ -35,11 +35,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="DryIoc, Version=2.12.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DryIoc.dll.2.12.6\lib\net45\DryIoc.dll</HintPath>
+    <Reference Include="DryIoc, Version=2.12.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\DryIoc.dll.2.12.8\lib\net45\DryIoc.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />

diff --git a/Source/Wpf/Prism.DryIoc.Wpf.Tests/packages.config b/Source/Wpf/Prism.DryIoc.Wpf.Tests/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net45" />
-  <package id="DryIoc.dll" version="2.12.6" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="2.0.3" targetFramework="net45" />
+  <package id="DryIoc.dll" version="2.12.8" targetFramework="net45" />
   <package id="System.Collections" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Tools" version="4.3.0" targetFramework="net45" />

diff --git a/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj b/Source/Wpf/Prism.DryIoc.Wpf/Prism.DryIoc.Wpf.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <PrismVersion>7.0.0</PrismVersion>
+    <PrismVersion>7.1.0</PrismVersion>
     <PrismVersion Condition=" '$(PRISM_DRYIOC_WPF_VERSION)' != '' ">$(PRISM_DRYIOC_WPF_VERSION)</PrismVersion>
     <PrismFileVersion>$(PrismVersion).0</PrismFileVersion>
     <PrismFileVersion Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(PrismVersion).$(APPVEYOR_BUILD_NUMBER)</PrismFileVersion>
@@ -49,11 +49,11 @@
     <AssemblyOriginatorKeyFile>..\..\prism.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
-    <Reference Include="DryIoc, Version=2.12.6.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\DryIoc.dll.2.12.6\lib\net45\DryIoc.dll</HintPath>
+    <Reference Include="DryIoc, Version=2.12.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\DryIoc.dll.2.12.8\lib\net45\DryIoc.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />

diff --git a/Source/Wpf/Prism.DryIoc.Wpf/packages.config b/Source/Wpf/Prism.DryIoc.Wpf/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net45" />
-  <package id="DryIoc.dll" version="2.12.6" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="2.0.3" targetFramework="net45" />
+  <package id="DryIoc.dll" version="2.12.8" targetFramework="net45" />
   <package id="MSBuildTasks" version="1.5.0.235" targetFramework="net45" developmentDependency="true" />
   <package id="System.Collections" version="4.3.0" targetFramework="net45" />
   <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net45" />

diff --git a/Source/Wpf/Prism.Ninject.Wpf.Tests/Prism.Ninject.Wpf.Tests.csproj b/Source/Wpf/Prism.Ninject.Wpf.Tests/Prism.Ninject.Wpf.Tests.csproj
@@ -38,8 +38,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualStudio.TestPlatform.TestFramework, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git a/Source/Wpf/Prism.Ninject.Wpf.Tests/packages.config b/Source/Wpf/Prism.Ninject.Wpf.Tests/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net461" />
+  <package id="CommonServiceLocator" version="2.0.3" targetFramework="net461" />
   <package id="MSTest.TestAdapter" version="1.2.0" targetFramework="net461" />
   <package id="MSTest.TestFramework" version="1.2.0" targetFramework="net461" />
   <package id="Ninject" version="3.3.4" targetFramework="net461" />

diff --git a/Source/Wpf/Prism.Ninject.Wpf/Prism.Ninject.Wpf.csproj b/Source/Wpf/Prism.Ninject.Wpf/Prism.Ninject.Wpf.csproj
@@ -13,7 +13,7 @@
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
-    <PrismVersion>7.0.0</PrismVersion>
+    <PrismVersion>7.1.0</PrismVersion>
     <PrismVersion Condition=" '$(PRISM_NINJECT_WPF_VERSION)' != '' ">$(PRISM_NINJECT_WPF_VERSION)</PrismVersion>
     <PrismFileVersion>$(PrismVersion).0</PrismFileVersion>
     <PrismFileVersion Condition=" '$(APPVEYOR_BUILD_NUMBER)' != '' ">$(PrismVersion).$(APPVEYOR_BUILD_NUMBER)</PrismFileVersion>
@@ -49,8 +49,8 @@
     <AssemblyOriginatorKeyFile>..\..\prism.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CommonServiceLocator, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommonServiceLocator.2.0.2\lib\net45\CommonServiceLocator.dll</HintPath>
+    <Reference Include="CommonServiceLocator, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CommonServiceLocator.2.0.3\lib\net45\CommonServiceLocator.dll</HintPath>
     </Reference>
     <Reference Include="Ninject, Version=3.3.4.0, Culture=neutral, PublicKeyToken=c7192dc5380945e7, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Ninject.3.3.4\lib\net45\Ninject.dll</HintPath>

diff --git a/Source/Wpf/Prism.Ninject.Wpf/packages.config b/Source/Wpf/Prism.Ninject.Wpf/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="CommonServiceLocator" version="2.0.2" targetFramework="net45" />
+  <package id="CommonServiceLocator" version="2.0.3" targetFramework="net45" />
   <package id="MSBuildTasks" version="1.5.0.235" targetFramework="net45" developmentDependency="true" />
   <package id="Ninject" version="3.3.4" targetFramework="net45" />
 </packages>