Skip to content

Commit

Permalink
Merge pull request #1270 from PrismLibrary/Xamarin-Upgrade
Browse files Browse the repository at this point in the history 
Xamarin upgrade
  • Loading branch information
@brianlagunas
brianlagunas committed Nov 16, 2017
2 parents a3771fc + 5556f37 commit d125ac2
Show file tree
Hide file tree
Showing 15 changed files with 110 additions and 90 deletions.
2 changes: 1 addition & 1 deletion Source/Windows10/Prism.Unity.Windows/Prism.Unity.Windows.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<PackageReference Include="CommonServiceLocator" Version="1.3.0" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.1.0" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.1" />
<PackageReference Include="Unity" Version="5.2.0" />
<PackageReference Include="Unity" Version="5.2.1" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions Source/Wpf/Prism.StructureMap.Wpf.Tests/Prism.StructureMap.Wpf.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
<Reference Include="PresentationFramework">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
</Reference>
<Reference Include="StructureMap, Version=4.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\StructureMap.4.5.2\lib\net45\StructureMap.dll</HintPath>
<Reference Include="StructureMap, Version=4.5.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\StructureMap.4.5.3\lib\net45\StructureMap.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
Expand Down
2 changes: 1 addition & 1 deletion Source/Wpf/Prism.StructureMap.Wpf.Tests/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="2.0.1" targetFramework="net45" userInstalled="true" />
<package id="StructureMap" version="4.5.2" targetFramework="net45" />
<package id="StructureMap" version="4.5.3" targetFramework="net45" />
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net45" />
</packages>
4 changes: 2 additions & 2 deletions Source/Wpf/Prism.StructureMap.Wpf/Prism.StructureMap.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<HintPath>..\..\packages\CommonServiceLocator.2.0.1\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework" />
<Reference Include="StructureMap, Version=4.5.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\StructureMap.4.5.2\lib\net45\StructureMap.dll</HintPath>
<Reference Include="StructureMap, Version=4.5.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\packages\StructureMap.4.5.3\lib\net45\StructureMap.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
Expand Down
2 changes: 1 addition & 1 deletion Source/Wpf/Prism.StructureMap.Wpf/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
<packages>
<package id="CommonServiceLocator" version="2.0.1" targetFramework="net45" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net45" developmentDependency="true" />
<package id="StructureMap" version="4.5.2" targetFramework="net45" />
<package id="StructureMap" version="4.5.3" targetFramework="net45" />
<package id="System.Reflection.Emit.Lightweight" version="4.3.0" targetFramework="net45" />
</packages>
30 changes: 15 additions & 15 deletions Source/Wpf/Prism.Unity.Wpf.Tests/Prism.Unity.Wpf.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
</Reference>
<Reference Include="CommonServiceLocator, Version=2.0.1.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\CommonServiceLocator.dll</HintPath>
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Moq, Version=4.7.145.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
Expand All @@ -90,26 +90,26 @@
<Reference Include="System.Data" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="Unity.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Abstractions.dll</HintPath>
<Reference Include="Unity.Abstractions, Version=2.2.1.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Unity.Configuration, Version=5.0.3.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Configuration.dll</HintPath>
<Reference Include="Unity.Configuration, Version=5.0.6.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Configuration.dll</HintPath>
</Reference>
<Reference Include="Unity.Container, Version=5.2.0.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Container.dll</HintPath>
<Reference Include="Unity.Container, Version=5.2.1.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Container.dll</HintPath>
</Reference>
<Reference Include="Unity.Interception, Version=5.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Interception.dll</HintPath>
<Reference Include="Unity.Interception, Version=5.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Interception.dll</HintPath>
</Reference>
<Reference Include="Unity.Interception.Configuration, Version=5.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Interception.Configuration.dll</HintPath>
<Reference Include="Unity.Interception.Configuration, Version=5.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Interception.Configuration.dll</HintPath>
</Reference>
<Reference Include="Unity.RegistrationByConvention, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.RegistrationByConvention.dll</HintPath>
<Reference Include="Unity.RegistrationByConvention, Version=2.1.0.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.RegistrationByConvention.dll</HintPath>
</Reference>
<Reference Include="Unity.ServiceLocation, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.ServiceLocation.dll</HintPath>
<Reference Include="Unity.ServiceLocation, Version=2.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="WindowsBase">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
Expand Down
15 changes: 12 additions & 3 deletions Source/Wpf/Prism.Unity.Wpf.Tests/UnityBootstrapperRunMethodFixture.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -333,21 +333,30 @@ public void ModuleManagerRunCalled()
var serviceLocatorAdapter = new UnityServiceLocatorAdapter(container);
var regionBehaviorFactory = new RegionBehaviorFactory(serviceLocatorAdapter);


container.RegisterInstance<IServiceLocator>(serviceLocatorAdapter);
container.RegisterInstance<UnityBootstrapperExtension>(new UnityBootstrapperExtension());
container.RegisterInstance<IModuleCatalog>(new ModuleCatalog());
container.RegisterInstance<IModuleInitializer>(mockedModuleInitializer.Object);
container.RegisterInstance<IModuleManager>(mockedModuleManager.Object);
container.RegisterInstance<RegionAdapterMappings>(regionAdapterMappings);

container.RegisterSingleton(typeof(RegionAdapterMappings), typeof(RegionAdapterMappings));
container.RegisterSingleton(typeof(IRegionManager), typeof(RegionManager));
container.RegisterSingleton(typeof(IEventAggregator), typeof(EventAggregator));
container.RegisterSingleton(typeof(IRegionViewRegistry), typeof(RegionViewRegistry));
container.RegisterSingleton(typeof(IRegionBehaviorFactory), typeof(RegionBehaviorFactory));
container.RegisterSingleton(typeof(IRegionNavigationJournalEntry), typeof(RegionNavigationJournalEntry));
container.RegisterSingleton(typeof(IRegionNavigationJournal), typeof(RegionNavigationJournal));
container.RegisterSingleton(typeof(IRegionNavigationService), typeof(RegionNavigationService));
container.RegisterSingleton(typeof(IRegionNavigationContentLoader), typeof(Regions.UnityRegionNavigationContentLoader));


container.RegisterInstance<SelectorRegionAdapter>(new SelectorRegionAdapter(regionBehaviorFactory));
container.RegisterInstance<ItemsControlRegionAdapter>(new ItemsControlRegionAdapter(regionBehaviorFactory));
container.RegisterInstance<ContentControlRegionAdapter>(new ContentControlRegionAdapter(regionBehaviorFactory));

var bootstrapper = new MockedContainerBootstrapper(container);

bootstrapper.Run();
bootstrapper.Run(false);

mockedModuleManager.Verify(mm => mm.Run(), Times.Once());
}
Expand Down
2 changes: 1 addition & 1 deletion Source/Wpf/Prism.Unity.Wpf.Tests/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
<package id="Castle.Core" version="4.2.1" targetFramework="net45" />
<package id="CommonServiceLocator" version="2.0.1" targetFramework="net45" />
<package id="Moq" version="4.7.145" targetFramework="net45" />
<package id="Unity" version="5.2.0" targetFramework="net45" />
<package id="Unity" version="5.2.1" targetFramework="net45" />
</packages>
30 changes: 15 additions & 15 deletions Source/Wpf/Prism.Unity.Wpf/Prism.Unity.Wpf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,31 +53,31 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="CommonServiceLocator, Version=2.0.1.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\CommonServiceLocator.dll</HintPath>
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\CommonServiceLocator.dll</HintPath>
</Reference>
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="Unity.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Abstractions.dll</HintPath>
<Reference Include="Unity.Abstractions, Version=2.2.1.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Unity.Configuration, Version=5.0.3.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Configuration.dll</HintPath>
<Reference Include="Unity.Configuration, Version=5.0.6.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Configuration.dll</HintPath>
</Reference>
<Reference Include="Unity.Container, Version=5.2.0.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Container.dll</HintPath>
<Reference Include="Unity.Container, Version=5.2.1.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Container.dll</HintPath>
</Reference>
<Reference Include="Unity.Interception, Version=5.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Interception.dll</HintPath>
<Reference Include="Unity.Interception, Version=5.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Interception.dll</HintPath>
</Reference>
<Reference Include="Unity.Interception.Configuration, Version=5.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.Interception.Configuration.dll</HintPath>
<Reference Include="Unity.Interception.Configuration, Version=5.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.Interception.Configuration.dll</HintPath>
</Reference>
<Reference Include="Unity.RegistrationByConvention, Version=2.0.2.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.RegistrationByConvention.dll</HintPath>
<Reference Include="Unity.RegistrationByConvention, Version=2.1.0.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.RegistrationByConvention.dll</HintPath>
</Reference>
<Reference Include="Unity.ServiceLocation, Version=2.0.3.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.0\lib\net45\Unity.ServiceLocation.dll</HintPath>
<Reference Include="Unity.ServiceLocation, Version=2.0.6.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL">
<HintPath>..\..\packages\Unity.5.2.1\lib\net45\Unity.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
Expand Down
2 changes: 1 addition & 1 deletion Source/Wpf/Prism.Unity.Wpf/packages.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<packages>
<package id="CommonServiceLocator" version="2.0.1" targetFramework="net45" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net45" developmentDependency="true" />
<package id="Unity" version="5.2.0" targetFramework="net45" />
<package id="Unity" version="5.2.1" targetFramework="net45" />
</packages>
5 changes: 5 additions & 0 deletions Source/Xamarin/Prism.DI.Forms.Tests/MockForms.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ public void OpenUriAction(Uri uri)
MockForms.OpenUriAction?.Invoke(uri);
}

public void QuitApplication()
{
throw new NotImplementedException();
}

public void StartTimer(TimeSpan interval, Func<bool> callback) { }
}

Expand Down
Loading

0 comments on commit d125ac2

Please sign in to comment.